gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-libs
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
635 files changed, 7678 insertions, 5828 deletions
diff --git a/dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild b/dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild
new file mode 100644
index 000000000000..1ecfb6cc82f6
--- /dev/null
+++ b/dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-any-r1 cmake
+
+CommitId=135412d2646f3bd753c8f1cfd33616110bbccd27
+
+DESCRIPTION="Facebook GEneral Matrix Multiplication"
+HOMEPAGE="https://github.com/pytorch/FBGEMM"
+SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	dev-libs/asmjit
+	dev-libs/cpuinfo
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? ( dev-cpp/gtest )
+	${PYTHON_DEPS}
+"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	rm test/RowWiseSparseAdagradFusedTest.cc || die
+	rm test/SparseAdagradTest.cc || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFBGEMM_LIBRARY_TYPE=shared
+		-DFBGEMM_BUILD_BENCHMARKS=OFF
+		-DFBGEMM_BUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest
new file mode 100644
index 000000000000..856f5b98ba80
--- /dev/null
+++ b/dev-libs/FBGEMM/Manifest
@@ -0,0 +1,4 @@
+AUX FBGEMM-2022.01.13-gentoo.patch 2260 BLAKE2B c3c690490b200e1191013259872ef826b63012161cb5664f11f2e838a632fd010a17d6913bd89c7fc45850c5e3273a0d087081b63964483fefd21f02fee60403 SHA512 f4c7c58e45568303aa2d9308586adb544185f30f72d989928889ef46c9ec44342272a865185cdeef761e5ce4e44299a08de4aff2a7b30efa4cc90a26cca14861
+DIST FBGEMM-2022.01.13.tar.gz 532297 BLAKE2B bced7e1a1712351a87762e8d0a28ed3bbc5678c8ce70b440e769e53dc15f68e3ec8c89df9307f33da788bd376613720892493c0b519d3860a6e2edb48de1fdba SHA512 a416c2c11b0e6798e0dbb376050ead79cb602cd4f0e41b6109eeefe3e939e410adf0ce828d1224a358eb8245a935cc431d8023ccc396f08ca88276fb91c66157
+EBUILD FBGEMM-2022.01.13.ebuild 983 BLAKE2B 44094d63d2d8c51858b34781f3642ead1632d28dce6e79ef7f315e3c81159e85b069d6e85f39445a6302f254c427d68d9ac901cae91784fd716b6ac65fc171b4 SHA512 6d79751622cbb80afe0467fbc22eb7fdce7d175ea11eaf42ffd18fad845db492de2eaefe83ab282606fc24ac7be872dc735589b0bebf45e433393d2fbe478260
+MISC metadata.xml 327 BLAKE2B 860b9c0ecb3b0029c855db0a0054590135f3bd6ec9dad20cdf433fc70c119354518eea50fdbb2a204eb8cc6621de23e6928a2f9ec961ac0c51fd9dae22fa8488 SHA512 3a0d5a69421a41e62ce134636025e0024010c1938ee35f7489d8d870d915a66cd526aa60d107a378dc4522ff71b7f10486e20867c8b424b1b47e458988ebff58
diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch b/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch
new file mode 100644
index 000000000000..e2aacd3f65ef
--- /dev/null
+++ b/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch
@@ -0,0 +1,65 @@
+--- a/CMakeLists.txt	2022-05-21 13:13:50.806813151 +0200
++++ b/CMakeLists.txt	2022-05-21 13:16:46.448969453 +0200
+@@ -165,7 +165,7 @@
+ message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
+ message(WARNING "==========")
+ 
+-if(NOT TARGET asmjit)
++if(FALSE)
+   #Download asmjit from github if ASMJIT_SRC_DIR is not specified.
+   if(NOT DEFINED ASMJIT_SRC_DIR)
+     set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit"
+@@ -184,7 +184,7 @@
+   set_property(TARGET asmjit PROPERTY POSITION_INDEPENDENT_CODE ON)
+ endif()
+ 
+-if(NOT TARGET cpuinfo)
++if(FALSE)
+   #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
+   if(NOT DEFINED CPUINFO_SOURCE_DIR)
+     set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo"
+@@ -261,7 +261,6 @@
+ 
+ target_link_libraries(fbgemm $<BUILD_INTERFACE:asmjit>
+   $<BUILD_INTERFACE:cpuinfo>)
+-add_dependencies(fbgemm asmjit cpuinfo)
+ 
+ install(TARGETS fbgemm EXPORT fbgemmLibraryConfig
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -268,6 +268,8 @@
+ 
+ install(FILES ${FBGEMM_PUBLIC_HEADERS}
+   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm")
++install(FILES src/RefImplementations.h
++  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm/src")
+ 
+ install(EXPORT fbgemmLibraryConfig DESTINATION share/cmake/fbgemm
+   FILE fbgemmLibraryConfig.cmake)
+--- a/test/CMakeLists.txt	2022-05-21 13:15:34.140135199 +0200
++++ b/test/CMakeLists.txt	2022-05-21 13:17:59.170813431 +0200
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+ 
+-if(FBGEMM_BUILD_TESTS AND NOT TARGET gtest)
++if(FALSE)
+   #Download Googletest framework from github if
+   #GOOGLETEST_SOURCE_DIR is not specified.
+   if(NOT DEFINED GOOGLETEST_SOURCE_DIR)
+@@ -62,7 +62,6 @@
+     target_link_libraries(${TESTNAME} ${OpenMP_CXX_LIBRARIES})
+   endif()
+ 
+-  add_dependencies(${TESTNAME} gtest fbgemm)
+   add_test(${TESTNAME} ${TESTNAME})
+   set_target_properties(${TESTNAME} PROPERTIES FOLDER test)
+ endmacro()
+--- a/src/PackMatrix.cc	2022-05-24 08:19:00.639462626 +0200
++++ b/src/PackMatrix.cc	2022-05-24 08:27:59.127720548 +0200
+@@ -30,6 +30,7 @@
+ }
+ 
+ template <typename PT, typename inpType, typename accType>
++FBGEMM_API
+ int PackMatrix<PT, inpType, accType>::packedBufferSize(
+     int rows,
+     int cols,
diff --git a/dev-libs/FBGEMM/metadata.xml b/dev-libs/FBGEMM/metadata.xml
new file mode 100644
index 000000000000..b13a1c693d1f
--- /dev/null
+++ b/dev-libs/FBGEMM/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pytorch/FBGEMM</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/FP16/FP16-2021.03.20.ebuild b/dev-libs/FP16/FP16-2021.03.20-r2.ebuild
index 160c3c91f429..1673b468cb71 100644
--- a/dev-libs/FP16/FP16-2021.03.20.ebuild
+++ b/dev-libs/FP16/FP16-2021.03.20-r2.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit cmake
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit python-r1 cmake
 
 CommitId=0a92994d729ff76a58f692d3028ca1b64b145d91
+
 DESCRIPTION="conversion to/from half-precision floating point formats"
 HOMEPAGE="https://github.com/Maratyszcza/FP16/"
 SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz
@@ -14,9 +16,14 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="dev-libs/psimd"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	dev-python/PeachPy[${PYTHON_USEDEP}]
+"
 BDEPEND="test? ( dev-cpp/gtest )"
 RESTRICT="!test? ( test )"
 
@@ -26,6 +33,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 )
 
+src_prepare() {
+	cmake_src_prepare
+	mkdir -p module/fp16 || die
+	cp include/fp16/*py module/fp16 || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DFP16_BUILD_BENCHMARKS=OFF
@@ -33,3 +46,13 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+python_install() {
+	python_domodule module/fp16
+}
+
+src_install() {
+	cmake_src_install
+	rm "${D}"/usr/include/fp16/*.py || die
+	python_foreach_impl python_install
+}
diff --git a/dev-libs/FP16/Manifest b/dev-libs/FP16/Manifest
index becc524ed9f8..209ce6a8af79 100644
--- a/dev-libs/FP16/Manifest
+++ b/dev-libs/FP16/Manifest
@@ -1,4 +1,4 @@
 AUX FP16-2021.03.20-gentoo.patch 1876 BLAKE2B 56863806f1040c5a92e04f7cf120e2ae4e4e6c59b336bf8734d0b0945e29d17afb5c244e94fab6023567227878b72e73d3c8d669e4af311bfc703f545b82d847 SHA512 0ac6379a5d92a70df72c4a0bce0d437ebb7733fa6f61b0006cedd007f9c071c2b7c9727cd559c39c08a8528f29c2d96397b566512eca6fa4c5a5d812085125cf
 DIST FP16-2021.03.20.tar.gz 71228 BLAKE2B e598225032324ffe38db9002e8397e67a713b6323ac57408e7e39e146826b2bb1dab60cd75181a25b1b07958463e3913bbf0e53b23803e53d472fda66b8ba6d5 SHA512 3f094f242425ea37de274eb8539dc5f8ab0c13fd5325d14180ef12e9c04e6002a110d086c4c667f7c8054af337deab096d59482eb95cc8a632c3c412b48e89d1
-EBUILD FP16-2021.03.20.ebuild 758 BLAKE2B fed1e1cf258d2a7ca4b34c60299d7c2321e3d9cccc1f70fe60865b12829c4c1bcf73572381add3deab5fe74d9834fdfac842f58b416b289a061436070c5d2677 SHA512 777e183f57ebcdb12e8db740ef3c63a875b327c832fce16d6461f76b282454125a343878f213991e43b9d5089e37828e4aa26c9b43ac6cd40a8ca178958dbf52
+EBUILD FP16-2021.03.20-r2.ebuild 1171 BLAKE2B f82b80a79d58643d5cbad2474a5c1e892514d14f80cbd6e7a75c0f4bbbc13d9b5f3c2c7da6bc79d0495918d8617bad35cad82bfeeacb07b7189ca093d327812c SHA512 5e9a8ef2a727c437ef5266508b09b78e845265197e188200f84ed312cb76bd7364b1ca1b945ae15cfd0926242aaa8ab0aa97cb057fffea3ace7e7b77e406a6cf
 MISC metadata.xml 329 BLAKE2B eda810b21ca05e2e16f2eafac194cdca189d27449bc9322488aeca215a9b2c10ce68145abab1abb984e290ab6ca8ce21c3beaf06ecd76d7574fd8b82388f4e63 SHA512 27ca59c0862f75f24dc64f9af5eee96cf63ef4bd468e17f5d04cc23289dbb5c44af9b230707ad13d1ff85e75db4d5485d7226c9e6d80e8bc80d9e6f3b2e18acd
diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index 7a584459e1ec..c7ed15eb9628 100644
--- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby26"
+USE_RUBY="ruby27"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 56d2b9f030c5..0f720df20ca1 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -3,5 +3,5 @@ AUX Ice-3.6.5-csharp.patch 1573 BLAKE2B 2e69e87179bd938bb34f1ae9826b09b935cb9a13
 AUX Ice-3.6.5-db6.patch 1664 BLAKE2B 9ef67c83612875c68dd8fb7cea025ce3fca1e4384335108aa423ca63b53c6c723d9f7f9fd8fdc6895f8aedee0826efc225d89e487f5c95c395a8cdb1b893826a SHA512 ba94bddf3f43688ca74e5fd42fbafd7d0b6f02f616dfa4b6aff69ef1089f4404618cf07871d265b0b07037ca02a27fc397767d845a7e0edc60baa37704a064f0
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b
-EBUILD Ice-3.6.5-r2.ebuild 8480 BLAKE2B fcf14091f13c1c1d9e560b0a458be74ef63b348636d5aab8c199f820d04b29470f3de5234d48deb0850e1eed25d02c78bc791d6fb03f41d5f58110b2e8c91d01 SHA512 288435a80afe3179ac4a45f1d7e6e399d98273f3b55739f9cb5036d010afca9b5fa30987631d579a8ca43e9d207f4479be6abd30fa3aace0b70694aef5cfd713
+EBUILD Ice-3.6.5-r2.ebuild 8481 BLAKE2B 2b1bd0b096e752254ac781b1c24578a387efb985c04b3c406aa085b8ad9c1bb49cc3d2f53932b0b9bfe83f4c9f4c9f931f222757746750ee1fe1b25ef1d9051f SHA512 083f6d89211e6cadc0f1f6e30884b194953925b99a9901c3d16cec2f37163dd4eadf3b28c1c1a7ac6897b0e870fa854dc3b3ab75743b3b0d3b3f76c22c9bb7c5
 MISC metadata.xml 471 BLAKE2B 50fef5d9314fcf793c140c97016a5af4ecb2b1aa5cc86e8cd1f961beb1e55aeb23d1228bf9dcccb10d54458b72766eba80c9b18d9add7928fdd4197577e58971 SHA512 65d2e51347c27ee6414f07a69ecd886d9eb6a18b3419a80e0e7022bdf127b03fca0cdb954c5a3d46dba29e40dc7973a7c5d6b8388af36702c3874e02589cad56
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1d5c06de41d3..c29b1c8bf82f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/OpenNI/Manifest b/dev-libs/OpenNI/Manifest
index d68b9d4c6c46..066943707d54 100644
--- a/dev-libs/OpenNI/Manifest
+++ b/dev-libs/OpenNI/Manifest
@@ -4,6 +4,6 @@ AUX jpeg.patch 704 BLAKE2B a3261b7834fec0134929782a8283840bf9a5c2483272f57598c93
 AUX soname.patch 670 BLAKE2B 2fa9843c9be26474a9ba7d5a45ce258ff97ac32ffd4e32c23d572de94f9b7b3722e8f6a61ec5f6ed7d96837eb7e423163536960f07a5b4ecb86c96835ef841b8 SHA512 422c90b220b9366320f2513798d00c2d8a17b0db0ccb87150038c2f237d22c7f0d28206e6d00a7c73b758b6b021886a666a8860586f27fe9b57ddb14094ba7f4
 AUX tinyxml.patch 828 BLAKE2B 33698417dada91b4dbefe81de4f41f0fb9990478a1b0db9e4cc6fea4bb6951c49f7bdf09830cce81c4faf87213318fd0137e8058a7f4dc83b5ed9d688ec2655e SHA512 97cdcbbcd1d4ab4990c7a96ce21c4da983347f73c8064959bbb66d49cc9cda5e293b0273f19d1595ef5b26a6c32267b54cdd45fd4a86b2d8881501a3cea5724a
 DIST OpenNI-1.5.7.10.tar.gz 23378582 BLAKE2B c3532e3fb03bce9a30c94dc950591064d7b62d9eec8d5321c4dc65433be47652f9323a12401b8cbe4d3b81516120712720c1497ab51f220889b26fb33a4fcbc8 SHA512 f7b6106198c4314584cf327744e9d8b193ff9f2e8d416769aafb2aeeda0593ccbb37c3187ed75f1960d2ae8e80e8f30e0fced9ff82e20fe6f24c54246f77d512
-EBUILD OpenNI-1.5.7.10-r2.ebuild 2500 BLAKE2B 6e6fa19a255712fd0c7fd9e42069e4757d548ec5e65bcf9be191536064623df17cf2d4ab7842d2ca060e87f6f5d7a41de02dbe46bea1ecc2ff48d4599a49ef6e SHA512 7009ce5e8234e9c7eaf1ddd48eab931d036f6377041c6d98afac921d185f8523d66e729a7b5f60fb09ab898a3a0df4073658d817dd4d47e8aec07df3e9f7758d
+EBUILD OpenNI-1.5.7.10-r2.ebuild 2499 BLAKE2B 79b5fab54da160dc7ad01119d69551aac6560a33e3b92e68a8be1ac0671c27de9849a1bb2b9c51aa7e3ac6f9464f4298444e4803b189a5c1731848b7d74b0f06 SHA512 4e0e6f4cbc61912163a3789b0c2186f499efb2c2e94769427b7441b51a8057ce7df5830e29745f1b4c838f7b965b603ba15462ef3e2417aed98f6321142075a1
 EBUILD OpenNI-9999.ebuild 2475 BLAKE2B d01e0a023d90224b78245198993c0a367aa297a0b541cac2b15629dae8fce78145867b2000b0834a0abd935bd93938fd25df0c686678a2c624bca2802cdc85c2 SHA512 eb3085ef6e21b372b33a040a11445263e2b5afc18a04c0b3d9b32010818b4f644db73f4f135bd23e04ee857fac3d9c2eecbba6ad6c369ad0b31bde3211109820
 MISC metadata.xml 338 BLAKE2B 57b81adc9f4d40e4f9bc2af7e6ccd5023be4ee0fcdd61b2dee36bd451d22ff6c1d36e06f56fadb1b3a52743a3444751b86e5f0ba7d52b4c0560677aaa957343e SHA512 42212b13a7e8fdd7a60fe0a9a4c80ac7c379ed73a929aa1fbf59dc9fc746c00219e5ed012d5e09e198a0a69aaf721162af2adb2fa0de157439b582021fd07e1d
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
index fcd54b00b17a..c20e1e338bd8 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-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
@@ -14,7 +14,7 @@ inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-Stable-${PV}"
 fi
diff --git a/dev-libs/OpenNI2/Manifest b/dev-libs/OpenNI2/Manifest
index 2d655a7b6b8b..7c98c0d9d72a 100644
--- a/dev-libs/OpenNI2/Manifest
+++ b/dev-libs/OpenNI2/Manifest
@@ -5,6 +5,6 @@ AUX pthread.patch 977 BLAKE2B ce3989613ea9672b67deecd0ca35f5f4bb31d8bcd6cd46985e
 AUX rpath.patch 569 BLAKE2B 5a9433fb5ef61c73c08b22d942f8f9a4b5340bf3e8f7fe834f56025dac0d4a65c17065a0e8151d36c2fbcd7651a3e6c4d4c7579ad1dfff6f552877197c619345 SHA512 86adda790d6814b0339ff969e262b78282c977ff4dc16268d4e7831e1086886aefee5c37c5bae9e97b7caf3e9f22e922f87e429e586fafc8e5503b4f99ef4adc
 AUX soname.patch 674 BLAKE2B ba4b8038016ced8d573e57257cbcc7a61f175ec29a720f2d86c04aeacbd5608d315ee54e8ef260daf1548788a59ebe2cafe0d911cedf58b7eae9f8c0b9c6dec6 SHA512 fec4ab17efd29e1fc05a880584aa63559d311a248ef6def36af9c7c652f93aa0ba77f600115f0e4093b7c5c0b446955a4d36d9663196882f5c460a26d99498be
 DIST OpenNI2-2.2_beta2.tar.gz 8681740 BLAKE2B b5191fefd93a5b10e43412d4f0c1ae095a5168ea788d0e2b325daff3ee0329a47f3341c0d712c3a186d23cb3f9fa03478f3342acbd634502cc92aaed0d97d185 SHA512 60a3a3043679f3069aea869e92dc5881328ce4393d4140ea8d089027321ac501ae27d283657214e2834d216d0d49bf4f29a4b3d3e43df27a6ed21f889cd0083f
-EBUILD OpenNI2-2.2_beta2-r1.ebuild 2465 BLAKE2B 4c01ff55fc8ddd2280a426976824045acd2fce0ca052365975c2dd92c8d2986cee78724cda8a623ba38891f5f40f549251d09ce9334465f85cec3d8b441d2593 SHA512 1d21d1b545d376e1fcb800e41a993a05d2669ebdc5edbed08dc43af776db8800503fa9600ce3e976dd5c789d019841cc2e918dd766d9fc70c6af482383e0367f
+EBUILD OpenNI2-2.2_beta2-r1.ebuild 2464 BLAKE2B 0d417bdd0ae259a75a406e280a85ca0df85cb2cd37cb560b9177ffeeeaf4eb1de6e3d0edfa76cd8f09cd5ed691080fa63d8531bf32cb0d957456e63400e60781 SHA512 98f9f36fdb3cc785dc387c44faca6562eea72db988481d69831ac0e49108085b14593e02cdb2d97c5931db9e67d5f5c115f42572020caf47d07e8698fa0685eb
 EBUILD OpenNI2-9999.ebuild 2412 BLAKE2B 79170f9c10e8df722109df4d125be0f2ff21a02cf01ab955742b633e685bf4690a3e0f5d9a38da976f610e2ea653bc209d6ae5f2ab1779d5a94ff8509769f102 SHA512 b1e1777d2e221a54704afe0c016324aac677ec9a3cfbc3f13e8dfd985c079ac003e8322121667571563e7a9186999c05b2d18b82c45c8c9a0462a719c9ed7834
 MISC metadata.xml 342 BLAKE2B 79de2b17743b42d3994a610f70f25ee5b5a31b47c7b26a0e59bf0d3bfdede42785b35528bda8cc60197b7e83d0546d36a985dc1c96f5b2f9e35d541e3cb4077d SHA512 2bcf413ed30f3e964530038b75e9e1b01bc952e900a168ab614f1124218807e1293815787d4e7420ba354b26e70cf1676a2833576447cb909c8deb2f97e8c684
diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild
index 8650fe294537..a74f713947b0 100644
--- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	SRC_URI="https://github.com/occipital/OpenNI2/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/_/-}"
 fi
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index f538311ef99b..3cfef6a81071 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,5 +1,5 @@
 DIST angelscript_2.35.0.zip 1971850 BLAKE2B 2253583f46181b420514e3f5a4609a33a019e47ac4ef183d1ddbca52610ce421da28a0e67f16f04b873bd18d9c56673bfac5aba152e6fadff84f8fe4718308a4 SHA512 e54b58e78b21c2ff6aa34d5f55b18fcf8737d057c86aef8901ac0c11f14739fe7f1494f9bcfdbca6a8e54b6d0b36a04dd098780bcd02dea5764fd6d22984b6b0
 DIST angelscript_2.35.1.zip 2033435 BLAKE2B b88189fb78294e5804adf313bc333a9a21760120a42b3df78c9c54861718acf435de55dcfb26a8975407102c1182093caed11bfecc6ba946bc7614f62f7e176a SHA512 b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa
 EBUILD angelscript-2.35.0.ebuild 993 BLAKE2B d3a12ba2531ce84532b7dcb61a4921fd3caa17820c032c0a79803d4c7bcfad4202c1a3b0c95f1453ebbc0b239c8e7935703d23e181c7dc1cad9420eb2e87e3fe SHA512 148a185791b7d9cf4e51781da3911a9080cf70495b4e1198700791149c4885ce5752775394fc807230b892fb153aced0a8e31bfba90d7cc6cefa76dea70d342f
-EBUILD angelscript-2.35.1.ebuild 993 BLAKE2B 63f4afc6e695bc594eb9ba8352dedd13ae43fc473ed5a34516b288a7565fb7416f599bc8a3b0603d2f8290504c44cc7bc86150bb25ff1bea3b441c433b765e2c SHA512 0a5bbef25caef9d930c67260d065a8fb735f2819e443b4d07eca72af06e5d8a3207b9f353aa7b8a07411ff9329bd88c46b401b03e920baf2be4528037d2e5a85
+EBUILD angelscript-2.35.1.ebuild 1000 BLAKE2B 643e6fcdea47e013ab3a38f6dac69747fa1fb15bdb16ba384db920e2800d8cd6a00317daa0b9448a9e80b9b6e3dae7fe8d48ef22d0d541e6da0f0ea11d33fc61 SHA512 4c1a8a32162074c93c7498e34a43b6204da3e1fee27f1b245c363a4a01263bc0f5583b0f156d0690db2912c79f8713bb0996e6aee371a39e3f1b09d02463426b
 MISC metadata.xml 407 BLAKE2B 5d10a87729e294d0df6a7afd624cd4012116e773736aae89ee56763eee0002feca2206d62b22feaa835383c1b0d197966a5e19f48851281b06df0c7cf9c0a4a8 SHA512 883e575349da504d73f1aad6b8e03fe12a1a0c05a33c63cf592bc1919fe926a4f5fcc80fc68deeb026adc143ebee0b96bbff2f32d0d5fa49554a0af28ee69b19
diff --git a/dev-libs/angelscript/angelscript-2.35.1.ebuild b/dev-libs/angelscript/angelscript-2.35.1.ebuild
index b6aecfbeccf1..11dc16f8dbb8 100644
--- a/dev-libs/angelscript/angelscript-2.35.1.ebuild
+++ b/dev-libs/angelscript/angelscript-2.35.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.angelcode.com/angelscript/"
 SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 IUSE="doc static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 2b3d2ddcba46..749382eb57cc 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -4,5 +4,5 @@ AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb
 AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f0897bba5e55270e860f2f1edc86ebe44214395a64e70c3f984f324328a8f7a6276c86cb46caca16719ab3ad51aff995868818f SHA512 edd5e1cd7d31e7bfb1b166c162ad8c69c704c8e9a09e85770df3b625ed918ed52918a16728a9b4d69370ccc75ade32dd64ef73b31ce6e8dac7a360fe44ca34e7
 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.6.1-r8.ebuild 3796 BLAKE2B a00b353eacdf6bc150e8083d5359135e8aab9c070f31a3258d2dc066798a5bc81185c31f06e46768bfe72b2927ed2ad5ccf1bf3339eaa27946db6d1fca88e0b6 SHA512 77eb8e7ad7e916c4c4f67dc8f35ac31565aa2c29f26423bfc4b91ee7a779a8d4708be8a43931d3fe13a01f3033100be163ba4d760ae98135ddbcdc9a80006110
-MISC metadata.xml 387 BLAKE2B 0f74d66e71f89de83335d9885cfe4ea84a408f208ede8ce3cbe67627868f7895a9a33bc844c5d732a02ed3fd7b4f727bf719eecfcacd6dfdd1262d3ea78bcae4 SHA512 068b8833328d94e22ffcedfd2d7c9cd740b937f991bd986dff6b37a38f2b04d3a137b539c99c81f02c4a041dba11983cba0306ce700072193bce3e059b13633d
+EBUILD apr-util-1.6.1-r8.ebuild 3787 BLAKE2B 1e4f8ec847da2607556c7cf58773ee5e5a94793d9231168eff0f96eb4ed359a18d87a19c193ba55b8753c123de75e194ef9fad797d60e6808b0a181a9ec8341b SHA512 1c85cb121e872b923188db6fc568ae7f7fa240a051caaa2b8df871deb2012c316402f7457547a3ffaba4d7e477427ccece507978bdba0508bfa232ba4c1fa566
+MISC metadata.xml 303 BLAKE2B 332d3ab6d5d227eed2ad1ac25409d813426dd202836b4bae9da82a9776945bba921ab3bad7c971a9edc60ab63add049ce30b0c172be3d206559818f9774ff94d SHA512 65c30f9e970c064209d6a5be68eec33037483e1f9adb5b46c721fce29ac75404d6466ff92f9df297da34e86443828910711160ac04819632e3c1b942354fdfdd
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
index 74595ea262dc..6209149b702b 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
@@ -70,7 +70,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--datadir="${EPREFIX}"/usr/share/apr-util-1
-		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr="${ESYSROOT}"/usr
 		--with-expat="${EPREFIX}"/usr
 		--without-sqlite2
 		$(use_with gdbm)
diff --git a/dev-libs/apr-util/metadata.xml b/dev-libs/apr-util/metadata.xml
index d9ea02b8ec60..58d51ed7c7be 100644
--- a/dev-libs/apr-util/metadata.xml
+++ b/dev-libs/apr-util/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>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="nss">Install apr_crypto_nss module</flag>
 		<flag name="openssl">Install apr_crypto_openssl module</flag>
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 45fa0c601496..83c118342bb3 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -11,5 +11,5 @@ DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb82
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.6.3-r7.ebuild 4588 BLAKE2B 142e2a5f12b048898ecaaaf1dd49db3fc68e771f3b34efd04f4b60bb2a54f99c7fb2b6625ce6c2d2bcc5428e2a614eace274ce141496d0a1ee4cf7163b6dd6ae SHA512 9e45f291e168356a9c9f02a714e2ae3c98318d4eea91b0bbf9ec2eea7c81cfa235fad4e21a1ad0603f636e68c77cc10a9ad4e3c09c8ee9153030a587fd5a2a12
 EBUILD apr-1.6.5-r4.ebuild 4534 BLAKE2B 0a20eb3bdeb8b01e642ed75e7c3390f866cb38fe8dc264bd3aa32fca93ad72ed1e4aa1e006625bbc9e251caf2fdfb5e8b7df655f3c6e6336aacd8896f614c7fd SHA512 21b961189842eed4739c024977334b3b061e125d5b7bed61e7dd1ad7ce4c8a2e8026a4962203d9018a7af6f17ddc25660c9b7765aa0a8e12504eb2219eaade59
-EBUILD apr-1.7.0-r4.ebuild 4504 BLAKE2B 73996f7ae0de78624bcf8a648cc96a4f6a65f3b6171743cfae6e5f86f45d549d2d39fc921ee344b4f032e7cf6a3c4b1aaad823bf8af0fbbc9c98dd90b80003c0 SHA512 13f8d3b67db2eea7013d6009fc05d754b8bfef3306883501dfa2b65deca468704f4b49db20e6e938ac7d28caef0763cb593cf1962102e6d56828a8ed2e3b409f
-MISC metadata.xml 434 BLAKE2B b757acb73195bacb3e89e6fefcadd77beb184ecaf6f15471842c5715a2ec15e10157e8916a25580884a570a274047b3e9868ba65393cebbf47c397e6d6474b4a SHA512 d27ba45c40ced6bf6a60bcb74a8ad474ff9048430d9cb8d08573c0f2e1958eda333edfdbf90ecf00f4c33b50502872645457fd11d8f1cb1c5f90f745e08341ca
+EBUILD apr-1.7.0-r4.ebuild 4511 BLAKE2B 74ea0dd4227e2785e1a45eff3d1293d9fe937b57917107e736c0a1b056623eca5524e2bd3fe6c4f53c807e41394beca57513fed1318cf34c2b96abe8dede4c40 SHA512 dcf4320fe8c7ac38b3e89fe32a94fa9f4150d2269fc0e49822a9f488c9de485449f1ffa9e4d370b2f2c8ed1aecf46eea5313dfe779c1b08f55f4baa13bf0ac51
+MISC metadata.xml 350 BLAKE2B 13d631128ad2757b8706d23edc547b7c2afd1db973c08120e91700de92f6467b258eac53f5d4a16e7dbdbce941ad57f2b623e37175cd6bb8b39c73c1490b2cd5 SHA512 ee408760bfcbf84bc89a0257c6f439f2ddcaee33048bc7054073f62cde939bbe4a5849ea16d5cc7a5cd3e58da0a9bf64b3c45337f8d6be72ec22e61431571d10
diff --git a/dev-libs/apr/apr-1.7.0-r4.ebuild b/dev-libs/apr/apr-1.7.0-r4.ebuild
index deb46f4b9f16..3348d775384b 100644
--- a/dev-libs/apr/apr-1.7.0-r4.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index 65038767e3a3..e87dffa3fe49 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/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>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="older-kernels-compatibility">Enable binary compatibility with older kernels</flag>
 		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
diff --git a/dev-libs/asmjit/Manifest b/dev-libs/asmjit/Manifest
new file mode 100644
index 000000000000..07343330647b
--- /dev/null
+++ b/dev-libs/asmjit/Manifest
@@ -0,0 +1,4 @@
+AUX asmjit-2021.11.13-gentoo.patch 1936 BLAKE2B f809f2f5f9ab8a916d7a5f1a025f94694164c16b85cf65dbec54dea0cae2fe75a438ed393dfa6977f3cf43fec49de32e0b6dd346bb0b5cbf861555977f0fc0ff SHA512 cf0e207c6580061abaefbe3d0655a9d0bac8be4784bd0eb53e9689f97e95a9a90f48391a2394dbb36a7ea4b3fa168927bb140238917c21c08b8b86fcc1b83fec
+DIST asmjit-2021.11.13.tar.gz 717251 BLAKE2B 2bcad7234b0cab2d60c9fcd09149c93397595ca4859cb415378dabf52f8660de3aa5de40ee192fca814ee62bfc690ae8260c2f54faf10eb52c3ed3d63d1f4258 SHA512 2774168ff0847b3c29aee87325f12e431693c70661f8c10e0dc0d6530a3683d51ca472ef993e88c9d4e179494b045b2e75c22d6eda19b0c75e19843b69162da1
+EBUILD asmjit-2021.11.13.ebuild 661 BLAKE2B 20dcaa8acddd4db8ed4ff99bfc8e2eb45ab20f50a3403713b38353eb3399a8a67e05b6fe26c9dd9307fbfc8de051d77ca52ec91fa408164e664555ba2d822a44 SHA512 4184f9ba6e02374582e655b14149a484655c9beb9ce6f02ac6317ddace4227bb26ffbedd4070cdbfe895d3836ea3360a8c3f15642385fdcf16cc6f33865cc389
+MISC metadata.xml 326 BLAKE2B 33b6a6c08e1c2d3427bd6106ba3d354c2b5cce4ea529d955d558839ce1b2446ed0980f0a149f4706d89abdbf61d98e99cf5c30dbbb58e30a9c8c659b33992c6f SHA512 753ce999cb3a5a181bdf8efa874269cf31b43c836a8e2ac709fc64429ca003fccfafc38bdd0fc1ddfbc92a45baea64370568b96ff4435eed0df636eab6d41d34
diff --git a/dev-libs/asmjit/asmjit-2021.11.13.ebuild b/dev-libs/asmjit/asmjit-2021.11.13.ebuild
new file mode 100644
index 000000000000..27da2e68b8b3
--- /dev/null
+++ b/dev-libs/asmjit/asmjit-2021.11.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=4ec760a3d1f69e32ba460ecd2513f29b8428700b
+DESCRIPTION="Machine code generation for C++"
+HOMEPAGE="https://asmjit.com/"
+SRC_URI="https://github.com/asmjit/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DASMJIT_TEST=$(usex test TRUE FALSE)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/asmjit/files/asmjit-2021.11.13-gentoo.patch b/dev-libs/asmjit/files/asmjit-2021.11.13-gentoo.patch
new file mode 100644
index 000000000000..035ffbbbdcea
--- /dev/null
+++ b/dev-libs/asmjit/files/asmjit-2021.11.13-gentoo.patch
@@ -0,0 +1,45 @@
+diff --git a/src/asmjit/core/support.h b/src/asmjit/core/support.h
+index f98ffaa..2329cb2 100644
+--- a/src/asmjit/core/support.h
++++ b/src/asmjit/core/support.h
+@@ -33,33 +33,40 @@
+ ASMJIT_BEGIN_NAMESPACE
+ 
+ //! \addtogroup asmjit_utilities
+ //! \{
+ 
+ //! Contains support classes and functions that may be used by AsmJit source
+ //! and header files. Anything defined here is considered internal and should
+ //! not be used outside of AsmJit and related projects like AsmTK.
+ namespace Support {
+ 
+ // ============================================================================
+ // [asmjit::Support - Architecture Features & Constraints]
+ // ============================================================================
+ 
+ //! \cond INTERNAL
++#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 11
++// There is a bug in GCC11+ that makes it unusable to use annotated unaligned loads/stores.
++static constexpr bool kUnalignedAccess16 = false;
++static constexpr bool kUnalignedAccess32 = false;
++static constexpr bool kUnalignedAccess64 = false;
++#else
+ static constexpr bool kUnalignedAccess16 = ASMJIT_ARCH_X86 != 0;
+ static constexpr bool kUnalignedAccess32 = ASMJIT_ARCH_X86 != 0;
+ static constexpr bool kUnalignedAccess64 = ASMJIT_ARCH_X86 != 0;
++#endif
+ //! \endcond
+ 
+ // ============================================================================
+ // [asmjit::Support - Internal]
+ // ============================================================================
+ 
+ //! \cond INTERNAL
+ namespace Internal {
+   template<typename T, size_t Alignment>
+   struct AlignedInt {};
+ 
+   template<> struct AlignedInt<uint16_t, 1> { typedef uint16_t ASMJIT_ALIGN_TYPE(T, 1); };
+   template<> struct AlignedInt<uint16_t, 2> { typedef uint16_t T; };
+   template<> struct AlignedInt<uint32_t, 1> { typedef uint32_t ASMJIT_ALIGN_TYPE(T, 1); };
+   template<> struct AlignedInt<uint32_t, 2> { typedef uint32_t ASMJIT_ALIGN_TYPE(T, 2); };
diff --git a/dev-libs/asmjit/metadata.xml b/dev-libs/asmjit/metadata.xml
new file mode 100644
index 000000000000..0e892b7edd0d
--- /dev/null
+++ b/dev-libs/asmjit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">asmjit/asmjit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest
index 63d3963c3dfa..dd84d8459fd9 100644
--- a/dev-libs/atf/Manifest
+++ b/dev-libs/atf/Manifest
@@ -1,4 +1,4 @@
 AUX atf-0.21-getopt-solaris.patch 191 BLAKE2B 100e710c5cd10d5b0cd35fc2b6fcbba440496c3bdf99b7b88162b214e1fbf030cf54a0289b801b9946f89df0fe26ecc452f498ecd9e546462ccfd989aa313f64 SHA512 c98c062793abb014731e249d833e94fb4c0e7f5ced37f7310caa6e3a26a3b391c4fe90133656c21f6bb467af5d8039f887a3a42630b6e9725ecb84b99309a94b
 DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1
-EBUILD atf-0.21-r2.ebuild 676 BLAKE2B 743f4fb03fbd6de0d0e4fe5e37227b9eb9121efe47cf2a3e229d78de35e5647e1e339b943bcab0cf144cc0adb35fb455cd4d89463b37b1ffbe206937a3285a70 SHA512 cb5748b1e270c313bfa0b9fa5bcfb0a4a4e299657f71a284c23f3461220414646b07c08b7c966ee8c95bd7a186e5c0536ea8317845ed65db4555da413df2c891
+EBUILD atf-0.21-r2.ebuild 683 BLAKE2B 7e57504cd98c6f78f5178ae934c15f5cae19ac88d425f3f99bc2cb7aacbc93499a06ffcdd691a24843816bcac81a2ed11db455a46a1a3a62f351b325ccaf9b95 SHA512 89cd7efdf9a162201139521f748b314dc41b7ff907c489196fd911dab295bddf55249c05a2c318d9479526eeaeeb23cf54c3716a4163a2e83cc7c6c179715744
 MISC metadata.xml 247 BLAKE2B 9dcf90d404c84f0ce3da367274c25984b6497a2d8fb68496f497e76c7061c9c7ca7f444f7e4ccb62ba06223caaf0eea4d6aebbb2409ba1f08bb57123e72f0836 SHA512 4681b02c210bf3f869157694af1f80cb3e9b2dd619283a249aaafa85d3bc328c1306af5d61c69040fc503feb3271490bdd2e38e61479a94940fa225810b9e8cb
diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild
index 019033ac1871..696e7388b2da 100644
--- a/dev-libs/atf/atf-0.21-r2.ebuild
+++ b/dev-libs/atf/atf-0.21-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 29062cc664b4..b48e1edc00b0 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD atk-2.38.0.ebuild 958 BLAKE2B 9d6a022a74b61ae001be734c917d7b524457e65dc95349b00a9dc56a24eb2c38772e3f91d7f8e0cb2b28a52566317a9d048546c98086e81e1d797537fd8411c0 SHA512 b2bcf165bfb718c308bfd635189b0bfdb2166e875fccf7b7007a5ef88034d64977516ee9b25973388ca1b20ee470534782b4524047e6b9f0fadb4df33c3048c1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild
deleted file mode 100644
index 342f95bebb52..000000000000
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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/atk/atk-2.38.0.ebuild b/dev-libs/atk/atk-2.38.0.ebuild
index 510b8b59fa7c..7b1b4a734e40 100644
--- a/dev-libs/atk/atk-2.38.0.ebuild
+++ b/dev-libs/atk/atk-2.38.0.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 0cfda5e69e5d..8b098d55d6c4 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -7,5 +7,5 @@ AUX boost-1.78.0-interprocess-musl-include.patch 676 BLAKE2B 4278a20b6494a8653c4
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 EBUILD boost-1.78.0-r2.ebuild 10684 BLAKE2B 98527e0715d126b28c1bd417da4260278b50d60c03d1fd498466cf49fc5e544e3592ac5ed1b92d71ca1ff1103c62362d20d298282bdb1c4ab7da9e839ca81b8f SHA512 702fe6679f80ccfdfc754a9684289a078c2a14e0c5099a12fe31d4beccc50a2139afdaad8e146b7426dd8ff8642aa06b29ca132f0a82cf0a73b7422b3c2308f6
-EBUILD boost-1.79.0.ebuild 10639 BLAKE2B 94f84c2c16abd5c293c1ace57bb9e8be02518d21b4ebff923096abf2258236b97935de79f4a54da15b21ee07b475479dccecd1f3c03f95a4b5f608a5849e094b SHA512 d1287641677dba454f589179ae9a632046d214cb3a6693a075939b2ab3cf7565c6d520473eaa21aab03441ecc00f44db4bbb41e7853ebfcb3d8865a59aafdb71
+EBUILD boost-1.79.0.ebuild 10620 BLAKE2B 8549074402f131948c2944f822827c85353f7102353397f8070047449aea31471204d1adbd9605e777a8b15aa2ba47de3b1e9af1602d99214ef0b4a227c2f3d1 SHA512 d014a9dbe67bc32a1aad64c5d11543e8476f027cc0ad4291cf512f7668d43ddffb0484c0327e9780512b6566d9df35012bdb0373cee0a8ea7580be61f2262928
 MISC metadata.xml 1296 BLAKE2B 68366717e95027dc72733a63960c674a710cd3f05ca6adc4d0ce96d1da03725800c39d11b788e063401c1661b67b27972a729861c6d7abecf42a343df889d990 SHA512 52ef93567f2ea6ff7be566eff974407d508d3c1b05d691f8753b6dafb39afaf03ca1d5b0d4d23e6f411099aa8b8a177a0b6b05c668c1cfb387c87d5df5342cad
diff --git a/dev-libs/boost/boost-1.79.0.ebuild b/dev-libs/boost/boost-1.79.0.ebuild
index 5be71891e682..13fa77c98924 100644
--- a/dev-libs/boost/boost-1.79.0.ebuild
+++ b/dev-libs/boost/boost-1.79.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # the tests will never fail because these are not intended as sanity
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 7bdf412f66ad..89269f764fc1 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,4 +1,7 @@
 DIST Botan-2.19.1.tar.xz 6088380 BLAKE2B 7a2d50bb66ea4a1875857bea769bcc30f397170a10a70377c3963d92e33321a079271c1e235a7892e33ec5b1bc19e4df8336b2586548ccd849f52ebfa47d9c8f SHA512 e604be0e7e82da89e3e1949d3035a87dc63314bd9854d5fe5129ccb3ed5bc78edb0406c7f8ad1a152b59a63b6d98ba207a0851a08428c3452cce794614b5eef5
 DIST Botan-2.19.1.tar.xz.asc 488 BLAKE2B 36f27e294fed60ea4d9ee9d919a58fc431a1bf9bdec8c12d30f2cba537a70b0e22f6a7c882cf7a80dc10aeee256f9f4a32129b55d2ab5df192d16759638feaa4 SHA512 2cd57bf97630d8f79cc0a87da79d3b338bd3b33b02ded16f6b60d5fd6cb3ea62105f577deb3b8d061f56a09ff902ff553ea3a0c603d5c3bd53a905024a2f457b
+DIST Botan-2.19.2.tar.xz 6063336 BLAKE2B a46fa49c61846e718197ab3a8431a5bdcab0f4cc5e42aec04fd22932ecdbfa2b755cae53c125eee8248ecae237671ec6f0533f99289068ed81e6cd34886d8b88 SHA512 52b9c80a240457e46a299480338472f7d0c0b56df7b1709fdef52c5be3afca5b474fe143801c9a332ae884eaf033e60461c9d3e0b2f7b069f4fe8b4c45932abf
+DIST Botan-2.19.2.tar.xz.asc 488 BLAKE2B 94d22dff9de02871560649b1d961f4c7ae5fa37a847141554f8da9f0a726d4497cd23e0d84197beb4d176f29aa3a478118d94cd52d2c04733d115828f85d400d SHA512 e25a03ac437a08737ecde541ead4b841ccb507d3198683a1755dab1d4f82e9ce0278473db7c7041a4b808f9dff9927106e30bbad79b1674615254ee78f0b6a06
 EBUILD botan-2.19.1.ebuild 4145 BLAKE2B c9f3428f8b5c3b163f5de138b5b72b2300b7d05f1e1ce321b2086676e872a9cda5470e117a57c0ff0c8ccd964fcc1bf3caa851856c656076713cc0736745aeb5 SHA512 aa89b9cab9813fd21f7c504725ff32fbad660441e373ca73f7329ac67fceacada5b228393146be151d409af8415e03155bfd74e7fca32e11c7f5e161147a2886
-MISC metadata.xml 519 BLAKE2B 78e28054a5c35b101d1f1b20ce1095a8a4f0ee8cf312e8d4f3aa711310d34d48878040ffa2a5a7a6600b071cfb5898b69508796aacd3f1d7658c2f30cbda1200 SHA512 9b039acb51f28ad8f21ed310e34d0d36fa7c5dd763fe8661a7ae21dc8dcc08c55d1eb9f1d0e519773697fe18600ffb3424811244e6f7ae243f6e675988006142
+EBUILD botan-2.19.2.ebuild 4390 BLAKE2B d9deeeb701b0e455bdbf65dfffec3f8383625b51b8dbda01f054b424e38838d6337ca9c6e22780ffc2c296d2bab42260888577bb9c0a6884ccea2def40f03bdc SHA512 9e23e56291805f94f06d971d4a86f3fa481a7facbe38d68492a9e32ac1c8f19f39908ccfb3d953f9191243a4eb953f64ef203d713efabcd227dea5ba9cff3aa0
+MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d
diff --git a/dev-libs/botan/botan-2.19.2.ebuild b/dev-libs/botan/botan-2.19.2.ebuild
new file mode 100644
index 000000000000..f7dd41802cb6
--- /dev/null
+++ b/dev-libs/botan/botan-2.19.2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc
+inherit edo python-r1 toolchain-funcs verify-sig
+
+MY_P="Botan-${PV}"
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib"
+RESTRICT="!test? ( test )"
+
+CPU_USE=(
+	cpu_flags_arm_{aes,neon}
+	cpu_flags_ppc_altivec
+	cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2}
+)
+
+IUSE+=" ${CPU_USE[@]}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+	verify-sig? ( sec-keys/openpgp-keys-botan )
+"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	use doc || return 0
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	python_setup
+
+	local disable_modules=(
+		$(usev !boost 'boost')
+	)
+
+	if [[ -z "${DISABLE_MODULES}" ]] ; then
+		elog "Disabling module(s): ${disable_modules[@]}"
+	fi
+
+	local chostarch="${CHOST%%-*}"
+
+	# Arch specific wrangling
+	local myos=
+	case ${CHOST} in
+		*-darwin*)
+			myos=darwin
+			;;
+		*)
+			myos=linux
+
+			if [[ ${CHOST} == *hppa* ]] ; then
+				chostarch=parisc
+			elif [[ ${PROFILE_ARCH} == sparc64 ]] ; then
+				chostarch="sparc32-v9"
+			fi
+			;;
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	local myargs=(
+		# Intrinsics
+		# TODO: x86 RDSEED (new CPU_FLAGS_X86?)
+		# TODO: POWER Crypto (new CPU_FLAGS_PPC?)
+		$(usev !cpu_flags_arm_aes '--disable-armv8crypto')
+		$(usev !cpu_flags_arm_neon '--disable-neon')
+		$(usev !cpu_flags_ppc_altivec '--disable-altivec')
+		$(usev !cpu_flags_x86_aes '--disable-aes-ni')
+		$(usev !cpu_flags_x86_avx2 '--disable-avx2')
+		$(usev !cpu_flags_x86_popcnt '--disable-bmi2')
+		$(usev !cpu_flags_x86_rdrand '--disable-rdrand')
+		$(usev !cpu_flags_x86_sha '--disable-sha-ni')
+		$(usev !cpu_flags_x86_sse2 '--disable-sse2')
+		$(usev !cpu_flags_x86_ssse3 '--disable-ssse3')
+		$(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1')
+		$(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2')
+
+		# HPPA's GCC doesn't support SSP (presumably due to stack direction)
+		$(usev hppa '--without-stack-protector')
+
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_enable static-libs static-library)
+		$(use_with sqlite sqlite3)
+		$(use_with zlib)
+
+		--cpu=${chostarch}
+		--docdir=share/doc
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}")
+		--distribution-info="Gentoo ${PVR}"
+		--libdir="$(get_libdir)"
+
+		# Don't install Python bindings automatically
+		# (do it manually later in the right place)
+		# bug #723096
+		--no-install-python-module
+
+		--os=${myos}
+		--prefix="${EPREFIX}"/usr
+		--with-endian="$(tc-endian)"
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}")
+	)
+
+	local build_targets=(
+		shared
+		$(usev static-libs static)
+		$(usev tools cli)
+		$(usev test tests)
+	)
+
+	myargs+=(
+		--build-targets=$(IFS=","; echo "${build_targets[*]}")
+	)
+
+	if use elibc_glibc && use kernel_linux ; then
+		myargs+=(
+			--with-os-features=getrandom,getentropy
+		)
+	fi
+
+	tc-export AR CC CXX
+
+	edo ${EPYTHON} configure.py --verbose "${myargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml
index c6fdbfce6159..aa26e3323953 100644
--- a/dev-libs/botan/metadata.xml
+++ b/dev-libs/botan/metadata.xml
@@ -6,7 +6,8 @@
 		<name>Sam James</name>
 	</maintainer>
 	<use>
-		<flag name="boost">use <pkg>dev-libs/boost</pkg></flag>
+		<flag name="boost">Use <pkg>dev-libs/boost</pkg></flag>
+		<flag name="tools">Install optional tools for e.g. hashing</flag>
 	</use>
 	<slots>
 		<subslots>botan soname version</subslots>
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 1db2d6f2ecfb..2596649f68b7 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,8 +1,8 @@
 DIST criterion-2.4.0.tar.gz 870099 BLAKE2B 06d81344f6e9110cbb4313c847e0fb1d596ddfad7ab57d4a0c9df2140c5506450f702082d6fc893d819b74252b20193720ca44a903b43c43e940122529da88ad SHA512 4a7cd9cd26f64bfeb95683a0479a59b29676ffc5110041757417ab152dced7a360a94fd721b31e45e1b91d0ca08fec0327d7a7d56a2cf9d2f3e9e25e2b95f446
-DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821
+DIST criterion-2.4.1.tar.gz 870842 BLAKE2B 8b7db80d5e943d4380072106eb32ffe95896e4e588986588fd8b0ebfe1078657e2a9231090355563fd8bd8588cacbaa5839e269a0a9c4e56b882789c97379f9b SHA512 22f1ae5152db93736282fac098ad510d497aa804589df8070fb6cf36a3063868f2a9ed3c5771bfde8a0352355d81178816870d68b83ca6d6582fd17cdd9332d9
 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
 DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbbdddd34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62
 EBUILD criterion-2.4.0.ebuild 1790 BLAKE2B 93849e147ce654196f068f900f9c6ae736501923cad668c8ee6090ea1ebc51f7797f67b1ad9d33008a470ef3114a73b1de5eff42674cca33e31609e3774418f2 SHA512 0fe13ea0af0fe57ea8e4084add34fc556736a2a7c61fb2a9a46e8fba8d5c13d3ab7b48cdf848106e65a4708f9d8f60e67e331591faf4969918dc0741682009f9
-EBUILD criterion-2.4_pre20211218.ebuild 1866 BLAKE2B c14ccfcb7d68b88ef3d79bdc559c62e3e7d3c2e74810e79893c87166715b5037fc499c116c01370d664b3bbb89203052cc59950ee644b72b7ddffb6b5bb2f5f6 SHA512 c94762c0dabc9a99636ed75b02139dc28545f16b20d4150fa43e4568b44500007d587cc94e1e5bd19c50e587c60bf1b8fa9cc09626b581e7a59d6fc4b316497d
+EBUILD criterion-2.4.1.ebuild 1789 BLAKE2B 458b5969f5a599aa497647d39557ae006c6af9a5323f8c6f7724b82dc900c9043f587da45e529ece4e239fc41b26bd1db7bcdb6a4f7040641696205dab1b8ae7 SHA512 32ef24ccc3347b674546941fc6c8894c659604a804739499ad94113b4df24e948b7b65246fceccc2a706e11298cd6c8ee47c3d3deef89c274c7223837302a736
 MISC metadata.xml 495 BLAKE2B e26a19888a85984288468d569c85fc5076c0e78fa79c759ef0fb4f62e2c84453200f819459a9b85ac3dd7d4a08017b4c61bfdd01b73288ed4663332030f9a8aa SHA512 9602e9b6e0405dce29b8e90c72d95ce64fe0c4f54df0ed01416cc9562533195c2fcbde1fd139547387b3aabda8b4896a05bf4a277bb3a2921bf02cf66f81b744
diff --git a/dev-libs/criterion/criterion-2.4_pre20211218.ebuild b/dev-libs/criterion/criterion-2.4.1.ebuild
index 3125df752cce..dbcf92534260 100644
--- a/dev-libs/criterion/criterion-2.4_pre20211218.ebuild
+++ b/dev-libs/criterion/criterion-2.4.1.ebuild
@@ -3,25 +3,24 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson python-any-r1
 
-CRITERION_COMMIT="a91a69f65006c057812fdd850b100ff28790ea73"
 DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
 KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
 NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818"
 
 DESCRIPTION="Cross platform unit testing framework for C and C++"
 HOMEPAGE="https://github.com/Snaipe/Criterion"
-SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz
+SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz
 	https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz
 	https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz"
 
 LICENSE="BSD-2 MIT ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -29,13 +28,14 @@ RDEPEND="dev-libs/nanomsg:=
 	dev-libs/libgit2:=
 	dev-libs/libffi:="
 DEPEND="${RDEPEND}
-	dev-libs/boxfort
+	>=dev-libs/boxfort-0.1.4
 	test? (
 		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
 	)"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-util/cmake
+	virtual/pkgconfig"
 
-S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
+S="${WORKDIR}/Criterion-${PV}"
 
 python_check_deps() {
 	has_version "dev-util/cram[${PYTHON_USEDEP}]"
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 18a03c52c63e..9626856a9f0e 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,5 +1,5 @@
 AUX crypto++-8.2.0-musl-ldconfig.patch 1012 BLAKE2B 3c076365b7a6458c8348aa84c66df3d84c73829f49e36f3dffa9ba75be064235d9128721798967a7baff1e1f283f7789587d31f299275501039ba9e78ec4ccd0 SHA512 61f342e134cf696a1d064b9c27cbece4cccbbaa6a6ac55bd0bdff9e13669ce2e19b9f31ba0307410822bcf2c016397dbe81f79815a23f3f1cff2a3aa45d8622c
 DIST cryptopp860.zip 9274149 BLAKE2B c93998e2deb93abf12b801877404f0f82547bfbbbc5aae727e68daffc2407877dda76d7bcd06239d40a48baf21b6f2e29f74e9a97ecbc1b5d4b5bcc50ada71da SHA512 e7773f5e4a7dc7e8e735b1702524bee56ba38e5211544c9c9778bc51ed8dc7b376c17f2e406410043b636312336f26f76dc963f298872f8c13933e88c232fc03
 DIST cryptopp860.zip.sig 659 BLAKE2B 591a535092c61964c0fbb1ba31e44e70fc5f15757b9b56476ff64de0c28d47a13fe99d7f5819cfeb52e514ade1454622451b267bcc751868defcb080ddf79e8c SHA512 6231816b1ccec75cbcdd09daa8895830c5f4c595a4a0aa24dacc3e377832d8db5efa1aeadf815e53db32fc5263b09dd1b249668f34da4bfad5d5cba6f031ce21
-EBUILD crypto++-8.6.0.ebuild 1484 BLAKE2B 3ad6b804dac04fa8b2e4f5cc302f62c432a8ffccf9db10784fb7cea48820dd5cf3b094e189cf339158107a6fc2680fe658d9bb847638584aed98011e682c0811 SHA512 37eed0f2ad965b8c6f82ec1163095e83212742dea7b0f8d037fcc968206b2878cfc21708c2a515cd06dff2ce90f1b825784e2381b2bf11c723fe30b63219767d
+EBUILD crypto++-8.6.0.ebuild 1491 BLAKE2B c51f50452f2d6330b7b512361e79d868ca9a4d24185b2792d99c285d1543d73f4ad7ee26f49d97cd251bd564f1fed3c11bbbdd727932ca1c7d4597e0d62c9b2a SHA512 6b193d96a8c3b8465edc64b61bcf647e9f6821880998c237962cb19fb7ba017a913cde86dcffb4f6e314bb594779dc6be9dac47805f616281e2489cf5aca41fb
 MISC metadata.xml 506 BLAKE2B 5d6a8770ad53c178e43d30c04be9924718eaf373e8d9945f637db7af71fccf9b21bf46141910ec1cb1ea12e3817dfef4c7881d935fb6f441898ee949ac13ee5f SHA512 8d195dfc2d4f627f59d3a37d4988a0bc59e420a64f8615b819760e32449640eff2f357160b2b9797817d38b0e44c8d6bc04bc4f84a2bd20cfdb7fb5d12df7f2d
diff --git a/dev-libs/crypto++/crypto++-8.6.0.ebuild b/dev-libs/crypto++/crypto++-8.6.0.ebuild
index 23fa80f92eba..fe51dc2a3497 100644
--- a/dev-libs/crypto++/crypto++-8.6.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="Boost-1.0"
 # subslot is so version (was broken in 8.3.0, check on bumps!)
 # Seems to be broken in 8.6 again too
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 301ae0cb6553..2df5e92d6927 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -1,5 +1,7 @@
 DIST cudnn-linux-x86_64-8.3.1.22_cuda11.5-archive.tar.xz 856769204 BLAKE2B 375021592470b1f17d7a69701f1ac3289ceb8ddbbdacf577fa51abfdad263102d3c6cedb24ac829c49e033300532e77b6064835a8ae1e05377e375f4320c9a15 SHA512 815ef678b7510e014181f3bf782e627771e8d00d218b34f2af11436b8a49331400269f98448854353c12721468365b71a8483eb7631777f0d628982e81942a8b
 DIST cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive.tar.xz 857894928 BLAKE2B 7f0f4fe4d8ccd2e7385d5c4535f4543b3d8e80f65caa5a4d5fdaa1b386a76fe16d8d9e32745a098954eda8d0b803af6146c1ffc5b46c838ea0ccecd5923984cf SHA512 4f2159e48685613b436adb3995aa80cf6d5b395c146059ccc15ef2f5f7e47c94bfeebd14b09d8832f7df76d2379829aa32edb7b69852e17a8e7036084265ed39
+DIST cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz 850711772 BLAKE2B 47e03d7a25f92cb2e2793e7d13b6182da62329a7868a785ca2224bccfc97960721fba26e1e8a933e8d449085e895c129871bb2fd7c690265d01ad10564a1b939 SHA512 bf2069edf5c73db325d4ef27e3976169b9bd32afc49f012bd1e6f7d9bd374179dd9312538e7be7b0f8d5da0f2edd79b6788868e183f00f8b99fda185302d07c3
 EBUILD cudnn-8.3.1.22.ebuild 700 BLAKE2B 7c3095b585ad73f24ea12fcb5dc580a648c634c8662c5fb3558bfbf66e08b3c3e6cc75d4cda856b44d2f7187ecff078c1b1a2ebfe1b74c78038184f3cc94feef SHA512 95b4da813d90fd828afefac712d4da9c5eea12445ce2fec8c0c7bc05a5f493428360b34da558610878d4c83b4dc5d8bd5d79c6bc17a367d52a5ee20e67db4835
 EBUILD cudnn-8.3.2.44.ebuild 700 BLAKE2B 7c3095b585ad73f24ea12fcb5dc580a648c634c8662c5fb3558bfbf66e08b3c3e6cc75d4cda856b44d2f7187ecff078c1b1a2ebfe1b74c78038184f3cc94feef SHA512 95b4da813d90fd828afefac712d4da9c5eea12445ce2fec8c0c7bc05a5f493428360b34da558610878d4c83b4dc5d8bd5d79c6bc17a367d52a5ee20e67db4835
+EBUILD cudnn-8.4.1.50.ebuild 829 BLAKE2B 30b96d6d449ddef4f5bef9a475cb2405e33916e18639d4c77be9e4aa4df04bf050e3fa564e91a31c1f49df4b680a6f7d1665d222409133fdfd8a419dcd06ad4e SHA512 df1e69746adef932b4cad9fd07b8b949269fb5d5df10a5bea7ba7c46be401a71dfac8d6582304879c253f1acd588456ffdddddfc344b3b9554eddb9301bf392d
 MISC metadata.xml 320 BLAKE2B 81dc88c34d1976ea918fd6b4b96743d157fe540455b9a1873c8e4e156a3d72dcf44c03cc642bcd10a202ba66a747bcdd5c5b290e9b30cdfacfbd32a2f1d99549 SHA512 3b837ea9aa38041bdd68cc03ad699a140bdadd353e355977a0a1865c8ed46491fe1f3e2778c66432ea43275c5017e684db45947671acc0db7db0ae75afa808a6
diff --git a/dev-libs/cudnn/cudnn-8.4.1.50.ebuild b/dev-libs/cudnn/cudnn-8.4.1.50.ebuild
new file mode 100644
index 000000000000..1950bc260e46
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-8.4.1.50.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BASE_V="$(ver_cut 0-3)"
+# supports 11.x but URL has a specific version number
+CUDA_V="11.6"
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cudnn"
+SRC_URI="https://developer.download.nvidia.com/compute/redist/cudnn/v${BASE_V}/local_installers/${CUDA_V}/cudnn-linux-x86_64-${PV}_cuda${CUDA_V}-archive.tar.xz"
+S="${WORKDIR}/cudnn-linux-x86_64-${PV}_cuda${CUDA_V}-archive"
+
+LICENSE="NVIDIA-cuDNN"
+SLOT="0/8"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="=dev-util/nvidia-cuda-toolkit-11*"
+
+QA_PREBUILT="*"
+
+src_install() {
+	insinto /opt/cuda/targets/x86_64-linux
+	doins -r include
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r lib/.
+}
diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index 2c18e419812b..f23f64ddb664 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,5 +1,8 @@
+AUX cxxtools-3.0-gcc12-time.patch 244 BLAKE2B 2bd3c5713f68e261607d21273c8a98893ae4bf757ab6d97a019a4e0e02f965b6e1a45be2995562f0544554aa01c0ef86174b0208bec3626511ce35abff1df5d5 SHA512 3c5d7b391ee6184c3e57e99b27a0f2972a53a63a9adbe30133d804b7d0e1c9163b63f47ad1e6f05b04b0baac50de6670f1f2cd1c3726e3965d3eb6669ccc6f32
+AUX cxxtools-3.0-lld-linking-openssl.patch 323 BLAKE2B 32cd482d39132bb9793383e2afb1d7f2c10b1526fda67ae8f896c2081d61a07e9a2251e9339e166937dd2365fe5c9165a32413bb850eb0ef6d61079c1a29f43c SHA512 04c86dbb1aaac5549adaad0a8b8f0e09805924c69e3d759537e1a3b97690c9a7e7e9321df7671479780b2aa1d18951cba9d0f00fdabe5a7cdc9b15ff02e3da51
 AUX cxxtools-3.0_gcc11.patch 847 BLAKE2B ae4c4caf2d33351a33e7f54addeda32a922dabab867d1ca41684a3fa73b040a2b4df515a0af7fc33a1e3a8159c03d8189b4b97f2d36dab882c6d237e6d50faf8 SHA512 cb53d59849c8034fde4bb81e9db2f71ea34ccb809671e269dce47bd4d9847369213f43f1a32bb578547fd03f60df31f96d678249c34613ee4619fe1f32af8355
 DIST cxxtools-3.0.tar.gz 1079247 BLAKE2B 536680373e194dbdb6a79bdb09960830b6aad34c2657a0024b218321154de81653f1e47db13abfcf13f0179fa6f85e0a30a4b97f0e64ca0ac5f1cc7be003270d SHA512 839be18a8bf40c1cbaa016ac50ddacfd879d1f9bea6521209c65790d67d5ee81377519aac2fb373a5de154a293e33185401848e41a697aa57ad6aa42d4854250
 EBUILD cxxtools-3.0-r1.ebuild 716 BLAKE2B 73caa9b56a2796bda7b29abdc4f34ea84bdca1ad04dbf6f1a4b9192ae65e257500caf543a406a70818cc3cfe8329012161ce6e9e43132f89a1bb4e14519b3c65 SHA512 689b9531a324c04d7cd9f153d567eabe00866508c839804cd0d3eb5ed4539d41b2a07de976e1778e9a887d00aa96097dbd51fcdf80930bd50463b9323d7ebcc8
+EBUILD cxxtools-3.0-r2.ebuild 838 BLAKE2B 00068e6d77b56ca501c01eaa7582f927525b236ef2e1fa8f419254f1389dd25063fd28f377d6dd367f08adff007c3f72149228753086f3af1680b65738772fb6 SHA512 44fcbb208193759a127795353877881d6825d1b1a04c5b0f5b73e24edc67fccd7cc81c0ee6058daf1795eff5f517557974ac479920da6972493ba0a85b6caff9
 EBUILD cxxtools-3.0.ebuild 676 BLAKE2B f640431bf4c41b1f1d87d1ece7005638c8e6b4caf9c7e365a03550f1d4c0b540e57cc78114185e9ad60d21599eab699177f9cf3d4973004f11d8705b4d0225b9 SHA512 4d10b859219f52027fab420a5e215076513705481b84b59b06df59320ffb4f960cb35593a60b5d0fe0c901de4a3056d2ae12e22acd3381db1b2a4e0b9007842d
 MISC metadata.xml 244 BLAKE2B 7222dd1e8f714217b90fa86e81e31b345a4b2e861ca846f3cfcaab3f6820dea4b067d0d335336af53dfd7985287fc213d27ca777bd876cb2bb72fadba79cc1ec SHA512 d066cd23818ff8a6ace46dde4dd13e5da409672c7843057ff90819a7d691fd53c2e7de7b696a0a08945a4e770f63722f4923e78b22c40568db755ddca6a58f0e
diff --git a/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
new file mode 100644
index 000000000000..10143b5f51ad
--- /dev/null
+++ b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Collection of general purpose C++-classes"
+HOMEPAGE="http://www.tntnet.org/cxxtools.html"
+SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="virtual/libiconv"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}_gcc11.patch
+	"${FILESDIR}"/${PN}-3.0-gcc12-time.patch
+	"${FILESDIR}"/${PN}-3.0-lld-linking-openssl.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-demos \
+		--disable-unittest
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# remove static libs
+	rm -f "${ED}"/usr/$(get_libdir)/libcxxtools{,-bin,-http,-json,-unit,-xmlrpc}.la || die
+}
diff --git a/dev-libs/cxxtools/files/cxxtools-3.0-gcc12-time.patch b/dev-libs/cxxtools/files/cxxtools-3.0-gcc12-time.patch
new file mode 100644
index 000000000000..d80763dd4c1d
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-3.0-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851837
+--- a/src/timer.cpp
++++ b/src/timer.cpp
+@@ -27,6 +27,7 @@
+ #include "cxxtools/clock.h"
+ #include "cxxtools/selector.h"
+ #include "cxxtools/datetime.h"
++#include <ctime>
+ #include <stdexcept>
+ 
+ namespace cxxtools
diff --git a/dev-libs/cxxtools/files/cxxtools-3.0-lld-linking-openssl.patch b/dev-libs/cxxtools/files/cxxtools-3.0-lld-linking-openssl.patch
new file mode 100644
index 000000000000..e2696fd094b0
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-3.0-lld-linking-openssl.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -173,7 +173,7 @@ libcxxtools_la_LIBADD = $(LIBICONV)
+ libcxxtools_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
+ 
+ if MAKE_OPENSSL
+-libcxxtools_la_LDFLAGS += -lssl
++libcxxtools_la_LIBADD += -lssl -lcrypto
+ libcxxtools_la_SOURCES += \
+ 	sslcertificateimpl.cpp
+ endif
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index dbb371ee6d49..3e327e9b7f6c 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -7,6 +7,8 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27-r6-patches.tar.bz2 5169 BLAKE2B 43a2f0db4a8589ec1cde7807b31a93459eacb04d27ba36751a69dd5f4e669d1b28342194b0e1a5382e281a52a35e88168877b54065cfba01b9bd33e87fbd23f1 SHA512 41c4ca7c8f7b79e03faf5d826a6ff0ed398137239b93fb0046ccbf385f6ddeab2b9fb2f51d7a263dc74626e5fdbefb28615a1ee22aabe57ed57f10a52d382797
+DIST cyrus-sasl-2.1.28-r3-patches.tar.xz 4244 BLAKE2B 113da9bb58cce3643269fca88ea8d700aa20226d9536427c9068ef7b43499c2b78cbcb233d8db2418d84136c7edd629cc05f52b31cdfddfcb529f9a9fcb4effb SHA512 0cccbb27646dc118fbeea64b0cb688f312df97b31fced8c18d5230764cd5e2f0d48806bd2f5524aeddd02e8933cd835fb6f67dd3fbc1b0abfd1a3e1f0f53cf8a
 DIST cyrus-sasl-2.1.28.tar.gz 4034803 BLAKE2B 6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823 SHA512 db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78
 EBUILD cyrus-sasl-2.1.28-r2.ebuild 7161 BLAKE2B b28e1830da67a094aa6c8f2d2a4155da26bf02dc52f4881672aded788720c4641fc8337d2a98f8f38152460921ca295603e7e771f7cfbe1b7a11e67c97f0b0ba SHA512 7a6a1f59a4ba8ce4d8e19394668c9fa335668bc2776801a01295f374066df6722f428394e2447e7665d43090f3f8c467ef6528333bfa0f32be186a95ef2053a0
-MISC metadata.xml 721 BLAKE2B 23da714758f539942c45bd8f04fa0f435f0e1a4770c258ca4a1e73f89a627335d6804f636dc38d8b356968bb859ca7a65ca428e24e8eb0e64ed7f666d2c7f3b6 SHA512 388ec91796dfa0eed11200822ff521e5094a072c56469adf20f2a1a18c6e4501e73f8182a1372f7d301b28aecf755d81e330f7cfeb6b742c894c7b7750bbf7dd
+EBUILD cyrus-sasl-2.1.28-r3.ebuild 6917 BLAKE2B b2ddc60e461607adf8bfe138a36718f42795383aeb2e7c61c9c6874bdb6a5db0be6ed04639ee314e1be1762913a65ac490f7d02f9636c5872ccfea157ed60059 SHA512 dc139833fbfa50733ea0a3e685520b2e3d35d7fb1942a732d164b3c50d6ab06de022d3251ce2c3b5a41eac7cd8da9cdd0d3ba2af7d99cf36759136eee032c817
+MISC metadata.xml 720 BLAKE2B 2c8e6b0ca364214c9d09a26c561b2452f49fb7e2f348e299fbd08c698a814b9f5e75715ef58f600f3032044d298639bf8daf40fe4a1b5397e21fdf91b0811767 SHA512 4b9db09c9f9de1c0be4649ce421194dec5d805e858ec5c7a674351e17fff94074797288783be2813b8328868d641d475f5bc6cb63159e3ad1875af0e37196dc7
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild
new file mode 100644
index 000000000000..9bf5fc8ef2b0
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edos2unix flag-o-matic multilib multilib-minimal pam db-use systemd toolchain-funcs tmpfiles
+
+SASLAUTHD_CONF_VER="2.1.26"
+MY_PATCH_VER="${PN}-2.1.28-r3-patches"
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
+#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VER}.tar.xz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
+REQUIRED_USE="ldapdb? ( openldap )"
+
+DEPEND="net-mail/mailbase
+	virtual/libcrypt:=
+	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
+	mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
+	pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-sasl )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sasl/md5global.h
+)
+
+PATCHES=(
+	"${WORKDIR}"/${MY_PATCH_VER}/
+)
+
+src_prepare() {
+	default
+
+	# Use plugindir for sasldir
+	# https://github.com/cyrusimap/cyrus-sasl/issues/339 (I think)
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	# bug #486740 and bug #468556 (dropped AM_CONFIG_HEADER sed in 2.1.28)
+	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	append-flags -fno-strict-aliasing
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# getpassphrase is defined in /usr/include/stdlib.h
+		append-cppflags -DHAVE_GETPASSPHRASE
+	else
+		# this horrendously breaks things on Solaris
+		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+		# replaces BSD_SOURCE (bug #579218)
+		append-cppflags -D_DEFAULT_SOURCE
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-login
+		--enable-ntlm
+		--enable-auth-sasldb
+		--disable-cmulocal
+		--disable-krb4
+		--disable-macos-framework
+		--enable-otp
+		--without-sqlite
+		--with-saslauthd="${EPREFIX}"/run/saslauthd
+		--with-pwcheck="${EPREFIX}"/run/saslauthd
+		--with-configdir="${EPREFIX}"/etc/sasl2
+		--with-plugindir="${EPREFIX}/usr/$(get_libdir)/sasl2"
+		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
+		--with-sphinx-build=no
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with openldap ldap)
+		$(use_enable ldapdb)
+		$(multilib_native_use_enable sample)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
+		$(multilib_native_use_with postgres pgsql "${EPREFIX}/usr/$(get_libdir)/postgresql")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr/$(get_libdir)")
+		$(use_enable srp)
+		$(use_enable static-libs static)
+
+		# Add authdaemond support (bug #56523).
+		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
+
+		# Fix for bug #59634.
+		$(usex ssl '' --without-des)
+
+		# Use /dev/urandom instead of /dev/random (bug #46038).
+		$(usex urandom --with-devrandom=/dev/urandom '')
+	)
+
+	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+		myeconfargs+=( --enable-sql )
+	else
+		myeconfargs+=( --disable-sql )
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myeconfargs+=( --with-dblib=gdbm )
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myeconfargs+=(
+			--with-dblib=berkeley
+			--with-bdb-incdir="$(db_includedir)"
+		)
+	else
+		einfo "Building without SASLdb support"
+		myeconfargs+=( --with-dblib=none )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		if use sample ; then
+			docinto sample
+			dodoc "${S}"/sample/*.c
+			exeinto /usr/share/doc/${P}/sample
+			doexe sample/client sample/server
+		fi
+
+		dosbin saslauthd/testsaslauthd
+	fi
+}
+
+multilib_src_install_all() {
+	doman man/*
+
+	keepdir /etc/sasl2
+
+	# Reset docinto to default value (bug #674296)
+	docinto
+	dodoc AUTHORS ChangeLog doc/legacy/TODO
+	newdoc pwcheck/README README.pwcheck
+
+	newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
+	edos2unix "${ED}"/usr/share/doc/${PF}/release-notes
+
+	docinto html
+	dodoc doc/html/*.html
+
+	if use pam; then
+		newpamd "${FILESDIR}"/saslauthd.pam-include saslauthd
+	fi
+
+	newinitd "${FILESDIR}"/pwcheck.rc6 pwcheck
+	systemd_dounit "${FILESDIR}"/pwcheck.service
+
+	newinitd "${FILESDIR}"/saslauthd2.rc7 saslauthd
+	newconfd "${FILESDIR}"/saslauthd-${SASLAUTHD_CONF_VER}.conf saslauthd
+	systemd_dounit "${FILESDIR}"/saslauthd.service
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	# The get_modname bit is important: do not remove the .la files on
+	# platforms where the lib isn't called .so for cyrus searches the .la to
+	# figure out what the name is supposed to be instead
+	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	# Generate an empty sasldb2 with correct permissions.
+	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
+
+		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
+			|| die "Failed to generate sasldb2"
+
+		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
+			|| die "Failed to delete temp user"
+
+		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
+		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+
+	elog "pwcheck and saslauthd home directories have moved to:"
+	elog "  /run/saslauthd, using tmpfiles.d"
+}
diff --git a/dev-libs/cyrus-sasl/metadata.xml b/dev-libs/cyrus-sasl/metadata.xml
index c1d8ef119dd4..dbb996c4473f 100644
--- a/dev-libs/cyrus-sasl/metadata.xml
+++ b/dev-libs/cyrus-sasl/metadata.xml
@@ -14,6 +14,6 @@
 		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">cyrusimap/cyrus-imapd</remote-id>
+		<remote-id type="github">cyrusimap/cyrus-sasl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/darts/Manifest b/dev-libs/darts/Manifest
index 2e9382b79987..6bd025c2f896 100644
--- a/dev-libs/darts/Manifest
+++ b/dev-libs/darts/Manifest
@@ -1,6 +1,6 @@
 DIST darts-0.32.tar.gz 234001 BLAKE2B e40f16e6ead25809d981c98924867903e1d0f3734682b61ad1be40a10a4212795dfdef55a0eb6f9d0f60ef7676ed27929a6812bf8f57972dcf00875e99d9917b SHA512 b9af8ce60688f5858dac2cac35a8666848dba6729f9f4364786123a1c0484e56c8b981ec04e59653afbcf20cce3b326a49243095213efb525b5669472ac7358e
 DIST darts-0.32h_pre20181117064816.tar.gz 38856 BLAKE2B db4bf7ca88ceb81dcaee4494708d3f469dfc4f1ce53aa731f291d4b7d73f2c48a9e8d97caf32fd0bdd66aaba1c9e3e2e0289a5f2fdf7f5f1f2351c3808d6a98c SHA512 092cc833fff937365117f5b780f09a1ffdd25104ab57e36f7cba25a9a6bee289c105cae997a50b61b5b542c1c34d71bddf132d0ca14d563198b57caa9af2ac22
 EBUILD darts-0.32.ebuild 729 BLAKE2B 1dc4fef45e356b9a262761d3856ef7f738b410abf05ae38b3e9234d7add6628373742188d5de7e7d909e03da6ab80116f78758c18d82d90228dc0ea1c1ae6e4f SHA512 00b64494e1fe11c587c0a6112e6934574d081657a87f3ae0e9dce4fb5f769b946e52d58039f2d07b4d8ec57a048769fdd6e0830e73b5e1ca4ed11726dfbed954
-EBUILD darts-0.32h_pre20181117064816.ebuild 1363 BLAKE2B 102360f0fa77fbf713aa9efda46f6559c49f7310b7be1156d5d62eb769351b3978751545548f55f7763b064f95a7a030f81adf2e19dd41d8f63ba8f4bd9db6a6 SHA512 6d39b9f3a053123c6092dcfcbc585c78371e96681704340f7b4f8791913ddfa91b512dcc9f4cdb1d9d1831aa4b30f2a922c7bfc8a15f723ed17b5364c48c3758
+EBUILD darts-0.32h_pre20181117064816.ebuild 1369 BLAKE2B f7c2ba34ea48a433c0efc6557cf5e16db947cd1595c66c79ad84ad0e83088d88800977b38fd62cf7e8a6997687b29c1f27af2e0b3a420b0b723719dda0112263 SHA512 5804a1dc6aca3ecef6ce37b6bde5bca8b3b7f2472364d5a966e000c6ac5a4f3547ae05baa02ebf6af031659f1d4faf8a3c8d448f44c48e4b63ab1da929b92031
 EBUILD darts-9999.ebuild 1209 BLAKE2B fc98dc93002e7a6e7d4269cf2a13b8228056b29b72f8dee5519587bf8d4888678ee0748a86074d5e6b73d877a8d8fea7fa77eb31b998295cd99145b36496a0f2 SHA512 892651f7fdebb19693f99e03d1f3fda914aef6b91d56192692292252a1a3978bbf58e229bd0e9e051b3845ce7d5046d6aac05f86da850e252e3bf85913516592
 MISC metadata.xml 318 BLAKE2B 67d2ac0f28e51ff5c9b2d21a216a674285ada72e7c7de4d705cb9a767a086abf1779cf7f877c540c18d64d5a70de7df570af42b278f57d27d3ed24739e476856 SHA512 52935d348cee3b72a2f5da851b5600414da7f923fa8be357006f06392f7496f98d04bbc92a52696ac42c70b1315a53107d2378bc5e3a79b2cacd5623e8f0619e
diff --git a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
index acc0a8d07169..56c5a21c906f 100644
--- a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
+++ b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND=""
diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index af47e5cc0d83..e243ec94c156 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -1,5 +1,7 @@
 AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 BLAKE2B 2cc43e4d23c14646adfffae77bc1168b69d4e3e2049ae8d3b5283d41f8214fd6884500fc014b66dfbc86dc1928c7e5c33024833e4b2bb28ddad6d17e443db2d1 SHA512 3625f7473db8ee069009655f5c8b68bd7290d622be56ace8e1472bd93b0a946a000bf0d728839cd6309414cbcb925247bfee888bb58fda8316e906fe5a8e25b2
+AUX dbus-c++-0.9.0-gcc12.patch 2555 BLAKE2B 4c8d9740a200eb1a0060dd0c3684cf8fc24c61cb5db9bfefdf353f73b1e62b6e84df140e0b05091bd4a1f94786c3f3a980fb0369c5b2fe7acfdcd36e9fcccc50 SHA512 0e73e8295a8d88988fac65b43b44ffa380721881c5bc1af05267a12d856ad752f241ffab3e7de10c17d1dd0a71d006b7de5f327b10cf4150de2fb67633d236bc
 AUX dbus-c++-gcc7.patch 891 BLAKE2B e3f1c902b52cbec776849c86d2d4c7a13acbc907355c380cad7eabdfe670d9058a1ddd3687af9bcbbd4d815affea21728d8296f5a87122bc6b5fc99396ea0428 SHA512 b8c67af11620c2414d482cb3d77784f7c9831e64e0bc9cb9b946e13b0ad13135f06cfb894667fb9b184e6fc7e750df0769a2d4c09df4f430c2189c2c3804fbae
 DIST libdbus-c++-0.9.0.tar.gz 466362 BLAKE2B 401e266286fef383754c945f3adcf8e68a1169e55d33614f1e11227c324fe1219db7043674b5894d548f827d0b673ab4f012babbb4a395c212f6e17ef6d0e281 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
 EBUILD dbus-c++-0.9.0-r4.ebuild 1539 BLAKE2B aaa663650fd9946ae8c86017ad580aad58a0ff2b9d8ad96b02513afc55140a80c91443be935aed33556456b905e7bab67fa3683629d09ea9737c681c2efd1bd4 SHA512 7cc9abda1a97042fe011ae6dca6a002ca62726286d35ae0f929352d023caa3cd00b4fe6810e776482d2565538d92772417a8a29b3c27c0bc90579e8f1df2ee15
+EBUILD dbus-c++-0.9.0-r5.ebuild 1589 BLAKE2B 0191a6c6f22374da733d6073136772e8eafba172fba41107a670d866884a87d07a3b223c9c48e77a658817d662761ca175d7d6641b83ca5e83d5f69a90e8721e SHA512 d851f8efc3d00651dd87d78c987f3982179649e8e223246671f6c0e2b0442af54b3b10fc0fd23ae121ccda7dac37ca37f90466f5683433710b8374c6117f9fa0
 MISC metadata.xml 365 BLAKE2B 0522c37f8ab0c117b0d65e7c5e198a05644bc2332b837569a1665f60147453937bc6f9db546f341f2d9f48b61078e41dd35e0b71539cb29808365091b3a4c758 SHA512 446fe1ccce403eeb4f46c114fdb3f7d9bfaf845849873f2c9807781980c20b226160bfc8d3b039629ad4649119c7d22032bf095cdfd5636db5460fc8a541ca23
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild
new file mode 100644
index 000000000000..bd749ca5481f
--- /dev/null
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Provides a C++ API for D-BUS"
+HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/"
+SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc ecore glib test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/expat
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	ecore? ( dev-libs/efl )
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-util/cppunit[${MULTILIB_USEDEP}]"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/lib${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-4.7.patch #424707
+	"${FILESDIR}"/${PN}-gcc7.patch #622790
+	"${FILESDIR}"/${P}-gcc12.patch
+)
+
+multilib_src_configure() {
+	# TODO : add ecore multilib support if/when it is multilibified
+	ECONF_SOURCE="${S}" econf \
+		--disable-examples \
+		--disable-static \
+		$(multilib_native_use_enable doc doxygen-docs) \
+		$(multilib_native_use_enable ecore) \
+		$(use_enable glib) \
+		$(use_enable test tests) \
+		PTHREAD_LIBS=-lpthread
+	# ACX_PTHREAD sets PTHREAD_CFLAGS but not PTHREAD_LIBS for some reason...
+
+	if multilib_is_native_abi; then
+		# docs don't like out-of-source builds
+		local d
+		for d in img html; do
+			ln -s "${S}"/doc/${d} "${BUILD_DIR}"/doc/${d} || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( doc/html/. )
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc12.patch b/dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc12.patch
new file mode 100644
index 000000000000..9c2b52453df9
--- /dev/null
+++ b/dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc12.patch
@@ -0,0 +1,89 @@
+https://src.fedoraproject.org/rpms/dbus-c++/blob/rawhide/f/dbus-c++-template-operators.patch
+https://bugs.gentoo.org/737120
+https://bugs.gentoo.org/740068
+
+commit a0b9ef3b469ca23c6a3229d8abb967cbbddcee38
+Author: Peter Williams <peter@newton.cx>
+Date:   Sat Dec 19 21:12:46 2015 -0500
+
+    Fix some weird template/operator issues on OS X.
+    
+    I frankly don't understand at all what's going on here. These fixes
+    derive from:
+    
+    https://chromium.googlesource.com/chromiumos/third_party/dbus-cplusplus/+/c3f69f6be02e31521474dce7eadf6ba4f4a7ce94
+    https://chromium.googlesource.com/chromiumos/third_party/dbus-cplusplus/+/7104857773f790a549d399715482fa23d9b736cd
+    
+    Except I've dropped some changes that break the OS X build for me. Frankly, if
+    it compiles, that's good enough for me.
+
+--- a/include/dbus-c++/types.h
++++ b/include/dbus-c++/types.h
+@@ -89,13 +89,7 @@ public:
+   }
+ 
+   template <typename T>
+-  operator T() const
+-  {
+-    T cast;
+-    MessageIter ri = _msg.reader();
+-    ri >> cast;
+-    return cast;
+-  }
++  operator T() const;
+ 
+ private:
+ 
+@@ -316,7 +310,7 @@ struct type< Struct<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+   }
+ };
+ 
+-} /* namespace DBus */
++extern DXXAPI DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Variant &val);
+ 
+ inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Invalid &)
+ {
+@@ -551,6 +545,8 @@ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Signature
+   return ++iter;
+ }
+ 
++extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Variant &val);
++
+ template<typename E>
+ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, std::vector<E>& val)
+ {
+@@ -644,7 +640,16 @@ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Struct<T1,
+   return ++iter;
+ }
+ 
+-extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Variant &val);
++template <typename T>
++inline DBus::Variant::operator T() const
++{
++  T cast;
++  DBus::MessageIter ri = _msg.reader();
++  ri >> cast;
++  return cast;
++}
++
++} /* namespace DBus */
+ 
+ #endif//__DBUSXX_TYPES_H
+ 
+--- a/src/types.cpp
++++ b/src/types.cpp
+@@ -34,7 +34,7 @@
+ #include "message_p.h"
+ #include "internalerror.h"
+ 
+-using namespace DBus;
++namespace DBus {
+ 
+ Variant::Variant()
+   : _msg(CallMessage()) // dummy message used as temporary storage for variant data
+@@ -104,3 +104,4 @@ MessageIter &operator >> (MessageIter &iter, Variant &val)
+   return ++iter;
+ }
+ 
++} /* namespace DBus */
+
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index bd0d67278dbf..c1821cc87cc0 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,6 +1,6 @@
 AUX dietlibc-0.34_pre20140729-dyn-lib.patch 580 BLAKE2B 0f4364bbeae48a42c77314975ba202bcd79f88fa02ee820be4b94896c2217f7eee22b36d6a196b63183d2ad80994c9f3095da9fdc917f2dece2ca9a7e2430cba SHA512 7dfcad992f97c3923402dde1c55c8249c5fd4c88b3291fff15d41010036eec83656b009968f0af67daa94de43d4ef4f0f476ba42dd41a17217edd5f9f4f576cc
 DIST dietlibc-0.34.tar.xz 662732 BLAKE2B ac709f19f98c298ee424f8320cbc7bca997156323e64d3a219251146b4257185f27519262914d3df044638ecfcf06e1e3680d8af226704dca65d6e4be20b3dc4 SHA512 2b38528c0ccf50e426f587b6448fed997fab1147eecc9e1af2f3fb3efe3d8f3997656d8e66e7cf1045ceb1f602cef43456c62ba83ff494f9c9816721bdb4d6c6
 DIST dietlibc-0.34_pre20140729.tar.bz2 670195 BLAKE2B 9479c97c09b0c8c7e5d85536afd962613e9f5fbcb1aff3ef9b2aace19d246b2d0b637f00c3abee0a2c06f170263e85ffba94247171afc47e40c8ab0e95fe5191 SHA512 a0bb5465f7fc985fd074dfcc4039003ec26b6b5fde5f2ccc53322067bd1a6459e742c9debeffda0b5146e287baa8e49f74f4a8ffafdf1daacacec4768d13db36
-EBUILD dietlibc-0.34.ebuild 1568 BLAKE2B c85a4f1aad13730921275d95c4ea028a43952be3d41df5e66cd6f13b4edfcef220bfa6744b66e3429a3b1e4043a93335ad7cbd3ad7c1a40ed1f9093e9f9d8577 SHA512 7aa0b9f58a6ea45c213fe1cca09830325cc2ff66d467bddcf1e11787a85e0ffac2253705cb5381e79926e0290552ac65eedc886d14aea2f02442db9b585d2481
+EBUILD dietlibc-0.34.ebuild 1634 BLAKE2B 2d9fffcf677d489c3d59e0391645ebb02b26e7f77cfdc7385c6cbbdbd615ef584789bd7148b9c754cc1fc9b096d6f362ebf77861cd0447d84be70a7d1a729546 SHA512 37b52a403566a761e7a5571b95f4e562edca261e5c95153f6aec95334bd04b36a5cd66cb62f9d617e89ac1ccdfb5769578056f869e1da09b6098428cc786b2e4
 EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1694 BLAKE2B 1543ffed8cd8d2bf5e9c4a504684d1155afab269c5cab54ce0ea1485075ba09d4c0ed4c63aaf7bc1cf476697ec4cb2ba99a3819c1f4671abfafe2f42c28292e6 SHA512 bcc055da6350f48999484fdf28cb44a8a5ae7c54d2520f8c2a9f203d7f963fe377e8b9e7c2d7fe67e5213eae39e69800119f30e7d0e413f1f285bcc1f3c1bcea
 MISC metadata.xml 417 BLAKE2B 317618b21a2569a8ff55f7457668d8185894377216aca3d317438503d311b53b5f9d0bd999105a7d9a5966621fccd01fd26900ed00af1929e51b717e468f0a46 SHA512 5b5dc39a432a04ad909887a3d397366d2cdb12648a9346afb66b37b6ca0e7002a42c0f047a515002cc78523a8382c745b25c88d1af29606b53894b25daa7b66c
diff --git a/dev-libs/dietlibc/dietlibc-0.34.ebuild b/dev-libs/dietlibc/dietlibc-0.34.ebuild
index 856d3468195f..2c5c03042636 100644
--- a/dev-libs/dietlibc/dietlibc-0.34.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ SRC_URI="https://www.fefe.de/dietlibc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=sys-devel/binutils-2.31.1-r4"
@@ -24,6 +24,9 @@ src_prepare() {
 	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
 	use sparc && replace-sparc64-flags
 
+	# bug 676704
+	use sparc && tc-is-gcc && append-flags -fno-tree-pre
+
 	# gcc-hppa suffers support for SSP, compilation will fail
 	use hppa && strip-unsupported-flags
 
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 06543cf05dee..bf1545f97a8d 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -2,5 +2,7 @@ AUX 0000-INI-Fix-detection-of-error-messages.patch 1761 BLAKE2B bc1002e9ff7963af
 AUX 0001-path_utils_ut-allow-single-as-well.patch 1247 BLAKE2B fb3be441ff1066010043a473c184bc0a4e3a85ead8eb89d38d9731c40f33045a47ac59a6b281223f69f4e173baa9193edd65db7980db9ea031db87ced6a191cf SHA512 1d8e5cd540cbb9be1422274ef9318edc256be3c439b5a320f53913b2322319f67acf58a3e2d308dea12b925ea4a3956d8454a0ec7680412dc68e2aea77b0f65b
 AUX 0002-validators_ut_check-Fix-fail-with-new-glibc.patch 1944 BLAKE2B cf1971b715eb37bdb7b5ff3fdc54b1df4d1c9afc5994f6c48b48955cb534573f38444af81971334c1d39883d2a44d635e014e8a5fe1e54f6a03d2e0d597362f8 SHA512 4bdd24c21d99497cdc751a2002bd6ff29d20d3e51b877d0519a7d3134a2cb4edd81fc33ca577d06b52039c87d520e3f81a56303e6a0cad214915503270599593
 DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628
+DIST ding-libs-0.6.2.tar.gz 957577 BLAKE2B 7236706b0892e5b56506e89f67305cac54da648b2bd6f21dcf3c330d848e1bc556134c8e7d2efd0a9c8234ea41212d6bd2250ff7feaf84df12ff8ee6b56e0602 SHA512 566172e0addb0ee6e0ebd12874d3b72f2fa6bcb1ecc628c0c529984193290fae554efc40f52d2cec675bffab32a36183e47ec629db25e83ed2995f1049c64703
 EBUILD ding-libs-0.6.1-r1.ebuild 932 BLAKE2B bebbf6d14a083ce22b3121f796353427889dd2149b3760487467316171b73eb37964d9f9fe5605d801d660f4ff5ff0f58167d59826b6eb76e46ba90c8766bb9d SHA512 decbaef04bd6023a0f5a2aed6f811781b1db6e8d455ae9db21b65b07c4c4587a788c36af2f20770b352608d11cbd10603b07e71ea7270aef7d188a30f0c74733
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD ding-libs-0.6.2.ebuild 733 BLAKE2B d4707dbe0e7d74588e585e59afe80c4f786aae4e5a1ed61731065460e2c6dea276dc2cc60076df31262a2088bf3e0f1e170daa020d9d49f6bd3b2ae0bd965908 SHA512 8e0b6780e4cc66163c91943682dc13b0dd4ce8910fe9690f81f1cca45a05770418b138dcae2baa451556cab4a58e9298f2b3da6eb788358766ebfd728cf95961
+MISC metadata.xml 247 BLAKE2B cb144c57b3bcd3ce9042d41d2c5fe955abd61d93f348e9bc249d6f8a41172bbdf4b28e83682b8817f202886e6daf757fa0bb825b39eb6409633a323a162ee9f0 SHA512 cb8ffcc6e9e67e555d82ca99bccc6479b0db6e211127a53452d07dc4b106e7e0633ff9c8e0af1b1eccd7b6154ae3d7f61a50e8dbec835fcdca7c070e8cde2f1d
diff --git a/dev-libs/ding-libs/ding-libs-0.6.2.ebuild b/dev-libs/ding-libs/ding-libs-0.6.2.ebuild
new file mode 100644
index 000000000000..27ceab092825
--- /dev/null
+++ b/dev-libs/ding-libs/ding-libs-0.6.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Set of utility libraries (mostly used by sssd)"
+HOMEPAGE="https://github.com/SSSD/ding-libs"
+SRC_URI="https://github.com/SSSD/ding-libs/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/ding-libs/metadata.xml b/dev-libs/ding-libs/metadata.xml
index 85e4ed814fa2..a5ebe852b975 100644
--- a/dev-libs/ding-libs/metadata.xml
+++ b/dev-libs/ding-libs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">SSSD/ding-libs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index 60fb5829c9c6..d9d907d0f599 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,3 +1,4 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
 EBUILD dotconf-1.3-r1.ebuild 648 BLAKE2B ba6a92aa94c89a3ed304aed18475d9d417bb680b658e9a67c7de6b005fa35438c1fa83990a0b3031a3f9b72f43254607649b7ac581180123b5666f85246678ec SHA512 b138e5343c0a2046c2551f9c9f71b13eb691dbfa1f040e637e446ee74f54786e55da03710cb4390b726edbf8fc19f8d7f0fb8c0014e221d05498c3f070b1a980
+EBUILD dotconf-1.3-r2.ebuild 633 BLAKE2B adb79741bfce47943bde4d32965ec4e99b1287d5adb49380bed9d8b4405c19cdd95731311300e4f8e05c7012adba582133ee7fc24992b0ebb5f2e008474b1eff SHA512 ee6c92e6b65c370844d1e3f9ddf35b84455692515cef199a3ada32253f299bac6daef18c6826e0ad27bd3a06af986f9d746538df0fc369c49e86ae062a455595
 MISC metadata.xml 445 BLAKE2B 2c3daf69f3893a6cef9c473c24b8a998fc566c1e0fff66ce5e9d780859bd1cdae789616b443f007903e6dd1372fd8494307680fbcf775863adcab5437b933b0f SHA512 46c77d13292b855f78b096d42406733af924d90ed8687ea4fa541902084367d1c830ee4500f03bc1662c545922c32ac136d4f08ec06d51da05dc88ef7689459d
diff --git a/dev-libs/dotconf/dotconf-1.3-r2.ebuild b/dev-libs/dotconf/dotconf-1.3-r2.ebuild
new file mode 100644
index 000000000000..b4d2e2d1857e
--- /dev/null
+++ b/dev-libs/dotconf/dotconf-1.3-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="dot.conf configuration file parser"
+HOMEPAGE="https://github.com/williamh/dotconf"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=sys-devel/autoconf-2.58"
+RDEPEND=""
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 7fd8cf9540d8..83f3985fbc11 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,3 +1,3 @@
 DIST double-conversion-3.2.0.tar.gz 7031760 BLAKE2B 971c06121e64c4d78a1f9bce9b206a079ea72fb82072f5db10f9b50516ecc178ade9d5ae2d6d024fdb78607d8a1c0d9d48380acabc529eb498e37ff38297aa00 SHA512 0670ee70ed2662c6795ec6cf144e0915d805940ea0f49633d17500c496fb241788a0de6f0a9f8eaed5cb74a376f64fe590fa0d883d0676dc2bd2dab288b85e00
-EBUILD double-conversion-3.2.0.ebuild 482 BLAKE2B 094a622ad2ea3f64b777e5500299491e9b14803112f2caa2c6bdae114bd3af186c4edcaefc3ef71e8d7e1be01c1c72d8792244314f2c051de06216502db86a92 SHA512 b46e06b37832b11b5545dbce92c44224f51de2aa73bf992051294512a0954f444d32144f61d57f9c54c503cb8fa6cb2a70a3fc5da38211902040cb049d51b6fc
+EBUILD double-conversion-3.2.0.ebuild 626 BLAKE2B b7b682e635a574ec80aa781c7c99b05608cc2f39e0558107c99340b1c1b1317d48fab19b5cb906b552d2d69bab78ebcbdcd9136e1fdb090c8d138619df7f17f1 SHA512 978463432c90bf1df3507abecca9aeeb715240e17068788e30f5e796e616a7a15f6521a1c3854c7691b8f6952271077ec7a39a8c136375da70891c5282ac56c7
 MISC metadata.xml 682 BLAKE2B d16297d56e3609d9c14023e754fbdfd4a41d1ac91eb9e66e9b5122bfe7758d59d1b1ce92845d866e989baf8716bc425a6229098868ecdd2d8ce10c0af7808860 SHA512 f2c25b81770d33fe86231cb4c80cbfd5495d9ef493f6710c96732c4ad72523b362bd1c22316e326c500afc0f5c4ca22e77f07601a552b52ab71f24ceb4ca7e71
diff --git a/dev-libs/double-conversion/double-conversion-3.2.0.ebuild b/dev-libs/double-conversion/double-conversion-3.2.0.ebuild
index d1f0723de50e..261a9d8b1800 100644
--- a/dev-libs/double-conversion/double-conversion-3.2.0.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.2.0.ebuild
@@ -11,4 +11,14 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 23ee51b5b144..8e962f0a12c1 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,5 +1,3 @@
 DIST dqlite-1.10.0.tar.gz 170908 BLAKE2B b65cd39a4eb175a016934a174f27043ff1e9fc5404f5324030ddadf15567390edb6388e42b83ab76a0d1d3262343f8a4407d7756b85af30cf281a4b5076f87cd SHA512 f7364d968d0d2aef0bbd59f55bb7f775b41d509b0d1af106357bdb470703e143081649742870491e5c75760d3f6159568395b4a671c446a26df744fd4f631d33
-DIST dqlite-1.9.1.tar.gz 165507 BLAKE2B 275ad91e99335c311c55a51a2228d5674fe79ba2e0b4d1fbb00b62134cd2130c1131fefcde71985cb2a4c90b706ba7f9048818f0711e762f1437f0c263ed1927 SHA512 996767bfdcc4dd5f360b71b16c99b16c6dd3c630cc87746de2df6fc6e74dcdd4ecb8223097f5d85b9c78a4856440c83d3b067f6681f26487a88bb4f511cfe41c
-EBUILD dqlite-1.10.0.ebuild 842 BLAKE2B 73c455d17c797a5689fdf4313a7f03ead033bea538ff86b1be44466e0c016de169544a3575f3fe9ebe47d843293637facda6b1f0bd520808f2b5cf34ebbac524 SHA512 e0e6a7230d3a25d563e170ef43e12975ab9a23213f310aedf60e67d3d84d97d0d4b512fcf7d136ec5faf294449e6d0a8869eb1d2ade392bba70224664c54d5fe
-EBUILD dqlite-1.9.1.ebuild 832 BLAKE2B 81a66a66456fe95fddfc5902d2dbe2e49f88780d00793b8de55cf1c36ae03a4d2d54d85e716445a58961bd26c4f6968c9e42610a5b4ef2b0ea28f7c1a7f9e234 SHA512 11686a22ca5f38b772915c623d5c962fca66a39daf4012f13e5dab7574830895993de13e2c957f1f7c4dedcc42f658d67d6574637224203fd751f229e476d00e
+EBUILD dqlite-1.10.0.ebuild 841 BLAKE2B 993356a01761bdba2a9b2fd2a66d597c91119151970ac540a0496105d7b456ed956097500b977320c39d06771934e798e1d462eccfbe92a462ab9cba36c451e9 SHA512 39a239c8f6de027cfc933f0f3be9db9c15780333aa30f2201f9b647128b41630848c36191975471e6d04d13900aac7717ef2f1bfd410e4601c7dccbf9796dcd2
 MISC metadata.xml 865 BLAKE2B 3489de10f0de21d57146940eed0f4b69e637b0226b4be0127f33232dc6d8648ca4c169451948c31296ac5c41d163c8e65e983992f5baeb24db7d1b5dedfa4d22 SHA512 fc5c1fec36820bb855569c5e8bf7bfc3b522f00892489b20062e95121e6bd4e45f6b87a2d7c6d7a2e6b6c92e3dfd39b66705c58920207cf601e029d330b580ce
diff --git a/dev-libs/dqlite/dqlite-1.10.0.ebuild b/dev-libs/dqlite/dqlite-1.10.0.ebuild
index a3fe7ae6c8ba..44327746b8db 100644
--- a/dev-libs/dqlite/dqlite-1.10.0.ebuild
+++ b/dev-libs/dqlite/dqlite-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/dqlite/dqlite-1.9.1.ebuild b/dev-libs/dqlite/dqlite-1.9.1.ebuild
deleted file mode 100644
index 395d8b3d6964..000000000000
--- a/dev-libs/dqlite/dqlite-1.9.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
-HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
-SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libuv:=
-	dev-libs/raft"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/raft-0.11.1[lz4,test] )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-debug
-		--disable-sanitize
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 6a5cf2940651..eda71a6d1a37 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -2,5 +2,5 @@ AUX efl-1.25.1-libavif-fix.patch 2477 BLAKE2B 36ad24c7ba88a34e4da0d69cfda74b3a7a
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
 DIST efl-1.26.2.tar.xz 168537016 BLAKE2B b7ca59dbcd483edf31e68aae4df512a195a8239935febf8497ce039eb18696ca84e4f6d0206818c84f6e1f625abf3e730fc812304459e5615feca2c3fa07092c SHA512 d8478b6f197600c5abb7e2fcc030f8938e6726dde5e1947df4b042e6e9c77b0f31770b6b86a76ee2be52bf5354e02716bd7e5daf0771d149004d9447e432dc32
 EBUILD efl-1.25.1-r13.ebuild 8244 BLAKE2B 33ed2bf2ffc2954ff3d485c0da4580b41c8df9847b4dd95ec886f491324239de06f97b6d123b2c38d33be28031d073721b90667be88ce3bc8de8ac32b2790867 SHA512 de0a9aea7d4e66c4b4fc11f2b0951b2f3296e9b84cb4bf0df5d6c5a723b21e325b8fc5d6258b76e4504b7759208bf8e52907b51113d86b3304f8d0938a90edaf
-EBUILD efl-1.26.2.ebuild 8227 BLAKE2B 5aa82c221486d054cb831e2f9b4fae5a5b27906612d63d9ddbd7f05976cf6e1a91698999756d5ea46566b0f0c571f3d3d9c6be8ebab97c27bf659fea5e977518 SHA512 a70429f35861d4f7fcc3cd384a270c0572c95273e86d2a160c9873cccf02181b0d6c00c246b29d55f15f09540dea20fdd51297d60d1e06354dc89128aefdf4c6
+EBUILD efl-1.26.2.ebuild 8268 BLAKE2B bc4ca4bbaaebd842c9b71a027755a0764a9ecec34cd1d7c1d4f19896b94f4cf2f62ca44c0bf5c6509b0995f12c6c01d7114ce6f7f895b8e65b40fbadb3a8dbde SHA512 d58e4e2f991769ec70ba4c9ca733b5de762071f2d0f2c2dadd2e956b9fc17bca5d84a9283d44c372b7068cb9a94662858900c99666b6c852de253bbb25239f17
 MISC metadata.xml 1943 BLAKE2B 192127f421b9e9216ac8b9b2b161dd99bff9ae0286e1051bd541e4102046ebd23d835d2a0745d5ec82e9ce2b56e37569b2b3e0532f7d2daa485c17eda17bebd8 SHA512 c7a8d0dcfddfa4e1b2f0fce817e9daf3f07c014eeeeb3a7cf4d43df89b35aab24872e5fad1dcf3bf00213dbbb309436a49e005d8ce94095b1810067e5b68b250
diff --git a/dev-libs/efl/efl-1.26.2.ebuild b/dev-libs/efl/efl-1.26.2.ebuild
index 76cabd758589..cb05c5d6fc85 100644
--- a/dev-libs/efl/efl-1.26.2.ebuild
+++ b/dev-libs/efl/efl-1.26.2.ebuild
@@ -10,7 +10,7 @@ DOCS_DIR="${S}/doc"
 LUA_REQ_USE="deprecated(+)"
 LUA_COMPAT=( lua5-{1,2} luajit )
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit docs lua-single meson python-any-r1 xdg
 
@@ -123,7 +123,8 @@ RDEPEND="${LUA_DEPS}
 	xpm? ( x11-libs/libXpm )
 	xpresent? ( x11-libs/libXpresent )
 	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	wayland? ( dev-libs/wayland-protocols )"
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 9468fb714cac..fa6527b1d5cc 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -7,5 +7,5 @@ DIST elfutils-0.187.tar.bz2 9240221 BLAKE2B 00ba3efa689d137808f5f53ecda93fd006be
 DIST elfutils-0.187.tar.bz2.sig 310 BLAKE2B b23f656de269030cc3dd518a008e22e22726138a3bd619ad269166d3b9fac4b1064d98c81a02fcc6250ca1a996cc3e81322b50e7692fe23cbee92e2908f0300d SHA512 2619d8d537364386491d5e54f2add7ffa5bab21cd19c94a29249f2d9c5cc5dac53e2031a5515268ddeee4799b71115a5d98bdbcafd361aa75bcc13a1d9b70b14
 EBUILD elfutils-0.185.ebuild 2553 BLAKE2B 814831c9a53e59cf1029350ce9da041a8bc6d7890af8b24dd3f7c0b9257c9906edc90ed394bd88733504f1f7b8849d9962098017979929ae8f99bddec709fb37 SHA512 9fd9f9fef8b6d73c83bac2bec4b8b69d9cf9bcfd029b21ef409a1f4974656004dd1dd059514b250b13b8806d7038fde18961a41e28bcae3a841e995104d47c2a
 EBUILD elfutils-0.186.ebuild 2554 BLAKE2B bd9055bcc73d88d089ab7c002f421c8721b7c2af222d9f4dba8691d73221319f77250ff967e4d231ca5be99e48773142156cd3c34072258afab2f2f043141d3a SHA512 2c88af4389bc319f8de9430f71a1be4f426be0db2a1b66651579c55a6ec1bfd1701b522930360c3c4c29356e139a03dff59d659d4ffa06b4766b93b45b04da3b
-EBUILD elfutils-0.187.ebuild 3105 BLAKE2B f1934cc2173f7a3680215fb8e438df5c8da26e6780c43e99141c85668d01cd30821eba6d9f9524e24a918f08093e5f018a2d850bf92672594461b0db5fc6c55b SHA512 8fa8bb447e918f6a1fd0fcc9fcc7de62e8a3a61768ef614b79ba967aa02101f29695efbf6f652aa809f0f7bdd0fac9c1c5772f6bcd3a5ebf617f9cb8640242ba
+EBUILD elfutils-0.187.ebuild 3098 BLAKE2B 8a848936db7d036bbf1ddb34577f77dc3315cfdfa209f7413c037c20a1af81606d55eeff6a6ba3a78819ad530e0f5752d0c29a581c74262a3170b9b9a6236f79 SHA512 070a38667f8c29de404f325ee711bdb57696fc62a28a1c239355743e2aa8e3eb418400cfe438bb1e6025eba8fc2408a370db6812c1bcccb94bd4c07ebbee90e9
 MISC metadata.xml 730 BLAKE2B 94e9585a2d765ee2a7c85a823c389453bcdbc29b90a5542333eef1253d4ebafb7c26e383dfe5c5e0fcccf61f60321e7a46b0ae8c5edf467937485d6c9867712a SHA512 663cb6d587113d21fc0d3c703731f4dcaed55fc1bc7e75e1ac465e21b161ba5c4b4cefe0fd838d28b1f890cc33008878996e1d117fcab6435f8ed49f7eb0bc73
diff --git a/dev-libs/elfutils/elfutils-0.187.ebuild b/dev-libs/elfutils/elfutils-0.187.ebuild
index 8a7b8581db92..1db301f35330 100644
--- a/dev-libs/elfutils/elfutils-0.187.ebuild
+++ b/dev-libs/elfutils/elfutils-0.187.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 57901ae45af7..f81ea3d7699d 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,9 @@
+AUX ell-0.51-musl-build-time.patch 1449 BLAKE2B 7012ac17e87b9e2cb1a4a16b723bc7b77022921ac1b2a6610ad68380ba73bc07bfbd4508ad18e53d70a4247a6720e6e8ab4082209c7046a00257715731ec0ba9 SHA512 cbeda9501f8ce2ceed0043416dc06e705aa8e07e0897ee866b8892290ba255ffb1dcba3e4e09a22c9e98386214f83bc33df770bfc502286f828e19a0da6c7d40
 DIST ell-0.49.tar.xz 530072 BLAKE2B 76823742261b319a60fa34a086e4f328459c12fa2e53c2fc0397968a7c5914eac019598f927853697c3aa3c8afc389758bf4ca31f3b6315b09d6bdccf0244a88 SHA512 9bac4312ebe85bd6903bd9665551e9f1de4cfc6914659cea28355363502f8968ac842b3579ac8efcb0721cb5a1f3f16dca80f02235f3675a24f13eb250ed3aea
 DIST ell-0.50.tar.xz 534092 BLAKE2B 0f217f2f8a438f9d7e7862b5b2c45fecab3468bad3dc5912a87473f3237bdc3c541cec518bcea9ea5f45e6584793984ae822e6650676f2d22e10d84b7c30a08b SHA512 95dcfb34ece3bb7d6dc6f808c3df785cbb6966e7ac5533b9fd939a64288e6a584542cd69a6484da0f6ef752a62a87c143892d8f461d8389e4a12a1167bfa0590
+DIST ell-0.51.tar.xz 544744 BLAKE2B ae9cd3bc2d892109f5ae1a602f0f711b350ceb10ce2a7fcced5ce4bca63986a69c350013fc08eed29c9c626cc892b70ba997dda321d7c6c089d465850fabd5e1 SHA512 c2fd2ea9858542e23d46eba96045e1c924531b6a436401e86d838ffee39d0062923861c2898dae76ec9bfb325327c97b13799d81a2324982928b07b1fb898595
 EBUILD ell-0.49.ebuild 1169 BLAKE2B d44f4abaf7a26e2433528ad3d118791af1de8416332e29e882151c093c01df4e8702cb38ffa3fd89009e0592bf2d741fd1aed584215e6df42c6f5046d66b5aa2 SHA512 51423dd686bc1d06ad15ca1cf179b6aa1e5adf70fb843acd1a96586b9ae92bed64ca23032f6100e9d0e5a130bc11083c69aff24f5af6d5a64b720f8b644aaac0
-EBUILD ell-0.50.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
+EBUILD ell-0.50.ebuild 1170 BLAKE2B 1bcd395848f82b6758f1856148f825b76d8c130adaccd2f8b523be59f661a5180845a45215070a5c89f495e8805c68ae811ccf9d524d804794cf9698d15527a9 SHA512 bf883196acc3f95895ebdef568c08f2d7add05f9f8c972b5c7a25fd0da45187f6d4ee39a283404e354baa80692744a775ee8f28694804508bb1fa116ef08ea94
+EBUILD ell-0.51.ebuild 1230 BLAKE2B 908116b6a59c25d2ef026372ff4cc3f35cae8bdf425c6778f1727ccd5d25d4cc529bd68313d986f49b1f4a181c5a9dcdca4888caa5a483db82597eb1934a8507 SHA512 47ed02d4500bd0818ce2665745851821ee4eef84bee81c11e284a75af9c3a15a97defdce77e3b3ea94db2f7969f2f9062c055f386c9326bf6b52028154fd13fb
 EBUILD ell-9999.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.50.ebuild b/dev-libs/ell/ell-0.50.ebuild
index 56c48e4f83d1..f1cfddb3a006 100644
--- a/dev-libs/ell/ell-0.50.ebuild
+++ b/dev-libs/ell/ell-0.50.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.51.ebuild b/dev-libs/ell/ell-0.51.ebuild
new file mode 100644
index 000000000000..f7963d87ac96
--- /dev/null
+++ b/dev-libs/ell/ell-0.51.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="pie test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? ( sys-apps/dbus )"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-build-time.patch
+)
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/ell/files/ell-0.51-musl-build-time.patch b/dev-libs/ell/files/ell-0.51-musl-build-time.patch
new file mode 100644
index 000000000000..201bc7994406
--- /dev/null
+++ b/dev-libs/ell/files/ell-0.51-musl-build-time.patch
@@ -0,0 +1,60 @@
+https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=ce7fcfe194f0abcb8f419f83276b16a4ab274032
+
+From: "Milan P. Stanić" <mps@arvanta.net>
+Date: Mon, 6 Jun 2022 22:05:39 +0200
+Subject: build: fix time.h related breakage on musl
+
+missing time.h for struct timeval usage
+forward declaration of struct timeval in time-private.h
+--- a/ell/dhcp-transport.c
++++ b/ell/dhcp-transport.c
+@@ -40,6 +40,7 @@
+ #include <linux/filter.h>
+ #include <net/if_arp.h>
+ #include <errno.h>
++#include <sys/time.h>
+ 
+ #include "io.h"
+ #include "util.h"
+--- a/ell/dhcp6-transport.c
++++ b/ell/dhcp6-transport.c
+@@ -35,6 +35,7 @@
+ #include <net/if.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <sys/time.h>
+ 
+ #include "private.h"
+ #include "missing.h"
+--- a/ell/icmp6.c
++++ b/ell/icmp6.c
+@@ -36,6 +36,7 @@
+ #include <net/if.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <sys/time.h>
+ 
+ #include "private.h"
+ #include "useful.h"
+--- a/ell/time-private.h
++++ b/ell/time-private.h
+@@ -19,7 +19,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  *
+  */
+-
++struct timeval;
+ uint64_t _time_pick_interval_secs(uint32_t min_secs, uint32_t max_secs);
+ uint64_t _time_fuzz_msecs(uint64_t ms);
+ uint64_t _time_fuzz_secs(uint32_t secs, uint32_t max_offset);
+--- a/ell/time.c
++++ b/ell/time.c
+@@ -26,6 +26,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <time.h>
++#include <sys/time.h>
+ 
+ #include "time.h"
+ #include "time-private.h"
+cgit 
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index a4c3fe9043a1..6af8162f8a9c 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -3,5 +3,5 @@ DIST expat-2.4.7.tar.xz 454136 BLAKE2B 441616f44ce585f75a67a3ebc2264e5723df55975
 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 2292 BLAKE2B 71b4ddda1fd43fd5e7c7b6ea15a28bc300d0cd4b0ebdaeff49db4e1e5be4a12085e918eb852bcf21151c3b475698719d1db08c02d8b97c4179b171e04b0b32c4 SHA512 be80067d86d99cc97cbc83bdbde5017cdad2be08378a185709c578a5f432553fb18b78d0e2538cb548b48021e0eb2b51e42e0b7e1e68c22812f48036e496d81e
+EBUILD expat-2.4.8.ebuild 2284 BLAKE2B 814372a31968e1f5c6109dfb456549c53e1795964e853ef1e7cfa4aac56800fc6c8a74f2decda30f8627e2f94c469fdf7d43df0a82465b6c512fe2beda1e0f4e SHA512 9794fb4ba34a5cb4ff6420fc5ba9c091e5b8314d13149e56a37a1b98cb2c91006b34b1819a0ff1f10ffad9663e169e63f6d330787087a2cf0cac1fe7d1592f6b
 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
index f8c937050342..28bf1c806325 100644
--- a/dev-libs/expat/expat-2.4.8.ebuild
+++ b/dev-libs/expat/expat-2.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 1ed648934e7f..3f84350425f1 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -2,5 +2,5 @@ AUX ffcall-2.4-vacall-riscv-pic.patch 16090 BLAKE2B db91cee446d8542d48b7bc33cc13
 DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
 DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6
 EBUILD ffcall-2.1.ebuild 1465 BLAKE2B 94c45c5e0c32ef02e7eeb1922466dabb4c5ad239e992403796e84a803fb2901384da0b029af539b8d71d960e207530de48bc49a72ecdd7143721d0982af76e13 SHA512 4b4fd2c30aaa9e7039e3797df97ad9947f960ba22d65fc5ae1a8d6c57c1cf6ad04ea6726249d3e2fcb34940ebf30b2c15f270f19b79dea9dd2e8b0fabdce062c
-EBUILD ffcall-2.4.ebuild 1582 BLAKE2B 2b77422117c053579b105843f43e7de816df8ab11324b1dc2d95fd52f3c18805781c6d7837ddcd261e89d811cf037761db2b544ae059e1216d11c37ab4f67fc2 SHA512 109fc11935245301618ed23f6feda80589be6e90300d60a4f85f6681512cf412fdb860950fe5ed12f681726b7877382ecf2d061aee76cd22074017ecf41f8837
+EBUILD ffcall-2.4.ebuild 1594 BLAKE2B d5698aba91126067627ddb9a88f525e248bffecc7ef49288f8dff1f7c32746a4dd0d9f421bac6ede0f5d0130434a69771e7c38ef457eab46911361b374025e90 SHA512 27ff8105f30e2c1f3fe76e2c125cfb1b25870bb18471bacc642ca203ee6059f10f3292e2ed4f06ac40e128cbbe1619d3fc7e1985059d56d5d844da684c62b6dd
 MISC metadata.xml 859 BLAKE2B a3c2244f2545985f3000c06357c8494bda02e082d089a1b44793a944bdd2592eac8b6e567be29943d07a0eb2930dfda1eb20695f213ec469a1457fd3f8d4360f SHA512 49e8a58e4839ee6d15de7165fede7f8b5f1f200731f8d3a0c4ceee97b8ff1c6e03550ca6be6531d928d43000ec7ded5922f85ef8e3a97d1853be94c9c3d3afe0
diff --git a/dev-libs/ffcall/ffcall-2.4.ebuild b/dev-libs/ffcall/ffcall-2.4.ebuild
index 8a30bf885b1d..286058bbcc34 100644
--- a/dev-libs/ffcall/ffcall-2.4.ebuild
+++ b/dev-libs/ffcall/ffcall-2.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV}
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=(
 	# bug 842915, drop on next version bump
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 7d3a5a8018f5..9fbcb1b8a565 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,6 @@
+AUX flatbuffers-2.0.6-locales-detection-fixup.patch 1183 BLAKE2B ab4612ff9cfd3a9c96b71d349a801bd359c62588946053dcc3dbfb32345d352d60d08778b998f32cea33aa3a20e74a29602afb4721d21b2a3dffaade8d473658 SHA512 d9b5ad550a363ab73025179c416cbb0d613e4be8a6307e3bf4fe40c64fd6757168c49b12a073351bc5d041c6bf0ccc4d297db87575215de0b3abdb1a21213975
 DIST flatbuffers-2.0.0.tar.gz 1538022 BLAKE2B ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
 DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
 EBUILD flatbuffers-2.0.0-r1.ebuild 831 BLAKE2B 68d76c63ca1b7e7952029c697401b27d3d16917a1bace1b98df7ca5a4751f4e6d0c9be6f85a655c517add23d13b60c804004f243854a46cd2bf9feef71bc956a SHA512 dd77a7b4ede065ae9e6e8494a85f47f7350cb31cf5d861369f0e0f1f233b3e05847ab03ab528f52134caccae90b63dd8bf02f6e4672785592044eef5229d9435
-EBUILD flatbuffers-2.0.6.ebuild 871 BLAKE2B 65425f3bbbf321476bbe9193e95797db0924b364cb9bc292f88bf05bc2c5b535b6c51a63edd31504b5c7a04f641a94b5d304a916d1766a09b10b3b645aebdfdb SHA512 c590eaa4db455758e519c4307992a5b7c24032f28ca1b461fa96c6265001775001d53b976818909850fdcf0ee942e4d79a16255a1c6a9225f066230b2d4acf1e
-MISC metadata.xml 333 BLAKE2B 406420eb792181bdf5e8c93153e9306c84fd6f3fd1148454ec57e858b411b698cff132f5ee4695866ab8984d665201a8ebc942ae425545bd67641e9c1d364b21 SHA512 b9d41f9dc12a72fe220b3b9673fac2656d060be1ed80b1935142e4706e6dc0663dc2667e84245328c8968b5a534fe48800b9b2e8e2b2635365ae741c126f757e
+EBUILD flatbuffers-2.0.6-r1.ebuild 913 BLAKE2B a64d7b9da3088b1a85f5f24dcda193fb3a3fbb99d81ef29fd1669548b886f05b6c19212be989ad4b621449ffd62a6eafbe859f62209da8eb7f4693ba1701968f SHA512 001cadd5e252acd90c62552f1ecb2f2125025b4edd3eec704b54b38c10c0ab46199b9f587412843ae02ddc63da894bddd0e855ff66ac0c1397893f3130593f4c
+MISC metadata.xml 251 BLAKE2B 8c4605abcff76ecc7c92d7d244e5c208caadc7377eaacab5b1e438d539bc5723245f007fb2b18150c3653ac9e510d4a25f8d7c195a29297381465b776af163d7 SHA512 31e9a32153945f50c11f05ac1df14992790328d134573bfa1bfd76a7f8dcc844e81b83257d87db8290f8b8035cf814906f84715edf4df04a23e980c06daa332a
diff --git a/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch b/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch
new file mode 100644
index 000000000000..6ab1b085876c
--- /dev/null
+++ b/dev-libs/flatbuffers/files/flatbuffers-2.0.6-locales-detection-fixup.patch
@@ -0,0 +1,26 @@
+From f10f1fdeab9dedf8206965b73a52e02e3de3bc41 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Wed, 22 Jun 2022 13:09:43 -0500
+Subject: [PATCH] Fix base.h to only include locale support for glibc users
+
+Signed-off-by: Jory Pratt <anarchy@gentoo.org>
+---
+ include/flatbuffers/base.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
+index 458ac3f..46d6d80 100644
+--- a/include/flatbuffers/base.h
++++ b/include/flatbuffers/base.h
+@@ -262,7 +262,7 @@ namespace flatbuffers {
+ #ifndef FLATBUFFERS_LOCALE_INDEPENDENT
+   // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}.
+   #if ((defined(_MSC_VER) && _MSC_VER >= 1800)            || \
+-       (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
++       (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
+     #define FLATBUFFERS_LOCALE_INDEPENDENT 1
+   #else
+     #define FLATBUFFERS_LOCALE_INDEPENDENT 0
+-- 
+2.35.1
+
diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
index 6750da452422..85b401a3de3a 100644
--- a/dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
@@ -13,13 +13,18 @@ LICENSE="Apache-2.0"
 # From 1.2.0->2.0.0, incremented SONAME, although the interface didn't actually change.
 # (Apparently to adopt semver.)
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="static-libs test"
 
-RESTRICT="!test? ( test )"
+# out-of-source build broken, bug #842060
+RESTRICT="test !test? ( test )"
 
 DOCS=( readme.md )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.6-locales-detection-fixup.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
@@ -28,7 +33,5 @@ src_configure() {
 		-DFLATBUFFERS_BUILD_BENCHMARKS=OFF
 	)
 
-	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
-
 	cmake_src_configure
 }
diff --git a/dev-libs/flatbuffers/metadata.xml b/dev-libs/flatbuffers/metadata.xml
index 7351ad7bcae6..8647ed292165 100644
--- a/dev-libs/flatbuffers/metadata.xml
+++ b/dev-libs/flatbuffers/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="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">google/flatbuffers</remote-id>
 	</upstream>
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 43df6db2a94b..045a24cdf495 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD folks-0.15.5.ebuild 2338 BLAKE2B 4c90546c23eb83b4fb3aeca7a3c8642fb130c36bc5dbed9272ba328076afe73b6870c5e0ae9bf9332c19523790082aa81c3361b5b07d226451a1411d19e99610 SHA512 16d5a0aab5120db03e49492865d26d505285bf735404c9f2419de85e27acf7e3d5e9f6ce5305cc0f6ba5ced340d317e9ebc5d7dfb4edcf866bf1ad9e1b2fbbd9
 MISC metadata.xml 396 BLAKE2B f4e55d5af852a227b66080749510b9915ac9c3f7081c88051f06be73465235ccc326db015238366e62c40d6e8027eac233644ad8421eb0b59f881e2ec215a1e2 SHA512 4a6a15a7ecee35f43c7f82d24e82c32ca3811058f5135e473e15bcae21fc3023d61a6c9f638c9d97336baef3fa8126ab31a49eb036545f521dab2bf93c2a0f0a
diff --git a/dev-libs/folks/folks-0.15.4.ebuild b/dev-libs/folks/folks-0.15.4.ebuild
deleted file mode 100644
index 5ab4cc617b40..000000000000
--- a/dev-libs/folks/folks-0.15.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.48"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? (
-		>=net-libs/telepathy-glib-0.19.9
-		dev-libs/dbus-glib
-	)
-	eds? ( >=gnome-extra/evolution-data-server-3.38:= )
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	eds? ( gnome-extra/evolution-data-server[vala] )
-	test? (
-		sys-apps/dbus
-		bluetooth? (
-			$(python_gen_any_dep '
-				dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-python_check_deps() {
-	if use test && use bluetooth; then
-		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" -t 5
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.15.5.ebuild b/dev-libs/folks/folks-0.15.5.ebuild
index 9ee2c090d991..88f15256eeaf 100644
--- a/dev-libs/folks/folks-0.15.5.ebuild
+++ b/dev-libs/folks/folks-0.15.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/f
 
 LICENSE="LGPL-2.1+"
 SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 IUSE="bluetooth eds +telepathy test utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 52552349bab2..1e244e27efa4 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,3 @@
-DIST fribidi-1.0.11.tar.xz 1077004 BLAKE2B 9de3e170e2b6cf90623c711e16f6595f6ca91e14707cbfd36dda7df92689ea79ec36c4b658199e9046eedd07c9ebfde18617525c83cf4b0e9e2ccb4d9f82ed84 SHA512 6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c
 DIST fribidi-1.0.12.tar.xz 1154912 BLAKE2B f76f9d28f738f0cc9790ccdf0fe419cb0e7d70b24aa825844d23c4b31ad51c33f09c88ad4876fa6a52523f2a52d5eb7a4b50deeb70f9db750c69ac236ecfa8f5 SHA512 cd624f519b270303e89139ced4020115abe3b6a0d774ba57f17fa69c6036edebd76c635a42c468786e76c6ffb0c7d63b435cd2663bc2fba08dec405840dd8e49
-EBUILD fribidi-1.0.11.ebuild 792 BLAKE2B 67389241050d716c43ecd68978ac9047176f67554beb51342ad0e6c49fb279d8d1c55a323e92308705503b176dc7f66dd2362badadefe57400691d5ab9bf6c1d SHA512 2c405435b8603031f8111811e2ae72cb439ca74b04efd1e4535f3c51d24c83117ffb45de784066059dbf62793cfdbd022fa0e65257f94bd812729ce7df21442b
-EBUILD fribidi-1.0.12.ebuild 807 BLAKE2B e04ee9fd9399b8e07187bb21b1f13f079cae8ca32e1436aea3d8fe507ef9c1b511898e5466f85c005c937ed98f419dcb4bcadb5a8f10c5486e647e39664cfc3f SHA512 877debb85f05323c52ed9893f27fe6f5d8ab6afdc5c482014db84c83331b80d17b339bf7e02dd778fb37fa99e8edaf1de8e325cc5c51c489c8bfca927f03ec10
+EBUILD fribidi-1.0.12.ebuild 799 BLAKE2B 5064944b1cbae7927c731358e9635d2be297c70f3025ee6584709344e1a61abda64993bac69c986bb8b371c4d657a7b077b8b13bd5fa133d2eef97d4a244c405 SHA512 5b0879a90e1cd607bd6b115a77606fecfcea1fd8bc121240fddd8a120eb2e9c94aacb8aee838b3b9ac49fc74b093d46d1ca78f585696ec4d8e2a2ec74e560ade
 MISC metadata.xml 342 BLAKE2B 71ad2adf0909be22d8d55ed37c2ea05e7e2fdbdb14e2eee4bff83447d400b89996403a2c4875d30330e56fd857d3672574006c36ba8b23b91ae0de3e801609f9 SHA512 a4b5a69dea823758640fd15374ddb4e5840bec92cbdaff8f8b62554b472a9b7006f77f0771d8410fc076e67da005a4e153fde7443059ccf9d7d85244c8cf2912
diff --git a/dev-libs/fribidi/fribidi-1.0.11.ebuild b/dev-libs/fribidi/fribidi-1.0.11.ebuild
deleted file mode 100644
index 0dac42de89b3..000000000000
--- a/dev-libs/fribidi/fribidi-1.0.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddeprecated=true
-		$(meson_native_use_bool doc docs)
-		-Dbin=true
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/fribidi/fribidi-1.0.12.ebuild b/dev-libs/fribidi/fribidi-1.0.12.ebuild
index 6d995358972b..b85a0deb64f0 100644
--- a/dev-libs/fribidi/fribidi-1.0.12.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index f360ed928773..284ee59c6344 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -3,6 +3,6 @@ DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b
 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 965 BLAKE2B 8c72a223955e29de97de49663d0a5ea56e9c71c231fb1d66a2dbf583b5570a0ccd8b2301f4eb82dc3c37ea34f5786c2af96b9e40dcc691f62d487070dfdac665 SHA512 d10880e11c34669484e26a670295a8e25f350badab476fa5639fde5aea3d55edfd8d62abeeebc31f07762dfaf08ba465d622543b219accf04937fd0df3574a37
+EBUILD girara-0.3.7.ebuild 964 BLAKE2B 59a0adee901ec76751ab2df7fe9e4802281b52957f366bd7acbdce5640ecdc910a78c33fe310ffad5696167bca6b8a905c0cbdbfdfdee349cfcab99cc2ce0b73 SHA512 6d16decdf15865794c8adbbdad49d7de6b28fdc0a5231c393916269a735ae7c21f01511445d688be48f63e7c83bad4db13c48b5d2dd53a94b7bdbfbe219adec2
 EBUILD girara-9999.ebuild 1102 BLAKE2B 7d305110e6e6c72090a938d9f4c46f39f58a9cdf6cc5eb704b43c683772e069f9888f2bc4ec59e2ab1a8fefb64d0be165db2d8412383b4b3e0a5d78cc7e02192 SHA512 f0f8a6a60d25c2525b2724fb8143f6dfccfc5cb05cae8c1acf350575ddabf80fd4f1066797f9556a839f824a4a87e0c9ebcbbd5a2169e764232eaeb157cab3f4
 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
index b4ca4a486c3b..7d10e474a577 100644
--- a/dev-libs/girara/girara-0.3.7.ebuild
+++ b/dev-libs/girara/girara-0.3.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~riscv x86"
+	KEYWORDS="amd64 arm ~riscv x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 9bb10acc5114..ef771c1bb753 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,9 +1,6 @@
-DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
+AUX gjs-1.64.5-gcc-11-support.patch 5254 BLAKE2B 77ca0c06f8214bc4a61d4e6df2371776c086738d19164d94913b0c55f795078d29c83a1f61ebd435f8977e853f2f7bbd9d442888f9ebef4e6a4fc11575734e16 SHA512 291bd7c518286af2018602a3794b2cdc4b39ea169c527af4e2ee97f9021fad56b361fc5aa65e0d4cac0d33921a97330ef50fbf03ec1d2fe04896c881c4b080ce
 DIST gjs-1.64.5.tar.xz 422548 BLAKE2B dcc0b7327cbc6a1108be031c8807e61ebd3c8392916750078aaa0d82cb3bf9f7ff0e1876c250e5ddf6e9d7bb6a17d9d1fe34c1c77ff534b7ec1dd54fa05a2d1b SHA512 41a3c79888792674b2bccbf254507ed02497eb571c8ca7f47aab406d2ee29b73c98b1c7d59c33ed33bad90c6989df944d78b86d2f7e9824d598b62e29769b6dc
-DIST gjs-1.70.1.tar.xz 598444 BLAKE2B 7d5f1b82e9edd20b9b3d3b03511d3cb8e19715d5dcaaa5375867c1c8754895db33089c41e17f28b732183ce510fff868399cd2174062684e0b3072cd599bc12b SHA512 194d8efeb37ecf7f3ea65c0bf0bbe2120524a11448423888d0785868297ebdea12b0ea4b28cb49d2596c7a3d73f13eb216072db8dca5e209193ba3dbbad78b6b
 DIST gjs-1.72.0.tar.xz 620296 BLAKE2B 33665e66d548c6017bdc9ddb7409e1a21b07c9257bfa23ef35b58131037eefcf8ec5c8ffddbb1968db374f22729a6da873b85a022a2f3ed00168cba00acc7923 SHA512 224934eed511052d013cc7c2a29ccf79b14e5ed8c01db8071f07858387d7794b9156abd43ac494a13294248d9b6f2956d21c4e9581a41f5161043dff374f72f9
-EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
-EBUILD gjs-1.64.5.ebuild 1182 BLAKE2B b9b3ac973aa78bfcf7093fdcd01820094e055b5a52368788521cb9eebecf0ea36fe0deb74bd9bac314303cea3c9f24e1cb1438c20abf035a9e86160560557ae9 SHA512 6a4b489a7bb48db88d22a5c2f847d6c6c469af609fa877f95fc1e62ac6c1db0bf5c2b3782d5c31b13538536dae44da27c106e7b54f6e52652c11b20dd1c80305
-EBUILD gjs-1.70.1.ebuild 1189 BLAKE2B f5d195a50c4fb8f270368d87cac25c50ed74fb13ff2f6d9213de4c1ac940a86c9a9a693b539f2a4320e11bd50613c899879fcabbef0a41182b62b8e4a4e194bc SHA512 c3d2524695c7f58d78f3e58f0e7f260b497e6783446bd216a0c1f0abfab91e423f7959d492507abd5b820d7296d5f7d4e235f58c7f7ebe4686a82fef776717be
-EBUILD gjs-1.72.0.ebuild 1194 BLAKE2B ee77ef8ec4e07d76eb007f7d0a798e0cff09cd6d6cab2fe9bb87f31b04fe512307fe8cdcd5a95f36435a34a5d99dc62594b6d55a4304d44e04bc869609520146 SHA512 f712110a9d9c6d0f68b9827390453f8abe6e9ea0c894e040cd3e158f044106bf0e078a64dcc0132fc2e8e6e9f04550424eef80c4d9172d9b11a7c6124cdc3cad
+EBUILD gjs-1.64.5.ebuild 1182 BLAKE2B ba36f6e0485dc507cba57a163eb835d5857e00e6f9dc46e6659bdd4e3b35965f10d8808c3a0220e7369f29c3c0552351ebdff4d590932bf916a11b2ae26ab8bf SHA512 d2be5b242e3249e7a718f7ea595ab3b44a83645f553d7ad42cc5a2b766b96a335b86f182a718fc1544e0817ade4b2d6229a0b0a41f9c4ab5f5ab0af49fc96bde
+EBUILD gjs-1.72.0.ebuild 1885 BLAKE2B 472680725a8ac3fc8f95831135755ff14a111b4491ceada68851fe8754b5e380308524d5d1b5760581cafb2e827a2a74ea449f5d55526d4515ce8358b0e479ea SHA512 b30afd4b9b05e09b4e864f70accc355bfc0fde823cd4cc41decf88732c5a06679167187de2f55df4fbca958367f8c399e5689926c5bdf35e7edd645be6bb5d25
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch b/dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch
new file mode 100644
index 000000000000..3808b6d7862b
--- /dev/null
+++ b/dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch
@@ -0,0 +1,129 @@
+From 757d42d87e8a3b52a0782bc9cbd33c788ecc34e4 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Mon, 15 Feb 2021 20:40:43 -0800
+Subject: [PATCH 1/2] GjsPrivate: Remove volatile from g_once_init_enter flag
+
+On platforms where g_once_init_enter() is defined to use C11 atomic
+builtins, passing a pointer to a volatile value will generate a warning
+in GCC 11 and later.
+
+More info about the GCC change:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95378
+https://gcc.gnu.org/pipermail/gcc-patches/2020-June/548283.html
+
+More info about changes made in GLib:
+https://gitlab.gnome.org/GNOME/glib/-/issues/600
+
+See: #376
+(cherry picked from commit 989ac9ac723dc1c8b6b8961292f236c558f5c0f0)
+---
+ libgjs-private/gjs-util.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libgjs-private/gjs-util.c b/libgjs-private/gjs-util.c
+index 20a732d5..f7f3189a 100644
+--- a/libgjs-private/gjs-util.c
++++ b/libgjs-private/gjs-util.c
+@@ -57,8 +57,8 @@ gjs_format_int_alternative_output(int n)
+ GType
+ gjs_locale_category_get_type(void)
+ {
+-  static volatile size_t g_define_type_id__volatile = 0;
+-  if (g_once_init_enter(&g_define_type_id__volatile)) {
++    static size_t gjs_locale_category_get_type = 0;
++    if (g_once_init_enter(&gjs_locale_category_get_type)) {
+       static const GEnumValue v[] = {
+           { GJS_LOCALE_CATEGORY_ALL, "GJS_LOCALE_CATEGORY_ALL", "all" },
+           { GJS_LOCALE_CATEGORY_COLLATE, "GJS_LOCALE_CATEGORY_COLLATE", "collate" },
+@@ -72,9 +72,9 @@ gjs_locale_category_get_type(void)
+       GType g_define_type_id =
+         g_enum_register_static(g_intern_static_string("GjsLocaleCategory"), v);
+ 
+-      g_once_init_leave(&g_define_type_id__volatile, g_define_type_id);
++      g_once_init_leave(&gjs_locale_category_get_type, g_define_type_id);
+   }
+-  return g_define_type_id__volatile;
++  return gjs_locale_category_get_type;
+ }
+ 
+ /**
+-- 
+2.35.1
+
+From dade6ee66e07a1865dc380060abe921eaeeae763 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 14 Feb 2021 12:20:09 -0800
+Subject: [PATCH 2/2] maint: Avoid g_once_init_enter error in GCC 11
+
+On platforms where g_once_init_enter() is defined to use C11 atomic
+builtins, passing a pointer to a volatile value is an error in GCC 11 and
+later, in C++.
+
+More info about the GCC change:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95378
+https://gcc.gnu.org/pipermail/gcc-patches/2020-June/548283.html
+
+However, it's my understanding that in modern C++ there is no longer a
+need to guard the initialization of these variables. Since C++11, static
+local variables in a function are guaranteed to be initialized only once,
+the first time control passes through that function. So we can just remove
+the g_once_init_enter guard.
+
+More info:
+https://en.cppreference.com/w/cpp/language/storage_duration#Static_local_variables
+
+Stack Overflow answers with quotations from the C++ standard:
+https://stackoverflow.com/a/58804/172999
+https://stackoverflow.com/a/8102145/172999
+
+Closes: #376
+(cherry picked from commit f02eaf3a9d3465915eb849428c2d9615e2184a4c)
+---
+ gjs/error-types.cpp | 32 +++++++++++++-------------------
+ 1 file changed, 13 insertions(+), 19 deletions(-)
+
+diff --git a/gjs/error-types.cpp b/gjs/error-types.cpp
+index 86cb8789..5eba61b2 100644
+--- a/gjs/error-types.cpp
++++ b/gjs/error-types.cpp
+@@ -31,24 +31,18 @@ G_DEFINE_QUARK(gjs-js-error-quark, gjs_js_error)
+ // clang-format on
+ 
+ GType gjs_js_error_get_type(void) {
+-    static volatile GType g_type_id;
+-
+-    if (g_once_init_enter(&g_type_id)) {
+-        static GEnumValue errors[] = {
+-            { GJS_JS_ERROR_ERROR, "Error", "error" },
+-            { GJS_JS_ERROR_EVAL_ERROR, "EvalError", "eval-error" },
+-            { GJS_JS_ERROR_INTERNAL_ERROR, "InternalError", "internal-error" },
+-            { GJS_JS_ERROR_RANGE_ERROR, "RangeError", "range-error" },
+-            { GJS_JS_ERROR_REFERENCE_ERROR, "ReferenceError", "reference-error" },
+-            { GJS_JS_ERROR_STOP_ITERATION, "StopIteration", "stop-iteration" },
+-            { GJS_JS_ERROR_SYNTAX_ERROR, "SyntaxError", "syntax-error" },
+-            { GJS_JS_ERROR_TYPE_ERROR, "TypeError", "type-error" },
+-            { GJS_JS_ERROR_URI_ERROR, "URIError", "uri-error" },
+-            { 0, nullptr, nullptr }
+-        };
+-
+-        g_type_id = g_enum_register_static("GjsJSError", errors);
+-    }
+-
++    static const GEnumValue errors[] = {
++        {GJS_JS_ERROR_ERROR, "Error", "error"},
++        {GJS_JS_ERROR_EVAL_ERROR, "EvalError", "eval-error"},
++        {GJS_JS_ERROR_INTERNAL_ERROR, "InternalError", "internal-error"},
++        {GJS_JS_ERROR_RANGE_ERROR, "RangeError", "range-error"},
++        {GJS_JS_ERROR_REFERENCE_ERROR, "ReferenceError", "reference-error"},
++        {GJS_JS_ERROR_STOP_ITERATION, "StopIteration", "stop-iteration"},
++        {GJS_JS_ERROR_SYNTAX_ERROR, "SyntaxError", "syntax-error"},
++        {GJS_JS_ERROR_TYPE_ERROR, "TypeError", "type-error"},
++        {GJS_JS_ERROR_URI_ERROR, "URIError", "uri-error"},
++        {0, nullptr, nullptr}};
++    // Initialization of static local variable guaranteed only once in C++11
++    static GType g_type_id = g_enum_register_static("GjsJSError", errors);
+     return g_type_id;
+ }
+-- 
+2.35.1
+
diff --git a/dev-libs/gjs/gjs-1.64.4.ebuild b/dev-libs/gjs/gjs-1.64.4.ebuild
deleted file mode 100644
index 8c6b028bbd65..000000000000
--- a/dev-libs/gjs/gjs-1.64.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.61.2:=
-	dev-lang/spidermonkey:68
-	cairo? ( x11-libs/cairo[X] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
-	virtual/pkgconfig
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/gjs/gjs-1.64.5.ebuild b/dev-libs/gjs/gjs-1.64.5.ebuild
index c8a26722b31f..60973ef2fa78 100644
--- a/dev-libs/gjs/gjs-1.64.5.ebuild
+++ b/dev-libs/gjs/gjs-1.64.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 sparc x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/gjs/gjs-1.70.1.ebuild b/dev-libs/gjs/gjs-1.70.1.ebuild
deleted file mode 100644
index 4e9dda763169..000000000000
--- a/dev-libs/gjs/gjs-1.70.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.66.1:=
-	>=dev-lang/spidermonkey-78.2.0:78
-	cairo? ( x11-libs/cairo[X,glib,svg] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	append-cppflags -DG_DISABLE_CAST_CHECKS
-
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/gjs/gjs-1.72.0.ebuild b/dev-libs/gjs/gjs-1.72.0.ebuild
index 35fcadb1f5d4..6a6738cf344c 100644
--- a/dev-libs/gjs/gjs-1.72.0.ebuild
+++ b/dev-libs/gjs/gjs-1.72.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,6 +34,20 @@ BDEPEND="
 src_configure() {
 	append-cppflags -DG_DISABLE_CAST_CHECKS
 
+	# On musl, it's required that either gjs, pixman or gnome-shell to be built
+	# with a larger stack otherwise librsvg fails to render a particular SVG, as
+	# a result we fail to get gdm or gnome-shell running (greeted with a fail
+	# whale screen). The bug has been reported to librsvg. This is ideally just
+	# a temporary workaround until we understand what exactly needs a larger
+	# stack size, as it's not sufficient to do just librsvg.
+	#
+	# Please refer to:
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
+	#
+	# TODO: Find an actual fix instead of increasing the stack
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	# FIXME: add systemtap/dtrace support, like in glib:2
 	local emesonargs=(
 		$(meson_feature cairo)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 6f3c058ea94a..77e20277c393 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,8 +1,6 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
-DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
 DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
-EBUILD glib-2.70.4.ebuild 10219 BLAKE2B e48a93dcd8aaa28466d52188718c811d780c1ebc0f48b5736d7dd911c89bb78fab0fe8dda3e0ce0cdaf90c7a4285b33cc94bcd1ec8260f66cdc44383f696c0cd SHA512 87e59328f0056aae0682aa2ea8925f30846ec4356350a839e9c71f15ad38276aff4a0ece1cd15fdd2f3576f946670c4fa88474d232984ad730412f662b7bb484
-EBUILD glib-2.72.0.ebuild 10227 BLAKE2B 674c325e91a62c32ba13f83a5061ab3d7956b86fe9fa6815e2959881a1f89d95b4e3fb6ea44ac8e7bed30e70d6def99cfbeb56eeea8321da460fa13b41a79c29 SHA512 2faf137d976d912599d93f22a3714e0654ce696f6d32e0dd36aafb7e659bb275abb02601e289836367a9823e9a994fac5a353e552a2afeb4cb01693f2a15a76c
-EBUILD glib-2.72.1.ebuild 10234 BLAKE2B 75c732deaf8bb62e64d6a7c26dffd4d1b9ba84c93d18a3e899c256c37bf5fb0eb1c228ec37eba757454cdf4f21868fff028cd66dd73aff0fc5f26925a973d500 SHA512 c5d815b0de2ea27c22f0995fca0da703b833c5788adfa0648eaed6f3f0f986617619f2278f73e0f2d238b6d7e40e83bc3cf1e5c15068b5d20048ebebb86c383e
+DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
+EBUILD glib-2.72.1.ebuild 10226 BLAKE2B 7d030db432ce12180a60984f45f115e528c7fbbbd31b045ecf9bacbe2a143c6ddc1631b106e10a3059695c3fe3428f438318670aa7e4ccdac7956baae4c98d10 SHA512 651000c70ed27d2649f2fe04aba63e104b851bd7915da1b3f7622d97d91eee4765831c70f3d47d0013f518cd3342d412312f1308eb8eddf54ff91fd75da52d85
+EBUILD glib-2.72.2.ebuild 10236 BLAKE2B 78cdc4624b1c9ad6505e0d477a9a19720a9382eb6963b768c74ca7c00861780906f0424a0f5588f84ef600cab1499440133919c7900973597a113df566743f25 SHA512 085a40a832e93f18af8e0a09cd4f3e64102daae4c22402e49e97340b3be002deb7595267f8c415a36025f9d02b9570b54fea25e8432419a9249c801b31baf378
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.72.0.ebuild b/dev-libs/glib/glib-2.72.0.ebuild
deleted file mode 100644
index 3cd0a365897a..000000000000
--- a/dev-libs/glib/glib-2.72.0.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	default
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use fam)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# https://bugs.gentoo.org/839807
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /usr/b
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.72.1.ebuild b/dev-libs/glib/glib-2.72.1.ebuild
index a53ce4868917..81c15505c940 100644
--- a/dev-libs/glib/glib-2.72.1.ebuild
+++ b/dev-libs/glib/glib-2.72.1.ebuild
@@ -16,7 +16,7 @@ IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap te
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/glib/glib-2.70.4.ebuild b/dev-libs/glib/glib-2.72.2.ebuild
index 472a2d6d4193..4068ee31d4ce 100644
--- a/dev-libs/glib/glib-2.70.4.ebuild
+++ b/dev-libs/glib/glib-2.72.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 
@@ -16,7 +16,7 @@ IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap te
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 063036a3fc2e..cc98c96027ed 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,9 +1,7 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.11.tar.xz 2230984 BLAKE2B 7a1758d8b7b3e4a3b27819b3cd4002247209b0d979813b3071d7423341c0a5786d929110c18d23bad5fb74cb15a142382eb63afc1bc019b1da148ed8a0acd524 SHA512 0d61ce2c7716de3fec2b6666937f01b880b45a1fe7b6c40b5d253e8510f8a4af3b274473b0da4319018747484df35df7ac8fe0ebae019b2f956c525182cf30f8
-DIST gmime-3.2.7.tar.xz 2227048 BLAKE2B 7fba57640038f34bd45ecba1067b6db131705310b62a74da1fa3d575993bbc6cc1dce4e3d219dd42033775e0a90f2b2acc86b1094f96f03a7532eae1b69e63ae SHA512 2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b
-DIST gmime-3.2.9.tar.xz 2230284 BLAKE2B b6dd81adf939fed8fee70880e2c3f907d9eb8fb33efb90c78d6e6c93754e310f44a1affa8c59ac980805be42bbd5f61353633ac071dfa8fd89b65f2f23cbda24 SHA512 00b92ff5e2001644bfac50d1736203dd478c3a44c8f325a216105c5b354540807df9a6025bd0313d1e60793d8388ed4f5ff72685e116e3f36e6ca8c6b326a19b
+DIST gmime-3.2.12.tar.xz 2233844 BLAKE2B 863a0634586a478faf32a201051639c33c214d0acb2b7852ba82a3be1f923ad44f3d04390bd9b62991ebaa17da19b6f74f4ce334ff8272563750587793256164 SHA512 2b2529d36bac4501cc79f9b8127a9f0898fce9ce91dbf8a6c72037d120a2fbccbb97b91b00b81fed15bae4232c59700efacf1c94910a06c66340e67815df5afb
 EBUILD gmime-2.6.23-r1.ebuild 1438 BLAKE2B 4308360fa149361b0873b37c1ec5635e8f2ec089b2e6b01d98ffd085e896d8cad936c12adf2c3ac5add7638c00eaa7f253a2aa34a0f6a690382f1487e3d59c40 SHA512 5af6e472477b49f6fcec7bafa259e84af13c84ce1ab9fb1b1a4bbbfaace36fb0c470af2cf9dc9a0e3be7c75d8b9dd27c424c2bcbb95c6d84bd36f93ad60db72a
-EBUILD gmime-3.2.11.ebuild 1598 BLAKE2B 3ee609a907a7eb90c94611b3b4226a9523106d552d8ae9b31727a70dbe5bbb53458f44b1f538e5c4de0952e3524fade2d96dd51f379d000a071040065377fc81 SHA512 f81493267cedae518aabe05ac25fb4960151a93102bdbfc9461a0d322f78764c3d71312c6b7fc32ba0385989e1587d1752de0d525a432cf7a11fc25aa7194bb4
-EBUILD gmime-3.2.7.ebuild 1570 BLAKE2B 8d149cceed3227e8c4339af56951feb260facd7c8cbcaddd0d9fc621ebf68aecf46524ebcb27a8ae083cbf7c8dcb996f2cc7783641d221127a4351961da63454 SHA512 67336a0a1eacc742b8fdb6d5071ae168f391ee80a634d516727458722ef1b34b9858f1234e16cd62bb0bfaa53ca4c5f90ccba5350d953e4641cc86dac903afcf
-EBUILD gmime-3.2.9.ebuild 1598 BLAKE2B 3ee609a907a7eb90c94611b3b4226a9523106d552d8ae9b31727a70dbe5bbb53458f44b1f538e5c4de0952e3524fade2d96dd51f379d000a071040065377fc81 SHA512 f81493267cedae518aabe05ac25fb4960151a93102bdbfc9461a0d322f78764c3d71312c6b7fc32ba0385989e1587d1752de0d525a432cf7a11fc25aa7194bb4
+EBUILD gmime-3.2.11.ebuild 1591 BLAKE2B b566a92604d4273f145aa34fc2c66ace79e1a979c624c8f8f18f3f27f668900f5f77b18cf61aa9f382bc1c5f1b51b7c4a5328ed71179b59d9e42ec21b23ab72f SHA512 79203207868382680d72814dfed89f93c21749cc7b710e2e7d30ed46d62b10bcf27682c0a57e9a43ff831a300a7b9a6257685936bd52bc8ba960ca73ccd216e2
+EBUILD gmime-3.2.12.ebuild 1598 BLAKE2B 3ee609a907a7eb90c94611b3b4226a9523106d552d8ae9b31727a70dbe5bbb53458f44b1f538e5c4de0952e3524fade2d96dd51f379d000a071040065377fc81 SHA512 f81493267cedae518aabe05ac25fb4960151a93102bdbfc9461a0d322f78764c3d71312c6b7fc32ba0385989e1587d1752de0d525a432cf7a11fc25aa7194bb4
 MISC metadata.xml 408 BLAKE2B e340c8e376fb1fe428478c937d8e018f5b8c475cde16e947467434a7f86227d07ec0d1f9d61226e7f88c763a1d292f39cf4886569d218b4107bbe0b8465b35f6 SHA512 b75375be09c0f37a41d0a1f1ef0abde6880fce81e8318c480df27b954e39aa5fbb69826ff9243f029af2eb959d50641330f31f4bbdfaa6531e031326099cfcc0
diff --git a/dev-libs/gmime/gmime-3.2.11.ebuild b/dev-libs/gmime/gmime-3.2.11.ebuild
index a7eed9e822c8..9609447b48d4 100644
--- a/dev-libs/gmime/gmime-3.2.11.ebuild
+++ b/dev-libs/gmime/gmime-3.2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-3.2.9.ebuild b/dev-libs/gmime/gmime-3.2.12.ebuild
index a7eed9e822c8..a7eed9e822c8 100644
--- a/dev-libs/gmime/gmime-3.2.9.ebuild
+++ b/dev-libs/gmime/gmime-3.2.12.ebuild
diff --git a/dev-libs/gmime/gmime-3.2.7.ebuild b/dev-libs/gmime/gmime-3.2.7.ebuild
deleted file mode 100644
index a4abd373a114..000000000000
--- a/dev-libs/gmime/gmime-3.2.7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit flag-o-matic gnome2 vala
-
-DESCRIPTION="Library for creating and parsing MIME messages"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gmime http://spruce.sourceforge.net/gmime/"
-
-SLOT="3.0"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="crypt doc idn static-libs test +vala"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	sys-libs/zlib
-	crypt? ( >=app-crypt/gpgme-1.8.0:= )
-	idn? ( net-dns/libidn2:= )
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.8
-	virtual/libiconv
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	test? ( app-crypt/gnupg )
-"
-# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# bug #???, why not use --with-libiconv
-		append-libs iconv
-	fi
-
-	gnome2_src_configure \
-		$(use_enable crypt crypto) \
-		$(use_enable static-libs static) \
-		$(use_enable vala) \
-		$(use_with idn libidn) \
-		$(usex doc "" DB2HTML=)
-}
-
-src_compile() {
-	gnome2_src_compile
-	if use doc; then
-		emake -C docs/tutorial html
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		docinto tutorial
-		dodoc -r docs/tutorial/html/
-	fi
-}
diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index dba68ea83af2..39676d69151e 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -1,6 +1,8 @@
+DIST gnulib-5293ada82e1ea38e9e5cdd3724c73204d703f07b.tar.xz 4721720 BLAKE2B d0c70f4f33cbc3b7fcbef6ebe67d4ebac2a89fe8e9b1598fa00f0292ce2bc528ed6f5be123072c43c52f1234266bb6fb96b7881839ff884a39d2bce58a9f3ad7 SHA512 0f1822fb579649c3cd09ca8e69334d425f2024d780a98d7bbf38d26f36f174036fa066635513485ddd6e2ad485c7060ae9b101c1595891307a382e6aa9bc4226
 DIST gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.xz 4711472 BLAKE2B 901fd3b3388210f090825829d1de43395819ee907574e2cf7c6586c93ef72afd26e68abc7ae27d1e462a703f1d3bedf37ffcf4d8924fed32a95bc94ae83399d5 SHA512 04ab346648a23a4f58dc2d818955ae145bc9c21c3b24a1719cdf48bb8116e3765de675bcf19747d64d43432db1bb406f403168f973f24811f9d126deadea7e7f
 DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.xz 4104308 BLAKE2B 099ebb4f4a7745e5b7367f48d8d9cc11d3ac1c03b59aed2801f684fb6433e3dc1efd6b801a864308f440edd6068c7d1bb1763887bcabe2da4f927f5507fa7f89 SHA512 ed97c589b8a39b1d41c0e2e6c0bafda4df99191b8aaae3feb5f46dffee5787d16ad2c4ca62bf50e2964f36691ef446f67540657b1b0cfc5c775acb88816fffb5
 EBUILD gnulib-2019.03.17.09.24.57.ebuild 920 BLAKE2B 6a362c257853e60109ea1c5e5ead6f9132551f066862fc6fa74e27f8c284ef51581894ac9ea7afb0389d40c8b5dfee70708e501fe238f6b9bae64d635e63f204 SHA512 9f6e29ad602bda13257304435c78d32bc9d412648fadcab689838105ac7161d050022fcec292979a199c5639dbdd69aa5a76d1369109f578879d16907ea9bc2d
 EBUILD gnulib-2022.02.12.16.27.05.ebuild 920 BLAKE2B aaf9cbf56b57e3829844a2a650a0af3c920f3564876a9d0b9b4c7cb32615063a1c8ab3eaf4cf19a81b4a4c4a1219f5cda9f222457ea04cc5ef83ef1894d290da SHA512 dbede04293836c00551e8db17baf92a1e27de6493879e7ca8fe4cc76dd0522eb6dd511b33a00a7c29bdb16c033768b00806c227ed3423f35528ca0db08ec7432
+EBUILD gnulib-2022.05.26.07.24.56.ebuild 920 BLAKE2B 64215015f09458a9b9978c3acb3cfbc1f3e82d4db2fe63831c5a387f8d08df16920a11b3e70745c9dca1810377a8a17863f82e6fbcbe06a28c7a03f692d6d2d3 SHA512 34d9da119f9cbb48b424243b199547037b9d921361f7f0a334e80c3c45f281146ba4c714460d4452e7fcc1952ac0747706e8fa143222c2d3767bfaf437b0b827
 EBUILD gnulib-9999-r1.ebuild 788 BLAKE2B 58e59d347b87cc6a6e1f4e04b6723d1e6dccc7adb7d8c5fac2d4df749bb059da9cd38df28139046281cb5e3c0eee5a62949c47fab8b6976cb37f99fa300fcc33 SHA512 f6042419262d62e10dfb62c2770e821157672040bd86ac3e92da9b5fd008a6ceda1486f331ead8716195cb8c9c3966531ecfe1d47bb6cc09e313a7f4492b269a
 MISC metadata.xml 244 BLAKE2B f599747a5c4b523305b9895669bb3171446bd4edf7339753b21ca14524c010a83bdb41e83851df393240077c31891fefa1a9bd876bda37cf2ef77731a76eca80 SHA512 7db5efa0f85d76e9ff76fd6a0e83908ccb9d5486b2994277166976ff531b9eb88806ca80cd3cb070bac89f383872733c8470d04f86a67854d1b023eb24b4e2b5
diff --git a/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild b/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild
new file mode 100644
index 000000000000..64e187b2477d
--- /dev/null
+++ b/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GIT_TAG="5293ada82e1ea38e9e5cdd3724c73204d703f07b"
+
+DESCRIPTION="Library of common routines intended to be shared"
+HOMEPAGE="https://www.gnu.org/software/gnulib"
+SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+S="${WORKDIR}/${PN}-${GIT_TAG}"
+
+src_compile() {
+	if use doc; then
+		emake -C doc info html
+	fi
+}
+
+src_install() {
+	dodoc README ChangeLog
+
+	insinto /usr/share/${PN}
+	doins -r build-aux
+	doins -r doc
+	doins -r lib
+	doins -r m4
+	doins -r modules
+	doins -r tests
+	doins -r top
+
+	# install the real script
+	exeinto /usr/share/${PN}
+	doexe gnulib-tool
+
+	# create and install the wrapper
+	dosym ../share/${PN}/gnulib-tool /usr/bin/gnulib-tool
+}
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 124eea7e31ae..dd2d7721615e 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,3 @@
-DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
 DIST gobject-introspection-1.72.0.tar.xz 1040936 BLAKE2B fd7600a927e57d5a076c203a084afe56a738d3a93109055be7bee22a96d6d5b08892300260288e5b83f883e54ca658cb24ef5c862abe435820c963bbf0cf8496 SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
-EBUILD gobject-introspection-common-1.70.0.ebuild 934 BLAKE2B 3a49082633ebc991738de116d9a584b06165470da627646053bcae261ec625d77dd1dd5ebca2f1221a10c5479d29eec04ce34fcf10ee36ba195c9c124ba3e402 SHA512 06bd2fc8fa63bcbb09834751275355d30c9e63799a09a4af259f3d4fe88491246cf224025ef223d231a16208ff0a7fec45ae9f622d96e00a6acf9ff9d9006d45
-EBUILD gobject-introspection-common-1.72.0.ebuild 949 BLAKE2B bcff3009b7283b51ab979e6ac28617faaae07de2e71a4d7a929c5a003edf40fa1d8a1769faa5f17d68a9f8129a59034d2c966723918109fa2c7087f2a8fc9b2e SHA512 4f83472e0e89c7a19d95d4e3077dfe45881a9eff3a4fc189c4e42c3251aa1a2ebb3d5899f79b528eb8a872fc5ccad4aa64c6370b75fc3d1d6deaa21021071125
+EBUILD gobject-introspection-common-1.72.0.ebuild 941 BLAKE2B 1c9d73d3088e7683201955c6b3211088f3811e6bc6788b3538a68eb8abb3bfb0b13219949b801ec7ca2f82e88e14031f891a83f7f446a1a33cf4895fc3af0b25 SHA512 2403f9f4863914f57f2cd4a9fc84911cf8c3a1121d56ab116c44662538c63de1248565b51833089d36dc8d47906b7de9e8b6774b4021e45b3055c41d2da891cf
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
deleted file mode 100644
index 7a93928973b3..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
index 5880728021e3..f41423be2976 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 5a6362ed9fb9..5298bc144b13 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,6 +1,3 @@
-DIST gobject-introspection-1.70.0-meson-0.61.patch.bz2 4211 BLAKE2B 0453266900dfdf24da3531d205fe03d8eb5f6e3d76db4b945852453dc46d26a77449f0ddd81bad6df6d8108d8a7369b60a07b7c4f8e0c01811f735da76cf4d56 SHA512 ba5861baaabfe20185d85ccbc02425d1e44c525a5d05c28ee84552c43ab30497bed4e713e6f1b2f9c6508714020b04b5228532e1489e8a732ba99ea61ca950c7
-DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
 DIST gobject-introspection-1.72.0.tar.xz 1040936 BLAKE2B fd7600a927e57d5a076c203a084afe56a738d3a93109055be7bee22a96d6d5b08892300260288e5b83f883e54ca658cb24ef5c862abe435820c963bbf0cf8496 SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
-EBUILD gobject-introspection-1.70.0.ebuild 2110 BLAKE2B 5a65ca353c979fee0d42fbf192596164bd496c57fd927dc4e20c1857dd6c0e95d8bd1d6911a322d4d833ad06d494d1106564335b03fd78e61e12527c226e658c SHA512 7d901990312e02b23d9cfc895e4082b266eb9f0cc794d5f5bb873080a1b9519d5a43bde87ebae4b098beb704eb448f048dd7eee950edc7ae18453f7c9b693cbc
-EBUILD gobject-introspection-1.72.0.ebuild 1982 BLAKE2B 30d2ce5c57e5a2140ee443ffe31c000f7320a0a52aa3a002da593bd299fdc7558f7bd774b41eb063f008c9aaf02ca4d46e98c75a6b3bf47369515e3be3a6d329 SHA512 2ebb9c2603f71c95af3b55a7b6eaa4ae83cbd1a6cffb8900739ef228aa1018d939ee0e99a9334773b8d1a4ac45335ea2b36202f5918d64d22e35c0274119ca4d
+EBUILD gobject-introspection-1.72.0.ebuild 1987 BLAKE2B 47563c2399970af94e72ed72542c440afd4f6a4aeddf15c43897fc059b4fcc136d0c466848e7a40ad735f644028b3564bb7a7260453a60830dd2a7670476b323 SHA512 77f5664ff9bb2a5af147c7ae937a3d4b787f2fbedba26910ebfe44798e7b7bb9bb4b6410ade632d1ac5fe5755de09853fc062f90320f162a26fda87d82e6b6f3
 MISC metadata.xml 368 BLAKE2B 5734e81d2929cef33ae5a3e57d48717f2079944a26a34206d0c674a607068047e24c17e76435683dd6f9b369ba8abcbd6ff98037ba219e7f4ea8225d3980a3eb SHA512 e8a3b181add420cbfbffa78ba6a8bf7d7b82593ba9a54e89e52a9d0eb3a7c92f577d71080912067c16364e267bb1438ba1c8839ed62af24da39cc9e1b6f7d864
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
deleted file mode 100644
index 6ee20137414c..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.61.patch.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.58.0:2
-	dev-libs/libffi:=
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	gtk-doc? ( >=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-meson-0.61.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
index dfbf5796128f..10f35c92331b 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
@@ -32,8 +32,10 @@ RDEPEND="
 	${PYTHON_DEPS}
 "
 # Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	gtk-doc? ( >=dev-util/gtk-doc-1.19
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
 		app-text/docbook-xml-dtd:4.3
 		app-text/docbook-xml-dtd:4.5
 	)
diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
index eb6bc98f10aa..7b23af3c2c20 100644
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@@ -1,6 +1,8 @@
 DIST gost-engine-1.1.0.3_p20181031.tar.gz 473151 BLAKE2B fb8dc737c3bda181de168d918744d6e036886753e70cfcd0516499dd5d9a1ba3af0d44d26fc50570318375a142adfec532327dc57fac5996266b12551631b5fd SHA512 9f0df3c48191aea75d3fee5b5886ba32451889bdbb97c5e540f14a57d8d41606d858769a70b51c0c2c958565b347c5a613004e7c3f81658281d6a3eecd030707
 DIST gost-engine-3.0.0.tar.gz 1634392 BLAKE2B a97150e8d3d30df487d63e0b1016e21b719f951c37646239492a89462169f8712bc5ffb335653b26778104644bb1175f5e17afffd8ba0422d8ec748ea59e3f0d SHA512 180cfbd013bf9959659744c49c886afa67911e1722db1dc3189f94f5320a51fc3b48ed937e57cdfe33f0e63cbf3597a41483fbda534fb8932997f21bebb1bb73
+DIST gost-engine-3.0.1.tar.gz 1645245 BLAKE2B 713a7343f9c11feec361dd2828b00dd7d47518f5a1b047a6e11f8d8eea206ce9058ace1bd70e12b4cb2200789eb8209de671cb5e2692e95391b4e7a82d0badc2 SHA512 eb9fb126393cfe23bcef0f45c05b38d39aadd8909419ebcf6dab4800bd7372b63891e9061f8e70686f8ba5cd58669681895b36320ed6a8cc0ca1ff037aa73b85
 EBUILD gost-engine-1.1.0.3_p20181031-r2.ebuild 964 BLAKE2B a32ed49aaa867cd99d0bdc4225c46f9758929fa8ddb272e06ff86a37fe45974102d8eabad35b71b5b6e1dd71efa7d6d27c231682b2c2e77e1b48565f7fbc72d6 SHA512 58f8c3db060fe5ce68a438ee79fd998c2daa62aa93c1d32125cb3f0d824d95afe1e3c38dd7875146cb0aacfcc113e0dd278873a89d60a2ce1c1dd79480c8f697
 EBUILD gost-engine-3.0.0.ebuild 895 BLAKE2B cb9ea973b726205453b328598543655d38446aec3154e3e6237628fed07a758556218d9aee0a8b847f601d63f5f528b1bf8d7586cbe9706905a3d2b567f6b725 SHA512 03fc4a15a44bf6fe6f3fac3c0491ba51c3f71d15478d9a59e3545201ddf6d2334fdd4b7dd197ab36e1372a24b34a6226cb4db1e0dff1226a2df75967a73e8c26
-EBUILD gost-engine-9999.ebuild 895 BLAKE2B d51d424428ac6262094f8c543e1c3a51e98215aa9a4960d06f0e3431c82d90dd35cffcb853215dea36209aa70269e01b14fda10ac268430a22baec2457e883a2 SHA512 213acb55ea3fd6b253e1ca24683be82b17db3b8b639dc07f8f450f4941377380cdd6f68c51a86100c624beeb5424af8934e72a4bb3b274c26b09d2b27b00d8f2
+EBUILD gost-engine-3.0.1.ebuild 895 BLAKE2B 2561f3d5e5ec58012f83e15a3157a616b994a7ea0449fbd9bc9c285a6a33d160aefdf0712895065575e6a87879ef30dcd0e090fb62e3623ac615bddec7a56f68 SHA512 fc9773a01c3d40e9ae796869906e6acfe09839e3636ec5815c72d04e23c0dcab55ea1d6a77c36b474d7cac3e0da6e3ce8964b13518c48d2f3c3df1ad830fbebc
+EBUILD gost-engine-9999.ebuild 895 BLAKE2B 2561f3d5e5ec58012f83e15a3157a616b994a7ea0449fbd9bc9c285a6a33d160aefdf0712895065575e6a87879ef30dcd0e090fb62e3623ac615bddec7a56f68 SHA512 fc9773a01c3d40e9ae796869906e6acfe09839e3636ec5815c72d04e23c0dcab55ea1d6a77c36b474d7cac3e0da6e3ce8964b13518c48d2f3c3df1ad830fbebc
 MISC metadata.xml 342 BLAKE2B 3f19b05411fb2960f8218ebcce89e66eba7baabeac9a4a78ab2b7bea1657a082387ccd6fc50dd4a25f5d21d54be6e0c1cfe51cc9eff91cf426660be1041ef0a4 SHA512 4a73c89be75bf257bada6ff299eb6cb48b53b2b92dc9b9647d7345b699118ad4a2e5cfcbe61fc74dc624f6ab019bb21bffc5e1fa0005f761b6435b2badfcf4c4
diff --git a/dev-libs/gost-engine/gost-engine-3.0.1.ebuild b/dev-libs/gost-engine/gost-engine-3.0.1.ebuild
new file mode 100644
index 000000000000..b9fc8e721abe
--- /dev/null
+++ b/dev-libs/gost-engine/gost-engine-3.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
+HOMEPAGE="https://github.com/gost-engine/engine"
+IUSE="test"
+RESTRICT="!test? ( test )"
+SLOT="0/${PV}"
+
+COMMON_DEPEND=">=dev-libs/openssl-3.0.0:0="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-lang/perl
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+LICENSE="openssl"
+
+DOCS=( INSTALL.md README.gost README.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa"
+	SRC_URI="https://github.com/gost-engine/engine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/engine-${PV}"
+fi
+
+src_prepare() {
+	cmake_src_prepare
+	sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die
+}
diff --git a/dev-libs/gost-engine/gost-engine-9999.ebuild b/dev-libs/gost-engine/gost-engine-9999.ebuild
index fd08e96d4a63..b9fc8e721abe 100644
--- a/dev-libs/gost-engine/gost-engine-9999.ebuild
+++ b/dev-libs/gost-engine/gost-engine-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,7 +11,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 SLOT="0/${PV}"
 
-COMMON_DEPEND=">=dev-libs/openssl-1.1.1:0="
+COMMON_DEPEND=">=dev-libs/openssl-3.0.0:0="
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	test? (
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index e1863e4f5da5..616855a6c5b2 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,5 +1,5 @@
 AUX grantlee-0.3.0-nonfatal-warnings.patch 573 BLAKE2B 1e7ca46d955900e24597666e04b7e6eb60ef5c5bc6e77964721bbed93612bd5024a6935f297f0b888c93c78da71472ac0cc03d842dc04c61e3eafcc7d18b92f3 SHA512 903a1ece31f2ddce273188d29078fbd14fab064eb1a1242569a856b716d85e9a3eab99c348d691cc2b41c83a9e446934629dd211dbebed1e74ca8ab1a24d9ea9
 AUX grantlee-5.2.0-slot.patch 2261 BLAKE2B e84c2899e45b0476b1455c7935af2058167f168c9abbf5c324b7bdf7402fe6b272d57cfdca64c61189f4107f436e333ebd2ee5e3f3235f04e46fbc5d80526cf6 SHA512 fbef42f23ce9f44820215112e0b2f7dcf3f0a6bffcb79939c6693471cc35ad53452792efb269be6699b99a0b3d54318d4dd84a5b89d71d51cd2192b479f5ca7c
 DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040 SHA512 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
-EBUILD grantlee-5.2.0.ebuild 1063 BLAKE2B 1a373f0205d78855c99bad958420440551750181c0d7c90f3adc25cb480fb3b6e75eb28954aee459700781981d987604e333ea184bdf5517671ae9551d68b96e SHA512 0fa242f104edb0bcc2600636206032e9217f1513a66f63d70542315666fa7df0efa1fe6b80954c727044e244379c76f4188b6ac6f50e5dc77d47f0e876a9646a
+EBUILD grantlee-5.2.0.ebuild 1070 BLAKE2B e1c7e4b33661b07c114de7b0c4b2626d029674202651ca83d8e1dc26fa3cde2234218f9580ce145a1f1b650dcfe4b0bed117a39de352b013c1dd43670bf6bd85 SHA512 1556fb717d94328c13f71e4d75d9834b415468dc067a00287d7250d54525ec9032bdf4fb554bcdc86f7feb53cb1bd2a1ec9b4cbc99ed402edb57355e6067362a
 MISC metadata.xml 332 BLAKE2B 655bf07600689b25f75cd8889d468ab092a861c8cd88c604a3d0411916ae29ab1508ebd7e296d0df1f037ab9cfad06b146cc2d0fe5d2d4d590d8a36e2de858ed SHA512 5837c62f635103c8ff77caf457916a32600134cd2d9333dc5389f92fa95fba39af867eac73df99fe59cd0c9a16388c6da890f25397986c8406e844aec66bf66b
diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild b/dev-libs/grantlee/grantlee-5.2.0.ebuild
index e492ed26878c..1a4abea4eeb3 100644
--- a/dev-libs/grantlee/grantlee-5.2.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="debug doc test"
 
 BDEPEND="
diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest
index 624a265c2ef9..34fec870213f 100644
--- a/dev-libs/hidapi/Manifest
+++ b/dev-libs/hidapi/Manifest
@@ -1,6 +1,6 @@
 AUX hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch 300 BLAKE2B f82fe6a6e2ebfda10eb9762bbff1586346ecf8945996599a3b58658c37799d85dc573f8be54bba483f95e27177db3f421d99ac713e7012130d2e2b92252ebd87 SHA512 5b29caa5f7a9b61fffb16226cff9709a5b142c6ac36017c567ab5933b21f06cb17c78a93fa19e8c92cb1443f1cbe97c3687002845965bea2b3ef39eeaef1f4a2
 DIST hidapi-0.11.0.tgz 232631 BLAKE2B 770c0663b007aa36580af217d0d38be72923e0ad84cee137594ca3e174e589cebb9188003a50999e1c561b0e4e9ca68bd1af29029b89fde2b0a46020b12f9744 SHA512 0de4abc963600d159ce231416c468b9e81a8361e4d2c2202988d6eb2e58a923700e9b9be639fbddc6bc14625131848409e2e88dbc4b34a1f8a726c8fa4692d92
 DIST hidapi-0.8.0_rc1_p20140719.tgz 103079 BLAKE2B f40a4c17cb8c5eed41f4eea84fac46a879ec2057f28212aa43c8fd718ceea68d760785cb4f4e2ea3bcd2a4345b65d75d0d278b93697ec61963be9270684a15cb SHA512 204934a707da4e67b834823650b0cfd9be7b413972071129cc5aeeb93465834dde2f5ee23283c55d35b56e3aed8b7ad5fe947399839081f4d895fb65c8cd3e3d
-EBUILD hidapi-0.11.0.ebuild 1418 BLAKE2B 37ed27c4ddf04fe81e7e8eacbf82844560ea5304c1bfbb8880cf0047e36f3d8b4300ae0706b177602dfd098b5cc792d207562ba57ed412b3db2ae45ba8bc942d SHA512 b2a40de6a0434f3e7721d3624ca2df662b657d123691713f089e662689c45fa5d119e31aab52c5606bc14a411692f3c2ca5b2cded6fb446f2a6caaea555af37b
+EBUILD hidapi-0.11.0.ebuild 1416 BLAKE2B a056d28c6d4312162ef59cc237e08c8877c3bea103ac5aa33c22508bc0d758d14cae860b46fc506f24b0ff5d5d6646ffb369a65e3460463b03139c2fc1748401 SHA512 718a4bb76f1913d5153325c63f269b7e6e1a648c71d23b64af872bc2132680ce68abb710ecd47e7b7cf7735c87ae80fda48137afcba43453a57624b7920f939d
 EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1851 BLAKE2B cdaa39c57a17a17720ba075f722339df5b6bdc84fca16e1d8e2eba26c3fdcdb749f40fb773961c40eebf13ad92f50d57fb1d0f01fe1c15c1e6f5b696bdecab09 SHA512 fb003b0a9dd3f64b2e4615bb27af95fa705e48dd62fea56a5b811e5467fd87b37cbfcc8d8be361555825bdc61c68d884bb45a3efe677db5f9dbae01a08d1f7b4
 MISC metadata.xml 571 BLAKE2B 713eb7b09515bf42caa61286df10e947377a5d1c11deb35144caf0c1138da6e740d876070c4e37e8f47d05b46ba4ca5ef8d5873ab884533c8544fd1c86c2ae99 SHA512 46734233740eb28856db7c56381fd0a4cb84c6dd84ee489c00e537a5435eff4c6880b095a7341f73f606929818a88d74e197337bb441378d2705690eac0a10f6
diff --git a/dev-libs/hidapi/hidapi-0.11.0.ebuild b/dev-libs/hidapi/hidapi-0.11.0.ebuild
index 1ed0ca0f94db..60e582d2c1e3 100644
--- a/dev-libs/hidapi/hidapi-0.11.0.ebuild
+++ b/dev-libs/hidapi/hidapi-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libusb/hidapi/archive/${P}.tar.gz -> ${P}.tgz"
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="doc fox"
 
 RDEPEND="
diff --git a/dev-libs/icinga-php-thirdparty/Manifest b/dev-libs/icinga-php-thirdparty/Manifest
index 2d0b37a63f3c..88b9eee436d0 100644
--- a/dev-libs/icinga-php-thirdparty/Manifest
+++ b/dev-libs/icinga-php-thirdparty/Manifest
@@ -1,3 +1,5 @@
 DIST icinga-php-thirdparty-0.10.0.tar.gz 576508 BLAKE2B 3e07262415340c413bf79aa3031cf3679f0374c85dad9c41ffed78f65379837fc87df8433ea201b02455bde5c1fee1406f5b149b9d5b39cd726407657bdafb54 SHA512 3f5b6caad23860cecf5f06d165b01211af5284cb3dcb635bdcf4c2118b03c96de40a6d86cd0bccbe0f817ae87cc5d09aa2709ca90f55b948cf975c69dc234e95
+DIST icinga-php-thirdparty-0.11.0.tar.gz 764914 BLAKE2B b9fbe66252edf5f504feab16392c60f4edf142d3644d13c29ba4f0291df40f8b4e3163f6bb97d944827a8a3d88728b5bf1c05ad193a078f889ba917714746c00 SHA512 5a2b9218a0426de6b560845db36e8e113a8be786eaf4ab57ff4f5e0ef485dc426cb0f203b4b45c3b791adb852098b64f2a0099c9909506594502edb2b4d4ee35
 EBUILD icinga-php-thirdparty-0.10.0-r1.ebuild 496 BLAKE2B c7bdb148c91759b9f53e55bf1faa76662da56555605730ad1fbf9615a873fae162cfdf7011fed5908a630ce15e170b7611a3f140bf311ed03bbfcbd4ed320e81 SHA512 30b1270daeb05524441079671b62976ed457ce9c765d0614f21b2ca3bbbeb01df13c6c8dd1b00e82c6300cda12542f2bf43280f7dcd6f4c03dc1c562d01c052a
+EBUILD icinga-php-thirdparty-0.11.0.ebuild 498 BLAKE2B 7e0e627fb516293a6336361303a98a856091a15057137458f9ff85fc42d0af2f97bde2ac6e040f2dfe74add378aee577147ea925d982d73a4aeb40f7ed81d0b3 SHA512 e345dae50a19c336ce201b2a9076e89f21a1a2b1cba00f54749c1e611054f7fd3632ff90747cb62fc551924a7aedf79a08ebaa72d938a28784651a891e0816ed
 MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.11.0.ebuild b/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.11.0.ebuild
new file mode 100644
index 000000000000..db39b492539b
--- /dev/null
+++ b/dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.11.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Icinga PHP libraries for Icinga Web 2"
+HOMEPAGE="https://github.com/Icinga/icinga-php-thirdparty"
+SRC_URI="https://github.com/Icinga/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-lang/php:*"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+	insinto "/usr/share/icinga-php/vendor"
+	cd "${S}"
+	doins -r *
+}
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 69e2fa8fdf08..34a5a7491e04 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,7 +1,5 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
-DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9f0ba335f071817198238de21fcd77dfe3e86ea1394790e2a3b6d96772d1b98cb7dccd6462a9dd05c0ab7bdef0 SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
 DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
 DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
-EBUILD icu-layoutex-70.1.ebuild 2505 BLAKE2B 3197805d41f024b6cf3aadba1db8b305f6d45af609305f8af4f9fc24154ccc651299b571e37e83f5dbfc4f86cf315443b972139ed87b54856a9af128d7b8830f SHA512 57c95d2a5e2a4b1c5876d5b4becfde3a27ce519a4a6e81db38ea10e8e4423cb4a2b335b153ddd031253713f455b5e09faf6c656ec5ecddc2dcf89a055b961487
-EBUILD icu-layoutex-71.1.ebuild 3444 BLAKE2B 0cca2c97c0dae9b172ebefb2cdb2f0db91c7e8b43bac4a7482591c43313bfed47c7ffa04282f67c7bbdcb9e2e7d061a617ac55646d2904368e6e7d882a33b070 SHA512 be69692c69d6ca047affea7516173b9fe8a004bfe7356325594bdb62fa5d2f1cd0c15eab15fb35294db29c1391d5080d32a10099d3abae861b106e988b3f9fac
+EBUILD icu-layoutex-71.1.ebuild 3582 BLAKE2B 440d45060033cae1471af4cfec6f3443317e3b369fd7d4fbbf272b95c09ae68db809d422b00cf8a8f8f9c5826aa8d286c80d6d631ef68a27e83aee78b6cb7e50 SHA512 d9ec562af9007fa798a148a53c6bf6d5ba4dd8747be2ddaf7014c274c63074f2cd2cfc2966ee90e04a383b92845f056439810d30e2b5bb48c2fa3d4012ccca6c
 MISC metadata.xml 262 BLAKE2B 5f01484e6cd16c1234d97ca24813fe4b74cafdc61d6e3c1ae58ead74558909ef052e406aba4abd7440f8dc45ff6548aaf4a863f0eb46c23e1e389ba52e0c1353 SHA512 3d2f08eb53da96ec680d73c3fad400ac4c2081db37d104647fc53008abef2dd78fab180d6295f850469e0c5da2375b083577a9713ae7701c046eaa24c0115ca2
diff --git a/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
deleted file mode 100644
index b4c96881ba12..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="https://icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" )
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
index d66b5589337f..0a11ebb6f4a1 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN/-layoutex}/source"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -50,7 +50,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# Use C++14
+	# ICU tries to append -std=c++11 without this, so as of 71.1,
+	# despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17,
+	# we still need this.
 	append-cxxflags -std=c++14
 
 	if tc-is-cross-compiler; then
diff --git a/dev-libs/icu-le-hb/Manifest b/dev-libs/icu-le-hb/Manifest
index cb8cd10fcb22..1c316f078706 100644
--- a/dev-libs/icu-le-hb/Manifest
+++ b/dev-libs/icu-le-hb/Manifest
@@ -1,4 +1,4 @@
 AUX icu-le-hb-1.0.3-icu68.patch 1931 BLAKE2B 56bbb65821e575e2c270759f5ddd5107a2e4935295b0320dd6e69d902fb47bb851290d99704c609f82e9efaf35fd7dffe2c52ea0393bfe63abff20930883ea5d SHA512 1e2f8c079b9e1340d857bf09670958894c427eac20a29f564ef1d91b82b3eec7331b79dfc41ce172a95e2ab6678e41a42098e6af0da2af93ac5646415bbea010
 DIST icu-le-hb-1.0.3.tar.gz 39352 BLAKE2B 7cc2e56b6ac334e0f9c259d4f9d0356480c1ae4eb647610ebfb81ee9b1bc0326f1dba68991e2893cc9b029ea53705cc0936cbbf29e74ab4ef336f58f5e8b47ab SHA512 06dff69bc17c39c13bd5bc801dbe09e2dc2f0cdf1acd774fa863e09f4a65820b2f330d4836da6748c077365f685fa74452ec1924785e3191cc2925036803cbb4
 EBUILD icu-le-hb-1.0.3-r1.ebuild 997 BLAKE2B 5d9f3c36873c92979446af89d380011b40ea49e71f445b66be269ab4dc2535c1b62596342ec74178d740a7c0ea0db78fe73322382157896b2ba22f7fcdbb685d SHA512 32227df85699bf34502005e2477b0d569c674bfbfc5747fe405c310dc6afe63c06f249000bcc89d8a9e6a49316bc5bde4e25f85a82aba2e85a52a93b477d8f25
-MISC metadata.xml 465 BLAKE2B f9d9bda0faf14752504929c3bf630344776fd8da5afbe93cdeeafc88ad10d561e681caa3bf5581952bd073499cf76a5dcbc491e276f9750aa738eea61438e5bd SHA512 9c43ff07216289ff8cbbc635abca5c4714cd69e38fc81d17ef48a17b901090606641efb11cb3f336f1732bdac9626d1f8ca5d87ffae33bea6f000c16a6951626
+MISC metadata.xml 347 BLAKE2B 546d769021cbb1aa5c9f7f1c05d2c90297ad28d3af1218e9bd56e0d02cc2561b5ccba7f1cd29cbc72c942e41633671a8efc2e48ef4edf6554e81230f08617b56 SHA512 fa2a772deeb8249f17c85df71f50977ac50aa0fbce4c93cd6982e724bf74e1dd768edb6ec503507daed56d216befae024c2997e0c1d71800071e5d03e991fe6b
diff --git a/dev-libs/icu-le-hb/metadata.xml b/dev-libs/icu-le-hb/metadata.xml
index f0ddb1814491..cdf9518f649c 100644
--- a/dev-libs/icu-le-hb/metadata.xml
+++ b/dev-libs/icu-le-hb/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
   <maintainer type="project">
     <email>office@gentoo.org</email>
     <name>Gentoo Office project</name>
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 7fc24cd7d704..304d2e7b1cf2 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -2,10 +2,8 @@ AUX icu-64.2-darwin.patch 2136 BLAKE2B 3c54a15e351a97f7c423128e493ed158e56191738
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
 AUX icu-69.1-fix-ub-units.patch 866 BLAKE2B 29b849c08bd0ddb19ee03c37f34873819307a0daa53c00724ea27842829acc895a9a9fffd7a0ef03d5629d17f15399be3df7a2f0270dbbf65512dbfc0f41f66e SHA512 d3d72909643ffb2d3f4407d6e9259b661f7ee033bcc8b35a7a771d8c2c6295a7bf1139ad8b6aee14f3a2291d15c3dfbbc847aeeb1fe60c64c4f2dc202e34d88b
-AUX icu-70.1-fix-ucptrietest.patch 1086 BLAKE2B a61919181c015c5f4673ba7ca6513f50e3f6ac3b5a3fc4541ace854cd44b8d77fc4752c91c90c0275647a65b83f56061619726c714296dee7db6906a5f4b7e8d SHA512 57c08fc2fab69050b338f3830581087d69311ae1a622b1b48e7986822219fc728c981b1434c30fa15bd21c528a64672ebf5dcfbedbfb0f8ab401c3d1278dd4a1
-DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9f0ba335f071817198238de21fcd77dfe3e86ea1394790e2a3b6d96772d1b98cb7dccd6462a9dd05c0ab7bdef0 SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
+AUX icu-71.1-CVE-2022-1638.patch 8694 BLAKE2B 2277f0f066609817d0c5ef78f50f33f82c8575152b185a4c79d334a79c38ad902742c9f0558b90a33191d913df46e4b97356c0d7914d5f7bb4451fb388815c97 SHA512 3c6358120247bd094fec7a8e73f51445f979da5eda87c3a272f4df59625e1345237fe924d94824ad6f0785c8c1d70ee2ecb8a54abf9078c6510bee088adda2c8
 DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
 DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
-EBUILD icu-70.1-r1.ebuild 3694 BLAKE2B 3e47d60528a8330807d3238de5c4e55c5179d77b676ead14bbe421289424758199967665ce2236a98636ee252e6245c8184e5535e1aed922043860c3b785c2f2 SHA512 9abfec28beb93afa6a7faf3eb55ab7e4c2492c1e433e12b8d7bf8b65fbb89478fc18f5dd732245d932009f070aec70321800bbe0649570e6dbbc1fd970352cc6
-EBUILD icu-71.1.ebuild 3978 BLAKE2B 3479146402150877b37c0f55f0fae978caf01640ecf51ce836b2acc362c765f110a7f7721c6882fa17134dcab8b54ddb4b20d7f5f45a7d3c7b0dab5ea4b5f3e3 SHA512 c43a937b6daeb90a365039abb9946800eeae1626321983e22cca0ec9b3dee5a2078a666323422550a73c33b164af25b11dc29002502a4b040c8b304acbae1694
+EBUILD icu-71.1-r1.ebuild 4179 BLAKE2B 3eb72b51387207e69956ce24faeb478b88a5fe7e2b01aa684d98bccece6e033dbdac9caf7690b67ec4a0dc19bd6185b4b4dd72ccbf8c9c9e725a0fad6d184924 SHA512 4afe643f51da7ee92b3794eb35f39f9c3d84d8486bfbce624daaa9b7448cdf5fb20943ab6ee130ab47dfef84cb4b5a2839fc4fa12bdd99ed8d369eb2a0827b72
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch b/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch
deleted file mode 100644
index 05d390a1284a..000000000000
--- a/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Fixes test failure on arm.
-
-https://github.com/unicode-org/icu/pull/1925
-https://unicode-org.atlassian.net/browse/ICU-21793
-
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
-Date: Wed, 3 Nov 2021 02:31:18 +0100
-Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff
-
---- a/tools/toolutil/toolutil.cpp
-+++ b/tools/toolutil/toolutil.cpp
-@@ -228,18 +228,19 @@ uprv_compareGoldenFiles(
-     std::ifstream ifs(goldenFilePath, std::ifstream::in);
-     int32_t pos = 0;
-     char c;
--    while ((c = ifs.get()) != std::char_traits<char>::eof() && pos < bufferLen) {
-+    while (ifs.get(c) && pos < bufferLen) {
-         if (c != buffer[pos]) {
-             // Files differ at this position
--            return pos;
-+            break;
-         }
-         pos++;
-     }
--    if (pos < bufferLen || c != std::char_traits<char>::eof()) {
--        // Files are different lengths
--        return pos;
-+    if (pos == bufferLen && ifs.eof()) {
-+        // Files are same lengths
-+        pos = -1;
-     }
--    return -1;
-+    ifs.close();
-+    return pos;
- }
-
- /*U_CAPI UDate U_EXPORT2
-
diff --git a/dev-libs/icu/files/icu-71.1-CVE-2022-1638.patch b/dev-libs/icu/files/icu-71.1-CVE-2022-1638.patch
new file mode 100644
index 000000000000..216ed7894473
--- /dev/null
+++ b/dev-libs/icu/files/icu-71.1-CVE-2022-1638.patch
@@ -0,0 +1,202 @@
+From e96e9410bde06962c211fa6f21c3d91263a90f86 Mon Sep 17 00:00:00 2001
+From: Frank Tang <ftang@chromium.org>
+Date: Fri, 29 Apr 2022 22:50:33 +0000
+Subject: [PATCH] ICU-22005 Fix int32 overflow in FormattedStringBuilder
+
+See #2070
+---
+ .../i18n/formatted_string_builder.cpp  | 55 +++++++++++++------
+ .../formatted_string_builder_test.cpp         | 41 ++++++++++++++
+ 2 files changed, 79 insertions(+), 17 deletions(-)
+
+diff --git a/i18n/formatted_string_builder.cpp b/i18n/formatted_string_builder.cpp
+index 734078644b8..628fbea8711 100644
+--- a/i18n/formatted_string_builder.cpp
++++ b/i18n/formatted_string_builder.cpp
+@@ -6,6 +6,7 @@
+ #if !UCONFIG_NO_FORMATTING
+ 
+ #include "formatted_string_builder.h"
++#include "putilimp.h"
+ #include "unicode/ustring.h"
+ #include "unicode/utf16.h"
+ #include "unicode/unum.h" // for UNumberFormatFields literals
+@@ -197,6 +198,9 @@ FormattedStringBuilder::splice(int32_t startThis, int32_t endThis,  const Unicod
+     int32_t thisLength = endThis - startThis;
+     int32_t otherLength = endOther - startOther;
+     int32_t count = otherLength - thisLength;
++    if (U_FAILURE(status)) {
++        return count;
++    }
+     int32_t position;
+     if (count > 0) {
+         // Overall, chars need to be added.
+@@ -221,6 +225,9 @@ int32_t FormattedStringBuilder::append(const FormattedStringBuilder &other, UErr
+ 
+ int32_t
+ FormattedStringBuilder::insert(int32_t index, const FormattedStringBuilder &other, UErrorCode &status) {
++    if (U_FAILURE(status)) {
++        return 0;
++    }
+     if (this == &other) {
+         status = U_ILLEGAL_ARGUMENT_ERROR;
+         return 0;
+@@ -255,12 +262,18 @@ int32_t FormattedStringBuilder::prepareForInsert(int32_t index, int32_t count, U
+     U_ASSERT(index >= 0);
+     U_ASSERT(index <= fLength);
+     U_ASSERT(count >= 0);
++    U_ASSERT(fZero >= 0);
++    U_ASSERT(fLength >= 0);
++    U_ASSERT(getCapacity() - fZero >= fLength);
++    if (U_FAILURE(status)) {
++        return count;
++    }
+     if (index == 0 && fZero - count >= 0) {
+         // Append to start
+         fZero -= count;
+         fLength += count;
+         return fZero;
+-    } else if (index == fLength && fZero + fLength + count < getCapacity()) {
++    } else if (index == fLength && count <= getCapacity() - fZero - fLength) {
+         // Append to end
+         fLength += count;
+         return fZero + fLength - count;
+@@ -275,18 +288,26 @@ int32_t FormattedStringBuilder::prepareForInsertHelper(int32_t index, int32_t co
+     int32_t oldZero = fZero;
+     char16_t *oldChars = getCharPtr();
+     Field *oldFields = getFieldPtr();
+-    if (fLength + count > oldCapacity) {
+-        if ((fLength + count) > INT32_MAX / 2) {
+-            // If we continue, then newCapacity will overflow int32_t in the next line.
++    int32_t newLength;
++    if (uprv_add32_overflow(fLength, count, &newLength)) {
++        status = U_INPUT_TOO_LONG_ERROR;
++        return -1;
++    }
++    int32_t newZero;
++    if (newLength > oldCapacity) {
++        if (newLength > INT32_MAX / 2) {
++            // We do not support more than 1G char16_t in this code because
++            // dealing with >2G *bytes* can cause subtle bugs.
+             status = U_INPUT_TOO_LONG_ERROR;
+             return -1;
+         }
+-        int32_t newCapacity = (fLength + count) * 2;
+-        int32_t newZero = newCapacity / 2 - (fLength + count) / 2;
++        // Keep newCapacity also to at most 1G char16_t.
++        int32_t newCapacity = newLength * 2;
++        newZero = (newCapacity - newLength) / 2;
+ 
+         // C++ note: malloc appears in two places: here and in the assignment operator.
+-        auto newChars = static_cast<char16_t *> (uprv_malloc(sizeof(char16_t) * newCapacity));
+-        auto newFields = static_cast<Field *>(uprv_malloc(sizeof(Field) * newCapacity));
++        auto newChars = static_cast<char16_t *> (uprv_malloc(sizeof(char16_t) * static_cast<size_t>(newCapacity)));
++        auto newFields = static_cast<Field *>(uprv_malloc(sizeof(Field) * static_cast<size_t>(newCapacity)));
+         if (newChars == nullptr || newFields == nullptr) {
+             uprv_free(newChars);
+             uprv_free(newFields);
+@@ -315,10 +336,8 @@ int32_t FormattedStringBuilder::prepareForInsertHelper(int32_t index, int32_t co
+         fChars.heap.capacity = newCapacity;
+         fFields.heap.ptr = newFields;
+         fFields.heap.capacity = newCapacity;
+-        fZero = newZero;
+-        fLength += count;
+     } else {
+-        int32_t newZero = oldCapacity / 2 - (fLength + count) / 2;
++        newZero = (oldCapacity - newLength) / 2;
+ 
+         // C++ note: memmove is required because src and dest may overlap.
+         // First copy the entire string to the location of the prefix, and then move the suffix
+@@ -331,18 +350,20 @@ int32_t FormattedStringBuilder::prepareForInsertHelper(int32_t index, int32_t co
+         uprv_memmove2(oldFields + newZero + index + count,
+                 oldFields + newZero + index,
+                 sizeof(Field) * (fLength - index));
+-
+-        fZero = newZero;
+-        fLength += count;
+     }
+-    U_ASSERT((fZero + index) >= 0);
++    fZero = newZero;
++    fLength = newLength;
+     return fZero + index;
+ }
+ 
+ int32_t FormattedStringBuilder::remove(int32_t index, int32_t count) {
+-    // TODO: Reset the heap here?  (If the string after removal can fit on stack?)
++     U_ASSERT(0 <= index);
++     U_ASSERT(index <= fLength);
++     U_ASSERT(count <= (fLength - index));
++     U_ASSERT(index <= getCapacity() - fZero);
++
+     int32_t position = index + fZero;
+-    U_ASSERT(position >= 0);
++    // TODO: Reset the heap here?  (If the string after removal can fit on stack?)
+     uprv_memmove2(getCharPtr() + position,
+             getCharPtr() + position + count,
+             sizeof(char16_t) * (fLength - index - count));
+diff --git a/test/intltest/formatted_string_builder_test.cpp b/test/intltest/formatted_string_builder_test.cpp
+index 45721a320ac..57294e24856 100644
+--- a/test/intltest/formatted_string_builder_test.cpp
++++ b/test/intltest/formatted_string_builder_test.cpp
+@@ -22,6 +22,7 @@ class FormattedStringBuilderTest : public IntlTest {
+     void testFields();
+     void testUnlimitedCapacity();
+     void testCodePoints();
++    void testInsertOverflow();
+ 
+     void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par = 0) override;
+ 
+@@ -50,6 +51,7 @@ void FormattedStringBuilderTest::runIndexedTest(int32_t index, UBool exec, const
+         TESTCASE_AUTO(testFields);
+         TESTCASE_AUTO(testUnlimitedCapacity);
+         TESTCASE_AUTO(testCodePoints);
++        TESTCASE_AUTO(testInsertOverflow);
+     TESTCASE_AUTO_END;
+ }
+ 
+@@ -308,6 +310,45 @@ void FormattedStringBuilderTest::testCodePoints() {
+     assertEquals("Code point count is 2", 2, nsb.codePointCount());
+ }
+ 
++void FormattedStringBuilderTest::testInsertOverflow() {
++    if (quick) return;
++    // Setup the test fixture in sb, sb2, ustr.
++    UErrorCode status = U_ZERO_ERROR;
++    FormattedStringBuilder sb;
++    int32_t data_length = INT32_MAX / 2;
++    UnicodeString ustr(data_length, u'a', data_length);
++    sb.append(ustr, kUndefinedField, status);
++    assertSuccess("Setup the first FormattedStringBuilder", status);
++
++    FormattedStringBuilder sb2;
++    sb2.append(ustr, kUndefinedField, status);
++    sb2.insert(0, ustr, 0, data_length / 2, kUndefinedField, status);
++    sb2.writeTerminator(status);
++    assertSuccess("Setup the second FormattedStringBuilder", status);
++
++    ustr = sb2.toUnicodeString();
++    // Complete setting up the test fixture in sb, sb2 and ustr.
++
++    // Test splice() of the second UnicodeString
++    sb.splice(0, 1, ustr, 1, ustr.length(),
++              kUndefinedField, status);
++    assertEquals(
++        "splice() long text should not crash but return U_INPUT_TOO_LONG_ERROR",
++        U_INPUT_TOO_LONG_ERROR, status);
++
++    // Test sb.insert() of the first FormattedStringBuilder with the second one.
++    sb.insert(0, sb2, status);
++    assertEquals(
++        "insert() long FormattedStringBuilder should not crash but return "
++        "U_INPUT_TOO_LONG_ERROR", U_INPUT_TOO_LONG_ERROR, status);
++
++    // Test sb.insert() of the first FormattedStringBuilder with UnicodeString.
++    sb.insert(0, ustr, 0, ustr.length(), kUndefinedField, status);
++    assertEquals(
++        "insert() long UnicodeString should not crash but return "
++        "U_INPUT_TOO_LONG_ERROR", U_INPUT_TOO_LONG_ERROR, status);
++}
++
+ void FormattedStringBuilderTest::assertEqualsImpl(const UnicodeString &a, const FormattedStringBuilder &b) {
+     // TODO: Why won't this compile without the IntlTest:: qualifier?
+     IntlTest::assertEquals("Lengths should be the same", a.length(), b.length());
diff --git a/dev-libs/icu/icu-70.1-r1.ebuild b/dev-libs/icu/icu-70.1-r1.ebuild
deleted file mode 100644
index 50dada47fc08..000000000000
--- a/dev-libs/icu/icu-70.1-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="https://icu.unicode.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-S="${WORKDIR}/${PN}/source"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
-	# Should both be in the next release, but check
-	# https://bugs.gentoo.org/788112
-	"${FILESDIR}/${PN}-69.1-fix-ub-units.patch"
-	"${FILESDIR}/${PN}-70.1-fix-ucptrietest.patch"
-)
-
-src_prepare() {
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# work around cross-endian testing failures with LTO #757681
-	if tc-is-cross-compiler && is-flagq '-flto*' ; then
-		myeconfargs+=( --disable-strict )
-	fi
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	local HTML_DOCS=( ../readme.html )
-	einstalldocs
-}
diff --git a/dev-libs/icu/icu-71.1.ebuild b/dev-libs/icu/icu-71.1-r1.ebuild
index b12402f07a43..87911072ee9c 100644
--- a/dev-libs/icu/icu-71.1.ebuild
+++ b/dev-libs/icu/icu-71.1-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}/source"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
 	"${FILESDIR}/${PN}-64.2-darwin.patch"
 	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
+	"${FILESDIR}/${P}-CVE-2022-1638.patch" # bug 843731
 )
 
 src_prepare() {
@@ -61,6 +62,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# ICU tries to append -std=c++11 without this, so as of 71.1,
+	# despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17,
+	# we still need this.
 	append-cxxflags -std=c++14
 
 	if tc-is-cross-compiler; then
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index cb54ddf5a332..685aaf5ab415 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -3,5 +3,5 @@ DIST imath-3.1.4.tar.gz 572214 BLAKE2B 6d67f542256e44f9ba6f30ae7d22a37dbf3cd1e49
 DIST imath-3.1.5.tar.gz 570875 BLAKE2B f78c8278a3ecb40afaa291b74c50c2ce01a5cba594e690041a57cfd3a65f9fe0842a41d600906ed864df239c2753488dedca53bdfa65a90c13513111a8068ca4 SHA512 8344e42c75d8e4bb21facb837535f0c9e4a9489d9edebcc25d5d3c6063535f2bf54e4517d8fca3fedada248457aa07c9bd77d6e843a9d115278fc154de2cdc9d
 EBUILD imath-3.1.4-r3.ebuild 1793 BLAKE2B 64fd0eeeaae148a21d7f58e2df9c7adbc84068534c08a0a23a232075abd298eca9b1b378f0c69077044361685cdfe4b931e2f80a1ef90e94c5b5e14fea2a8b59 SHA512 6e4c9e4ac06c85db01969131c49f76aa93e59ca8358f61c422407e4dab3a5fd4f4bbf7efa2fb22f0f931d4fb8d47cdbd2fe4d509535dac63feea4fbc9007831c
 EBUILD imath-3.1.4-r4.ebuild 1877 BLAKE2B 2c4fd6c647157f06445b0f2c9547bcd7ad90ad019d0112163f9e263aaf012a5f3a6dd06b7568cad764bf9c15b8bfdebe1fa26b292744752057b695be02027a50 SHA512 efff61f4b210287e5b9ce128183d45a54fa145e90815258d8a2d40b7302c0dc5d6215ca5d674d16b6d4f906d4ae80329df881693db791551081dcf5c3fb8bf32
-EBUILD imath-3.1.5.ebuild 1794 BLAKE2B 6a4c83fc043c710ce41f13b495a822f8801c0d8f193ef749ef82797108218095782edd5a8e746318796609cd844130e6474cb26015c1b0a74878e583552c389c SHA512 2de9436cfce07f37d64157f9febc3cd7f6b4260698aa31c5eb6a8c9b388cde02a35f3f3a64c6064e214f6a8bfe3b8b9d45343614d26adae4e9ee6a43680a2ce6
+EBUILD imath-3.1.5.ebuild 1801 BLAKE2B 46e05a83632d5fdb9c334bc1a60e4797dfe9b49fffef767c43fa71951a14535fee0450e2774ab1b1bbea8f99c53bf3ec9a5a0b8c61656d2df2e52eb494c53c0f SHA512 c28a8c8d3d85e920da76dbcfeccb089be000189361875f89927a788e4d523e6e31f1be8879ac5a81f376f7f95988d113aecd203ca28e981704723adb8048fdab
 MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4
diff --git a/dev-libs/imath/imath-3.1.5.ebuild b/dev-libs/imath/imath-3.1.5.ebuild
index 4974007e364c..f7a6390f3b93 100644
--- a/dev-libs/imath/imath-3.1.5.ebuild
+++ b/dev-libs/imath/imath-3.1.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 9e8d785e6325..6735b4f9ac9c 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD inih-55.ebuild 766 BLAKE2B f663eafa557bc2eebfa3a1186d93a198e4d8bd371c8de89c1cf817335105cee5cdb626e5c4323e048d8b4d1d48581f5566469272f7d701f1958c431a9fa1581c SHA512 bafcd6430cb49eac80e2a068f5f6327920040318a2577728db8ca8d345de683f3671fd68c600d69939f8fd76e444812968effdf8212eb167acb10332eb3079ac
 MISC metadata.xml 520 BLAKE2B d067b0d423cb2ecdeee888a8b6588c1ee3a47d9080a83d0288736fd31d2521956e6dfb970d612ca27f3c9da8103f37e3dd3245eba9b57f9a1ce4d8631695da14 SHA512 47fafee9e35a1827b8d68ab35fea44e8895658dbdd77628f03d31160bbeb915e2cdad81a17c0530d3b0de713fd141999949992feb4c98fabf2ed9bcf717e6b1f
diff --git a/dev-libs/inih/inih-53.ebuild b/dev-libs/inih/inih-53.ebuild
deleted file mode 100644
index 0c65d26f1690..000000000000
--- a/dev-libs/inih/inih-53.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="static-libs"
-
-S="${WORKDIR}/inih-r${PV}"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		-Ddistro_install=true
-		-Dwith_INIReader=true
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	local DOCS=(
-		LICENSE.txt
-		README.md
-	)
-	einstalldocs
-}
diff --git a/dev-libs/inih/inih-55.ebuild b/dev-libs/inih/inih-55.ebuild
index aaed5ec77fd5..8f9886c0171b 100644
--- a/dev-libs/inih/inih-55.ebuild
+++ b/dev-libs/inih/inih-55.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 S="${WORKDIR}/inih-r${PV}"
 
 LICENSE="BSD"
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index bf12e6c7b9a0..a0da22aba31e 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,9 +1,12 @@
-DIST intel-compute-runtime-22.13.22789.tar.gz 5252140 BLAKE2B 81fe85e75b1f6257771950dd2716e48f8db61dbe62f747c13ed00be7385c9e6a2f2cd2a5d50cf4253962d13bd1fdb4449a5e646fe3a8b10af228f746b9880210 SHA512 e4d22d8f73463300424b2df9a9634f0b5ac341131de33e57d46ffd52ce0b3fbdbf62cf591876d2143ca14caeba42ec95f5aef201eb9895e5d36b2279b15e661c
-DIST intel-compute-runtime-22.16.22992.tar.gz 5334525 BLAKE2B e2fd74084cddc8163eff46cf267c33206c240b8e7c513d2408dabcc0290182fcb5ce7a8909dca93cbb6fd95c2130448498845602590ff59487508b7adcb2bd65 SHA512 7a133a97f437dfe62559097e41583db60e54af6937cfcb3613f4c54340919a0ee0136cfcea1fb6005341021a9bb139c40be8d237afa2a246accd0af1a20dd297
-DIST intel-compute-runtime-22.17.23034.tar.gz 5345890 BLAKE2B 0cd4b9c117978c9127ff1b9e985ab097e672b228a0bba39ad868881af94e821683afb45f394951776f0ecb725872a4624b35be50e2022fec06b1d77d58227fc9 SHA512 d34a63263f073c8fe6d61f105b753468d856de965b605c54ae4e8931bcb81293378f501b796cf84938857f7e08288f4650299cd76d56483f552846fc4b93b2b9
-DIST intel-compute-runtime-22.18.23063.tar.gz 5355944 BLAKE2B ee4d79370c10f2aa1fcd0209a1403a89da1ff5a21dd8b39fb40ac33416b1adaef08713382ee89ad88e64b74d5edcb02e3877898e2301b5454a14b8910ebde009 SHA512 a94a3a7c331ea8bb059740ffaec6e139c17216be23c86cc9e880d247ff12dcb93357ee90b9863b9ddcea59dc1a3d377b32600675a145c29f12c810c13a9e3a61
-EBUILD intel-compute-runtime-22.13.22789-r2.ebuild 1747 BLAKE2B 1f4eae591c1398e1efa0a671cfde34712d7c6adf51a63ae967fa96392a2697476c3eb26ad3576d0dd77dd649956eee03f9b1c309204325ef3da2195c878031c9 SHA512 d881aad689d8300586aac590ccfb3093ec060e109cd3efe546db39d257be2312a0a7df9def2248329c2897912668b18af8312f425349287e68abe9eb65690efc
-EBUILD intel-compute-runtime-22.16.22992-r2.ebuild 1748 BLAKE2B 1a1073dd4af801ada3fb4112e52bfc77f2ad576e1500c13b27b83ad513e4d2f8d626bf2e478d8232ea09d56a8e0433097d494445fa32ff4dfff0776ce6d4cd45 SHA512 b3600ca8963b6d0bcfe55dd312bd776d932f68c0d3fc6a9efe1533a2f9f9cbef8d923fb311a09f1c082fc89e2abccf667124a798b32db7ebdc43652765c44239
-EBUILD intel-compute-runtime-22.17.23034.ebuild 1776 BLAKE2B d2109900d72ed93c553a8c29b1141329d0411dbe58f6c7d5cd0e1a7da5eb71be142ae74d5fad20a9cbdc74aa57aeff5e0526cc1a6e890df2319f37cc38de6627 SHA512 89895e7dde54e3471cc67d264d5823c0d96b1dbcbd94d0319495ee7fe1439e3772f42f9078fb5f9f418ae1a8a123606a2619c265c2f3f817c11b1d7530c97ac9
-EBUILD intel-compute-runtime-22.18.23063.ebuild 1903 BLAKE2B 56af3b2e462391efc8ce1316ac7d38241f29f3ce1e876970a98592fa38bc82249b06f9267288742f468aea137a33f989bf66e933ef642732818253986a96b696 SHA512 881f88fc730234977c6a6ff45594893248b364f4272644db289d1e55cabad6c8dc7fcff3be42d8edfb61f891569b1818049c81e77aebc902756b9ce53518d1e4
+AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
+DIST intel-compute-runtime-22.21.23269.tar.gz 5475347 BLAKE2B dbac36c1720ee2a2475b64c3b61d144501fa4031ceb0eb69a3313cb78b5588926d029ad1916e2229fb8dea8d3450936da5b4e25b47814c854b05ec0bdb940943 SHA512 9ae38956dbff9764d85b5447cc03f7616319de463ddbf0dc5d4c8e8f8869f197b6045e446c81a902d8a5e7681e05cb5ac63e345b6bdcb74366b83619c52eb012
+DIST intel-compute-runtime-22.22.23355.tar.gz 5498680 BLAKE2B 81368ca9a5151305a5eb656ecca6a8d51129df2f567631d72fc5965c66b367e843bcf7b89a201702aa78e430d60e706079eba48a11cfd2b6a82e7a34d7ac5789 SHA512 72813ebd5de38d31f9ceb8087c38337d1bd0bb35256b86f3f3d7f3adc5ebe73b3cdc04bf653a522e25098b38c3b867f62fc3590eedf17e11d2fc03c2aa2b22e2
+DIST intel-compute-runtime-22.23.23405.tar.gz 5515173 BLAKE2B eafb5a4ed8a221bc5290576a137f371f2f9d3cebbe1e689f3d1ce41f9430a5242d82ae78799f523f29685c3a731570e4a6766f804faa0f6bb7bae365cb5d6573 SHA512 38ffadd9130717acb0e8d6492b2bb4d8d5c962b151784a92c85d6249cbab1014dcd418bf5110eccc1640334c1ab0d171b7028d2f0d95d606733b42a319bf2f0b
+DIST intel-compute-runtime-22.24.23453.tar.gz 5521386 BLAKE2B c025539c0d2a0ac492ddc5893c0d077523bbc0c0e1dcdb3d086ff381b36f26d0a7b24aecb0ba04e915e443eafecbaf171ef54fc0c455e57b0ae622ef164f4056 SHA512 fb57348ef4cad48b7d09bf8db64a874a63bdbbd586323c25b7c9cf7461bfd62c1cd061c4b989c52466e5d364fde9dec2335bf7e244baadd573888ba904ba867c
+DIST intel-compute-runtime-22.25.23529.tar.gz 5542277 BLAKE2B da718987fd3f3239b6cfc60914f02cc67b7174cb92f3a12e5d8f78b39631892b1c69368eb89590c3a7dfc9e930eb8254ec33c43028073cffac06bd3f718164bb SHA512 5ad80357a27cba76b95099ce5a0edc5271d7328769d6e84039fa94f94be99f02cf4890ee05702db18e28beba6fadea46aa2f0eb236ed8c27cb95bee075f2f6d6
+EBUILD intel-compute-runtime-22.21.23269.ebuild 1904 BLAKE2B 5ae9938b50ead43d244d4f3ea2bad42d595da7b8e60c4f817a80abb562bed48336ff7fc0135e82ad3e1eab3367234fc10782473de618e49a627bf771f80ccd1b SHA512 a885b8a43eae56cd9d980e9b576ba9f64c463ea71e87223d18c88721288623e8d35405b820c0f9bb15d539f03cf616fa01e3b33aa81605991f904079434c5d18
+EBUILD intel-compute-runtime-22.22.23355.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
+EBUILD intel-compute-runtime-22.23.23405.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
+EBUILD intel-compute-runtime-22.24.23453.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
+EBUILD intel-compute-runtime-22.25.23529.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch
new file mode 100644
index 000000000000..dc0ab96dde0c
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch
@@ -0,0 +1,20 @@
+diff --git a/compute-runtime-22.24.23453/CMakeLists.txt b/compute-runtime-22.24.23453/CMakeLists.txt
+index f227808..83075f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -702,7 +702,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+   else()
+     if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
+     else()
+       # gcc, g++ only
+@@ -711,7 +710,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+       else()
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+       endif()
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
+       set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,noexecstack")
+       set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,relro")
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789-r2.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
index 783bebea072d..0bbb025dbde7 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789-r2.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
@@ -23,10 +23,10 @@ RDEPEND=">=media-libs/gmmlib-22.0.2:="
 
 DEPEND="
 	${DEPEND}
-	dev-libs/intel-metrics-library
+	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-compiler-1.0.11061-r1
 	>=dev-util/intel-graphics-system-controller-0.2.4:=
 	media-libs/mesa
 	>=virtual/opencl-3
@@ -41,11 +41,21 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "README.md" "FAQ.md" )
 
+src_prepare() {
+	default
+
+	# Remove '-Werror' from default
+	set -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	# See https://github.com/intel/compute-runtime/issues/531
 	filter-flags -flto=* -flto
 
 	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
 		-DBUILD_WITH_L0="$(usex l0)"
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.18.23063.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
index da3d3664772f..bdc8a84baf08 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.18.23063.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=media-libs/gmmlib-22.0.2:="
 
 DEPEND="
 	${DEPEND}
-	dev-libs/intel-metrics-library
+	dev-libs/intel-metrics-library:=
 	dev-libs/libnl:3
 	dev-libs/libxml2:2
 	>=dev-util/intel-graphics-compiler-1.0.11061-r1
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.17.23034.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild
index ff30036f8e54..bdc8a84baf08 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.17.23034.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=media-libs/gmmlib-22.0.2:="
 
 DEPEND="
 	${DEPEND}
-	dev-libs/intel-metrics-library
+	dev-libs/intel-metrics-library:=
 	dev-libs/libnl:3
 	dev-libs/libxml2:2
 	>=dev-util/intel-graphics-compiler-1.0.11061-r1
@@ -41,6 +41,15 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "README.md" "FAQ.md" )
 
+src_prepare() {
+	default
+
+	# Remove '-Werror' from default
+	set -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	# See https://github.com/intel/compute-runtime/issues/531
 	filter-flags -flto=* -flto
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.16.22992-r2.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
index f83c1f978986..077189e165cf 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.16.22992-r2.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
@@ -23,10 +23,10 @@ RDEPEND=">=media-libs/gmmlib-22.0.2:="
 
 DEPEND="
 	${DEPEND}
-	dev-libs/intel-metrics-library
+	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-compiler-1.0.11061-r1
 	>=dev-util/intel-graphics-system-controller-0.2.4:=
 	media-libs/mesa
 	>=virtual/opencl-3
@@ -41,11 +41,21 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "README.md" "FAQ.md" )
 
+PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" )
+
+src_prepare() {
+	# Remove '-Werror' from default
+	sed -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	# See https://github.com/intel/compute-runtime/issues/531
 	filter-flags -flto=* -flto
 
 	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
 		-DBUILD_WITH_L0="$(usex l0)"
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild
new file mode 100644
index 000000000000..077189e165cf
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild
@@ -0,0 +1,79 @@
+# 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 flag-o-matic
+
+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.11061-r1
+	>=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.24.23453-remove-fortify-sources.patch" )
+
+src_prepare() {
+	# Remove '-Werror' from default
+	sed -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# See https://github.com/intel/compute-runtime/issues/531
+	filter-flags -flto=* -flto
+
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-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"
+		-Wno-dev
+
+		# 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"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index c1a005631bd1..9c1897bde21a 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,3 +1,3 @@
-DIST intel-metrics-library-0_pre20211123.tar.gz 227022 BLAKE2B c718c5972ae1cb8d36c65f541832a36c7107af1299c2cd4101df1180325a97fca5ca2066574ee0bbc31eaac35286c27a00b2c292058453b5fcf41d745585a0ad SHA512 e54d68c5b31c59258086f89d56ea819ed4a680901d65862361dd17e172be7806cf21be9999d907a0f59fe8c3295cab541402dc0f7c41a944f4aee1481356c2a9
-EBUILD intel-metrics-library-0_pre20211123-r1.ebuild 619 BLAKE2B 20781a2adca8b83798084e7b99ede7ab7fc7b333a16011c107986745bd6b32a7121251db96f9d166709de2083452fb0e9c2586f56977e7a2edb6b3c6679ccf1c SHA512 46a077bd83f5c4985609afd3eafe26076150208efec41690d0485ea3077d882a8c386bc4d8763f05c885b7f9766d5e2f48e9d11d13710d904c946b7594be6ea6
+DIST intel-metrics-library-0_pre20220512.tar.gz 252101 BLAKE2B 32078b86a878a2650a812bc5a0d75f423e7fc05505e5ef2f9fbe6676126a78a67af4abe27451df323ea2699d363bcb7a7666d8b642214f36ecbea81b18f5b611 SHA512 3b05f6ea17b50b8357a579e4cc39ca6b920aa47d0b6bb9ca86b773c5ecf1532fd630ee738ff2f0c263d8ced4084023f7696ce848b0ecdb5aff00e6d8f393fa4f
+EBUILD intel-metrics-library-0_pre20220512.ebuild 619 BLAKE2B 4abc1966e3c3119caf6064412611b464c0bd064492c34c682fe15f221b0f1a928adafe17d7ef11ebfdaa21349745467fc51e7cb8e2ca5eec44bc7add0cefa9ee SHA512 bf75afb6f98545980a1446a86bb511feb32a572cfef84292436dc145f11bd1261707c2910e7dd0c4e57e26499b258ec7bd4ad0675f05d67ec77383da823a9210
 MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123-r1.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild
index e94b6050162d..11cb3589d4fc 100644
--- a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123-r1.ebuild
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_BUILD_TYPE="Release"
-EGIT_COMMIT="3fd6eb0544fadcec2ac762aedee7c2d5d6479feb"
+EGIT_COMMIT="7d97bb29c4db1d79702402f8331d9be371a87f83"
 MY_PN="${PN/intel-/}"
 MY_P="${MY_PN}-${PV}"
 
diff --git a/dev-libs/intel-vc-intrinsics/Manifest b/dev-libs/intel-vc-intrinsics/Manifest
index b0913b31ad6c..cc0ffadc6060 100644
--- a/dev-libs/intel-vc-intrinsics/Manifest
+++ b/dev-libs/intel-vc-intrinsics/Manifest
@@ -1,7 +1,9 @@
 DIST intel-vc-intrinsics-0.1.0.tar.gz 135780 BLAKE2B cb7c84c14a1fb9655e59ad559e24b3d1072f88390bc2b29ea614217049225dc371395849a7af81607a098a42228a249bdfa09fa72874eee4e20a78a0c4371087 SHA512 683c012900acfe331f29c4e88c0a0b0a4e5d84b146faed56757a70d5f9a94678a03c18bd46e269606761e0da4cad5b31f12cb50101d5f810044615971d2b5b9f
 DIST intel-vc-intrinsics-0.2.0.tar.gz 135891 BLAKE2B 6118dbc43ca8e3363384f3ea6442480cd353758233f144717888e4c61f5d02ffe97be6f2936f74564da9aacc662e832be6f2371d86472a131232e2abd490c1cb SHA512 1a1b34a5a030141825c906a321b39da32b2cc989f1f3ad034881f4c5c55f27e7e63be7d5db264ba1b1249b589d7eee679061a9704ece610b4f29bdb88f0f19d5
 DIST intel-vc-intrinsics-0.3.0.tar.gz 136326 BLAKE2B 8f0c5a43638aff227cccf381b88e9f9cdd7e151b133c221487686419eab6d5e1b15e605da51b12f9366da3ae12bfee87bc3421c415f3b7265eea7d9905df5a13 SHA512 881cd3c4bfbe3483878cee62990f1765713cddddbe279a263cc91f60e3f27545cfbbc49addf2f8d9ffe6db4dda057110ce2ae0ac39251bc5d0d3c17676a21493
-EBUILD intel-vc-intrinsics-0.1.0.ebuild 796 BLAKE2B 7aca53f0e4960198eea5c422fa1bc7c8fd55bf2ef66931f9e066b56a5757f9846db117df2c4694edf2452dd9a95b7db2ec5cdebadbda39c6249e0008fd300e4a SHA512 48767ec47155bd35ee1d9c3c4faa4ca18be7cb2364daa41312699aaccd7af949cd337e8e4dc22ccc3c0d2a530fc28a5f15014de38e597e37951ff985606c4497
-EBUILD intel-vc-intrinsics-0.2.0.ebuild 796 BLAKE2B 7aca53f0e4960198eea5c422fa1bc7c8fd55bf2ef66931f9e066b56a5757f9846db117df2c4694edf2452dd9a95b7db2ec5cdebadbda39c6249e0008fd300e4a SHA512 48767ec47155bd35ee1d9c3c4faa4ca18be7cb2364daa41312699aaccd7af949cd337e8e4dc22ccc3c0d2a530fc28a5f15014de38e597e37951ff985606c4497
-EBUILD intel-vc-intrinsics-0.3.0.ebuild 796 BLAKE2B 7aca53f0e4960198eea5c422fa1bc7c8fd55bf2ef66931f9e066b56a5757f9846db117df2c4694edf2452dd9a95b7db2ec5cdebadbda39c6249e0008fd300e4a SHA512 48767ec47155bd35ee1d9c3c4faa4ca18be7cb2364daa41312699aaccd7af949cd337e8e4dc22ccc3c0d2a530fc28a5f15014de38e597e37951ff985606c4497
+DIST intel-vc-intrinsics-0.4.2.tar.gz 136366 BLAKE2B 2f8b1a6ad8edb720f322668226224b23cc80c4a64b8ac300ff95a470e97f9af8e3317ddc45be668895e86b13074aab2d1846c2dd634f0466f39c9a77ec436851 SHA512 5312dbd06d4af5a4e18f99da867af4b7292daba92186c9de5208280dfe735b7563b73ac8f77f48f9d2f10f2a0d9654abf39c82cf07d829f568f41b3210af22d4
+EBUILD intel-vc-intrinsics-0.1.0-r1.ebuild 796 BLAKE2B c23d9ed6b6f72e21f6d97ef27eb8fc0ddb876c7347f1f9b10ee5cd2066129b55ba3fd80e1d33d301aa778d5468d6381bcafedfcf5bd054e9e0cd5fa942cb9281 SHA512 cec9628d44e2e3db6a38020e11fa8e826f842eaf3e7c4c31c30ef352e26b8e4b303597b2277b08b5b3c7a64d8590b95b05133212fd1f2e9922faa6a12d77dafd
+EBUILD intel-vc-intrinsics-0.2.0-r1.ebuild 796 BLAKE2B c23d9ed6b6f72e21f6d97ef27eb8fc0ddb876c7347f1f9b10ee5cd2066129b55ba3fd80e1d33d301aa778d5468d6381bcafedfcf5bd054e9e0cd5fa942cb9281 SHA512 cec9628d44e2e3db6a38020e11fa8e826f842eaf3e7c4c31c30ef352e26b8e4b303597b2277b08b5b3c7a64d8590b95b05133212fd1f2e9922faa6a12d77dafd
+EBUILD intel-vc-intrinsics-0.3.0-r1.ebuild 796 BLAKE2B c23d9ed6b6f72e21f6d97ef27eb8fc0ddb876c7347f1f9b10ee5cd2066129b55ba3fd80e1d33d301aa778d5468d6381bcafedfcf5bd054e9e0cd5fa942cb9281 SHA512 cec9628d44e2e3db6a38020e11fa8e826f842eaf3e7c4c31c30ef352e26b8e4b303597b2277b08b5b3c7a64d8590b95b05133212fd1f2e9922faa6a12d77dafd
+EBUILD intel-vc-intrinsics-0.4.2.ebuild 796 BLAKE2B c23d9ed6b6f72e21f6d97ef27eb8fc0ddb876c7347f1f9b10ee5cd2066129b55ba3fd80e1d33d301aa778d5468d6381bcafedfcf5bd054e9e0cd5fa942cb9281 SHA512 cec9628d44e2e3db6a38020e11fa8e826f842eaf3e7c4c31c30ef352e26b8e4b303597b2277b08b5b3c7a64d8590b95b05133212fd1f2e9922faa6a12d77dafd
 MISC metadata.xml 778 BLAKE2B 2e8e4d7f56f18f7e4eaa488cdab5d4578e779e8ac75fe96c3e7d5aeae5fc65291401d8ac54a0e89194c44a2146bca4cf9d321917bfab65a93f2118c688422cf4 SHA512 de2fc4d84a08fb98a41bb3e5f11d31535810e6f796aacaeacf784e1ed0fd7d99c5aa3a5e689fe22bbc7149518ea695979b4e66b6dd2b876e4cc9ad126564618c
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.3.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0-r1.ebuild
index 365759d0b864..6cff4bddb762 100644
--- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.3.0.ebuild
+++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="12"
 MY_PN="${PN/intel-/}"
 MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{8..10} )
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.2.0-r1.ebuild
index 365759d0b864..6cff4bddb762 100644
--- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0.ebuild
+++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="12"
 MY_PN="${PN/intel-/}"
 MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{8..10} )
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.2.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.3.0-r1.ebuild
index 365759d0b864..6cff4bddb762 100644
--- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.2.0.ebuild
+++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.3.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="12"
 MY_PN="${PN/intel-/}"
 MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{8..10} )
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.4.2.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.4.2.ebuild
new file mode 100644
index 000000000000..6cff4bddb762
--- /dev/null
+++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.4.2.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="12"
+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/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index f476fb30844b..0d292ef1cb0e 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,7 +1,7 @@
 AUX jemalloc-5.2.0-gentoo-fixups.patch 1443 BLAKE2B 433f445195f13ad3932d3b0c86a4b3ab2adfe99711584c96d8377fddf31730d9a0a116b345dbb9f46e487df9d11b222625dd72238b828452be1fb3ab838c347f SHA512 6fe7419d4cbf68e4725e9a10b8f42af126be924b011aab09a6872b0bd59effec3c641f9df4c2ba9935fb1b7bbfb62c3f272bc63a5264fdc105351427fd739958
 AUX jemalloc-5.3.0-gentoo-fixups.patch 1233 BLAKE2B 4654d1ecc2846281530b922e942dd68dcf4a4859ad087db4c5e163fd903c941b877fc2ad7e7a39b041e19ab74dc3af677132eb294394763f18f41dc9b126006f SHA512 4d1d4c22085cee554a5eaff0415c2401e528c1a496c4e06f9cc04fb8574ae19e9a271ea60cc368c3e0af65b26e72c86668a00fc38049281ac1bd79148551c142
 DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
-DIST jemalloc-5.3.0_pre20220405.tar.xz 671240 BLAKE2B 75cc8b58f9ce10ad1ae61b6b0146727796585d2edfd88c100661181409591bce3ed8499bfc5ffbbfac217c9baf33f955934aac9a62190874bc070c22b7e8f18f SHA512 aeacb637c0a5bd653ad584700fd3a91717b49dba60174871047e0e72ac805c9931940b0faf2e1846e09b975799d9545e32e71e0ff5951c0dcb23cfc8680a2ce9
+DIST jemalloc-5.3.0.tar.bz2 736023 BLAKE2B 9ff51616c3fb086d7cc021c59b83e5f0304d886993f4b5194a6956ffaf742cc509d08a2cf81ead6966c39a44f35621b57550f4a5c726c4508fd2c86c7c056ab0 SHA512 22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1
 EBUILD jemalloc-5.2.1-r1.ebuild 1418 BLAKE2B efc1ecdbf966fe0f3fc69f065f51c66946b59b68e59197079d9a1fc2f88da1f736015f9910a5923b0f1f2b476578f2b21d5edfea61337c76ce689326338ebe26 SHA512 745d3534239ac337bef2b6cfb38dbf5cf9b648781bfad50e9e8e3fa037313183c7a5b447e72221db152315e0372ec03edb23b102a368f818b30adbb1d50657d6
-EBUILD jemalloc-5.3.0_pre20220405.ebuild 1511 BLAKE2B a6807cff87cd691085ffae81f0afbf612337a21e55e996558364a95b9ca6310419096502e25049f2492e07f9c0cf773f79bfefd88d819f243f8993c443775a25 SHA512 2b1de487721b4837ade568c34bd078274521531f38f9dd32761be8c8dee50bbf23c20b4b1d740d56c3881f25d2cf4020fa653948a70472fe66bea9a9d602dc68
+EBUILD jemalloc-5.3.0.ebuild 1455 BLAKE2B 2db90d6558c689c6abed4724caa2433c5823a99b35ec035ceed5ee035cdeb61066602337bd2f1865ccc12375a763b68d30f5dcf128418d051a86e2c71f7c1e4b SHA512 10c55b91764d0392ad0006fcfb4150023b8f9e397765ae77750c23264321350ea145fc64cb9c887b551c1b45e56130eb528d7acc0220b8c6f6244b531d1b931f
 MISC metadata.xml 638 BLAKE2B 5d10d2e2db2f0557f2a0176e8e4ad244aa6b9209519c4b21c68696561b6a2a558f206bbd7de37d1f021231b8c84ec08a6796f0af5e5b32c2ec8c047ee50e8fab SHA512 31f22b88e6fa5252504cba421a730f13a18c213dec487a764c2c05555d45539ee58a0ddfe2212f535bc276934101125a3940c9b4934c7f924e89f85ebe75672c
diff --git a/dev-libs/jemalloc/jemalloc-5.3.0_pre20220405.ebuild b/dev-libs/jemalloc/jemalloc-5.3.0.ebuild
index ef08806278a9..5f2c31a7962b 100644
--- a/dev-libs/jemalloc/jemalloc-5.3.0_pre20220405.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.3.0.ebuild
@@ -7,13 +7,12 @@ inherit autotools multilib-minimal
 
 DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
 HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
-#SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~xen0n/distfiles/${P}.tar.xz"
+SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/2"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-KEYWORDS="~loong"
+KEYWORDS="~loong ~sparc"
 IUSE="debug lazy-lock prof stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.3.0-gentoo-fixups.patch" )
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 4dec26a6f98c..cacd13fdd386 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,6 +1,4 @@
-DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
 DIST json-c-0.16.tar.gz 351916 BLAKE2B 11457fa39330338c85bfdfb0dd38fc703ad6942e730ba090c9fe017dfb81ef905d7b1bb1c768b9b51f6445a8cf3cf4007d7740be3a9878f8062edc62ba554c66 SHA512 255cff99033340b2c2678255d41dae7808f83ed0c102e693d2d9e186bd1f21dd1385fcaa360c0fc087a00965a9567fbda733370e6b518a9be2f1bb0a80439151
-EBUILD json-c-0.15.ebuild 1086 BLAKE2B cc7bdd1a4e2dc8e37e96ce14b0283095d8ab1204419b7c0939b840df2e1d8d7e065bd7ad10862a44c67c78ac181b541f31d8a75ba62fd42060aab981a2c8fa84 SHA512 cbf41b3e50ead7c6c4d7388b024e49e3a67eb6f11bb3414662d1b9887969b65e288c1c4f72a4cca669248b4de45a8c3909ab93900bb2b77f83812f276a02b9f7
-EBUILD json-c-0.16-r1.ebuild 1127 BLAKE2B 9d6b1f7cb7c0f7cea18638cdd5464b7efd9b15593f3d3344d1c56044ca18d01523fbf1c5a55f3fce8f53f685654bc32e3fc3d2bdd5f2aca1330eedb5ba1933fa SHA512 7a41107929c9c02cdbf06dcd0da960cd1f64b6a38b96aed9787e348eb01f2476a0415f9bc6e8a39370ec316ec07de37026a07630d0002b4f37609cd2d7d0e606
+EBUILD json-c-0.16-r1.ebuild 1119 BLAKE2B eae23596311f9f8900fd1f5540da7fcdf4d8ca6237750a1a5d5e765de2ae55efd9ea2fce1e8a7cc24e7f573f546f7007b24b1b036348b4c394a1215360966052 SHA512 4cd3837d0e275240de2cbb3216f75ccc2c8f4c3174505c53615636f1ac86da27b752c4ea21bffc45a3d61fc3dadcd9240461c69b367a7428bbc2467033199855
 EBUILD json-c-9999.ebuild 1039 BLAKE2B 3da4e08a2ba828fada531434ed0062b0320037448260864f5e666a6830c5ee47aa596d6f036f6beaad9f87f2934952fd4d7636c72e9bbfe8ef9bddc17c58a5c6 SHA512 f62462771eaecfbab8cc9790a09c7ea1c848a507f8612f9bc87acdd4a93b0673ece152297071ab47c8877d98ce2b2e3b6bb7a65c9227c9fda838551488b56e88
 MISC metadata.xml 1011 BLAKE2B d9f64f6e06a3b1a5bb315e35590426e9e87d777bf2fe73a7f8c57e6730ce99236d071d7d9ddf190e654e39e91d4134fdd07689afa958d6aec69dc5a787e95bf8 SHA512 731afa46afd8fdd519425c1a58f791f4d999333e726426770a0f37e552d640d4a198f6b2eb859dca3c4aca21f3e1fc8ad147de0e07efcede14b5d791b66e4e72
diff --git a/dev-libs/json-c/json-c-0.15.ebuild b/dev-libs/json-c/json-c-0.15.ebuild
deleted file mode 100644
index 70e366eb88de..000000000000
--- a/dev-libs/json-c/json-c-0.15.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="A JSON implementation in C"
-HOMEPAGE="https://github.com/json-c/json-c/wiki"
-SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_rdrand doc static-libs threads"
-
-BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/json-c/config.h
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DDISABLE_WERROR=ON
-		-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
-		-DENABLE_THREADING=$(usex threads)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && cmake_src_test
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-}
diff --git a/dev-libs/json-c/json-c-0.16-r1.ebuild b/dev-libs/json-c/json-c-0.16-r1.ebuild
index 394bbba72a15..632bded1ad5b 100644
--- a/dev-libs/json-c/json-c-0.16-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_rdrand doc static-libs threads"
 
 BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 8a3e7fa18e89..ab7c9adac6fa 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,3 +1,3 @@
 DIST json-glib-1.6.6.tar.xz 1306232 BLAKE2B 93814dad74ef61ef265e348e9e145ceb63c950f1e9ecda23fbaad24e291a1cbfc690e287ccc8959fd7c056634f80815ef54fa2c75b09ebd3e158f3fa4df1c8e7 SHA512 b9a737e4ba3ecdfb9cb8f5fb751cc74e5b1553664d3088c44a1f9e5396d4037958af214dcd290ddf5af98088f46167e10e371e134e1de5cbb7aec84c5c0fd017
-EBUILD json-glib-1.6.6-r1.ebuild 1726 BLAKE2B 58ed4eaed530e3173d174ba2e6f92421a9ed7fe49dff5fb24d3b6dd5ddd68ce0ec3fcd352388cb7d44bf4dfd8ab8d0bb843dfe86a10fcc161bdda701c06eec4d SHA512 eb4e6c5894384e8a3fe4e2c03b0928e5e37c0c255bf23a28937fc97402ea6e7c557c7f58cd2b100a88e028d0c3359356dab3528d13ee5a45b48503ae4059269d
+EBUILD json-glib-1.6.6-r1.ebuild 1733 BLAKE2B f05bbae42461ea61b47d0c76a2343263b4d1095cb470fabe29372ad9a9596de57d6d137425adada83905ef188c13def122e2382d74d510847aa924a7a8938775 SHA512 08a0c54dea05e74976cb114a446324b5ac62f5eca291710e776930efaa1c16b51f81d308ea6cd9e8c26b209e685a37f376e08eae3e13c191e1b718df6768a15e
 MISC metadata.xml 1169 BLAKE2B 940ddda4a78b735deba5a4ab0ae6e840e0f09ee3ffb5254ceca11e3b15e42e3b22bcd8e0b40dbed10179a51d93501a4407dd53e5d9d8d5b22549f8f415e8c9b1 SHA512 df2e5e05eaecbd42d7ebba8330f3fb44096cfa8eee4e9ee9e99509a749f841612e38ed102737b7f8b6b8a1b991aadb67226c2c3b6494964662c94696501e519f
diff --git a/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild b/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
index f8da05466a2a..5046eb6e4e5f 100644
--- a/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 78c836b24c47..dfc5a4d50d34 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,3 +1,3 @@
 DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
-EBUILD jsoncpp-1.9.5.ebuild 1224 BLAKE2B baef6b6ad79ae6d506dc6d8c06df705115830618ce07325eb5ad1eda29f520735fb6dc8f1de3e5fb63ce0b0c6c694c354a03ff104f254ea6f41572ab680d01f6 SHA512 165b3377d923d9bd5d45fc61fe9deb111c35373a111d94fa6e9c99acb7e303fa69a9a9b3fc59c78db5f17ed3c0695016ce416197aab9b52a4f0b8eed5e3ff784
+EBUILD jsoncpp-1.9.5.ebuild 1230 BLAKE2B 9f3b16373714bba34bdd355160070520f6e6e27697ce952ed239a00c270026bdd8fce0b6570201649999ed0814262caf969daf3970a05494c3b8bb716a7cd3b7 SHA512 933184fc1284e0e9cfc140c73aaf5837426d7d9a63dac2efd7474a6718c247d5cbc4c2beeca53fe7fd06973ff9959d5e0bf9f8cdcafa49c5d44c8faa2be2c65c
 MISC metadata.xml 404 BLAKE2B b1439e7ff1121eaaac0eabccea420806b8c059b6cfc43fec2ec47ff5e3a937ace7a1afa4c3a5f18385de22b3979e8648f048cc7a8717b0ea5e282e08a3914bb8 SHA512 700ebcb293411f62c10a69640c5e7d9240f90f513435b54b77e0fa30f1bb732affa0055dcd7c84c858a50d56f0b3a138dfe6410f8a45fd91d1af62ea827c9e8d
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
index 3de8ea37f6f8..56dfa76aeeba 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index f3e0fd3d6ec4..3f256c4a83ce 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,5 +1,3 @@
-DIST jsonrpc-glib-3.40.0.tar.xz 42392 BLAKE2B 106d010d5615d6c4a3e1fdc314d1d63be0b76424aca4c6e3771c21e75b79dca5f524e711c99fe1175797644e11d0458317bfa1f363a5abd296dab5b3f95dd708 SHA512 5d4fae86e7eeb029a8daf3eff26107a374ba1b68caa2862563e8d9854913ae306448f4c712be6f0f82961031f1b618aaba7ded154f81b4a023fa366c71f1b887
 DIST jsonrpc-glib-3.42.0.tar.xz 42420 BLAKE2B a60ebebfee652ea694cd2884e057522534826cbca506d04847d29a23dd3035e9a1043912c9a434d4b8b58a6fcb91ba05cc8c76cf380e6205f3d89f9387800bf6 SHA512 615e446dba2b1bbefe1bf8891449de9d39e3486fefda590781f59469ea50e6affa487bcb260bd3e21ca30e696b1dec7a761c8d93ec9c0894d9bb4c3d65f106dc
-EBUILD jsonrpc-glib-3.40.0.ebuild 971 BLAKE2B a5e3b578e16987bc81a66f43a056f9e4f65ae6720f86f2982073780ca9f2dc8b019174528f9bb1d3eeb2ea697a31a48ddc42206e4273177347bff7d025705fcd SHA512 091c0df94cd51b5fcf81e1025778b0ec0cd9666c752fcd97e4405cf392d3a19a46b37ee48557e5a8a384135910540ed24abd4db28e0d96625c149fc563a52785
-EBUILD jsonrpc-glib-3.42.0.ebuild 1175 BLAKE2B 604656fd8d479eceb9d2980955c32e357eb921d225e135e3a424c8a7fd29144c3a530cf9ac554c89cfaf169e968076a6d2e4862f55ab6272b8e6dbbe18f5d795 SHA512 a7f88c394a3f550807da48a278f949440926e3faf0dcefae111fc3afee7cdc93be50c85c59153104041f0e6a1323ad180992ee2598954a9accaeb8ba79792610
+EBUILD jsonrpc-glib-3.42.0.ebuild 1173 BLAKE2B 7f71075c616332e6a86975c3f11c5e72c9ec1c65b13d68fb2708e62470810d1aa9d1deaf0693247b6ed429994423fc50abe3d2c25aa5606b61714de5cfce372a SHA512 34de030d7d2fe8de8fbc2a155a5317038853630a615a31ca321918441f2120c01244eb2bf7ab1654e1eaeccc41d3eb62602fc0cabe93d1dff177f734e7c32bc1
 MISC metadata.xml 506 BLAKE2B 21d02bfa7d40b0c215817396da945211436ee9e021d40696efbe4c091cd0e3d2f4621ba97fcc9aa1c96c3bf0f40707b0af95571ddf8edd16ab01c00f4c76cb6d SHA512 af3d14d9201d2fc7530d661edff7f7b714d8dba4342a4695a8edd540da266b52583d35a6280595b98918b913734a19a07d613b240f673120cbb27f643cb18f45
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild
deleted file mode 100644
index 063b0c60669a..000000000000
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala
-
-DESCRIPTION="JSON-RPC library for GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 x86"
-
-IUSE="gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_profiling=false # -pg passing
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
index 9285abade7fb..fae8f118dda3 100644
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 31650649cb04..e6a2ee731fb4 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,7 +1,7 @@
 AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
 AUX kopeninghours-22.04.0-boostpython.patch 3555 BLAKE2B 1d22b48e5574ffada0b89a0828bf5258321b57161061534939e95256ab3501a887a026231568e09b1d20499238284107c34c6835d33853096be62e1345356cde SHA512 562b30fe66a9e8904e79c95496c4b06e50dbbb8d328db93a655ffa7f8829ff70bc8a6b0ee7beb7840e7046b74d4d858265ec67703c6317c3fe4c87b54b40a349
 DIST kopeninghours-21.12.3.tar.xz 68916 BLAKE2B d80275c195231ca52e0042149d685224c9ffadd6d341ddce1af6f46df451442e924f282119c91ab004dcabb64b112de559bbbcddc2a91daee5cf9a76b84fb4bb SHA512 42bdbe8172ff5ff89469786f3d544db4a07bc0d1de9a54b8525dc8789d0f4328159ee815c07595463f190073433de567fb2d3496d261daa46aac70354b3da6ae
-DIST kopeninghours-22.04.0.tar.xz 69016 BLAKE2B 6e432bb2981b4eb62970fef37390ff871ee51a09e964434f2c43bf89de8ab2568b4843369fa99166fc731937989a155c9f391c2cc32c023f4be56ff886fabc60 SHA512 21bbd64000dec12015a5a2904f414876602a1b7096d6c64f4b327ed4d38d5a38d5058138a422c6fe41f7e205508b753b9d0502b1379d0e8816f1d4929d3fe45c
+DIST kopeninghours-22.04.2.tar.xz 69172 BLAKE2B 7117c219aac659df2725cf2600cdafa4a676937303fe4bc8e151108759790a8123aa896f51ce3eb8f91477a5911d0d459791ff4b8cb73c45781223339a482ef3 SHA512 f27993e33922dd260c4a7b67cede7c0155ccb5f8b7d30a4fa9e1fe1fa4b80d3f0dd613edf06a0bade43a77bcfc1f8aa2173fbc7f2b4fa659948395b2c3554c3e
 EBUILD kopeninghours-21.12.3.ebuild 1284 BLAKE2B c412ac19980818679f764e00007985011fcb6824fbce05af1efcd7b0c4fd4d0a0f003e4195a9beb893fb489d60557e842ba20ef54d0ccd58fce1261ecc65566a SHA512 b30cfaea9be3a99b45a453934f599a79b344c04659e46a9825afd953bd7cbaeeb702ba80609c5f6271f15bb7190596e792c5dc72e6cf7dff38376f0dbd4064c8
-EBUILD kopeninghours-22.04.0.ebuild 1274 BLAKE2B c2b2156b59139558ed6428c73a567abe4de8624052fde7f9c1040a3d4acf923b1d168d3ba2743b625952fbad9a3cdcd124565e44a3e548d8d63e80763c4eefba SHA512 baa255cf4464b346ebecb3dcd7628e2a961b5dee458708347994ec5bf5dd1fec28e961db5c8ae5040e22b3e79ca100edf7db25a924c74682ab89fc7014d1e6e9
+EBUILD kopeninghours-22.04.2.ebuild 1283 BLAKE2B 9984178eb0d7262a27a57cc4d28a551661305ce96d848f586c5a03a1a87446779b07630c79466842fb007de84572904d6b3661b4772171e78636e43527246760 SHA512 f0b427ca33b0f938cd17ccb8c33dfaf21add7d29054765082baeacade446709987e71d29ba6d6653d68af906520f436675eb13da0852d94aeb8726907eb1c849
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kopeninghours/kopeninghours-22.04.0.ebuild b/dev-libs/kopeninghours/kopeninghours-22.04.2.ebuild
index 627bb806459e..2f0dacc76970 100644
--- a/dev-libs/kopeninghours/kopeninghours-22.04.0.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-22.04.2.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
 KDE_GEAR="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.92.0
-QTMIN=5.15.2
+QTMIN=5.15.3
 PYTHON_COMPAT=( python3_{8..10} )
 inherit ecm kde.org python-single-r1
 
@@ -44,7 +44,7 @@ BDEPEND="
 	sys-devel/flex
 "
 
-PATCHES=( "${FILESDIR}"/${P}-boostpython.patch )
+PATCHES=( "${FILESDIR}"/${PN}-22.04.0-boostpython.patch )
 
 pkg_setup() {
 	ecm_pkg_setup
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index c194e80f9010..610d7c5ad8a6 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,5 +1,5 @@
 DIST kosmindoormap-21.12.3.tar.xz 351272 BLAKE2B 8fde9196e18062770c63eb2b636bf3bfea65d8575f4d67106c28fcf3349c6d9bfa3bd1d48a8978b3ec2e2d027f89be3338b88cdfd4b59b7609cc9bba2aeab689 SHA512 f2f5bc04dbb9943114d9807787d98ad4a4963be556c5f2ec332c59bc60533abbf6d39b982f79264ff3d764cb4b8e60501d711039e0fc475500abbd800fc13b86
-DIST kosmindoormap-22.04.0.tar.xz 351100 BLAKE2B bfc1401ff87fe10c0bee0b395dbb1386ed424521d72622450038851b768e429323966a8417a0605a456ca19bee58ba1a555e94e54e7bf40abbf9eb863ba3bab1 SHA512 477c1674ebf11a664e7286723a616c6146cfa54827c1eee8aa68e907bd3be068dd8fc90829895fdecff6827bdd3e930728100393071e5dcd6107d0317d318e58
+DIST kosmindoormap-22.04.2.tar.xz 351236 BLAKE2B f2462e02da572a33bc46704aa3f59221494c085787c186976bfd35721b0eeeb8203aa052d8085e65c97c62b0b320076deae89692113137970b2b8a97c9c1f15d SHA512 f5887eb4f98f2d464aab00de89aac8487391b22075f34b5b861e6ede403feccad507727b07b7349f17b8a71b306dbb2e9a55054f32c13540014d8572189e929e
 EBUILD kosmindoormap-21.12.3.ebuild 1063 BLAKE2B e55139cff5e9ccd4fe97e199ab708d21f966c55fccaab0a952c653e397daf942aec84d23ea4ba8d048a5b8fcc2e34fbb1b997de001a62e6defa92f7c568ee85b SHA512 d00b328b3f2af8d09b1943b05c045fc6d134177e573475a2ee0a2f30913e515dbc23556bf10a71739fe99b9777bed052676655b072ce786ba0e11acdaba762e0
-EBUILD kosmindoormap-22.04.0.ebuild 1063 BLAKE2B 2e9b52a928fafdd2eded3b039357822a929e672a02af8bb4d88f620ae70796cb723eff4d70fc4bc1a19499947f8644862375e5aeb5b8d3b50e626494e82eabe9 SHA512 cf1232cebd38e95e8062dfee7af136dbfbaba8aa39e010835177ca2c168a2658c5a8a79cedc7c294d74f82d3c4e5ff0fb3a7bf021173c08b73388c56c15215c7
+EBUILD kosmindoormap-22.04.2.ebuild 1063 BLAKE2B 9113174a27099f956eef61a001c2ea5f7f3de48bcbf78cd5174e32d74710adaec1ea3e8a80f200089fb2ba03328370dadaf45467d17820e7063a414ab26a32b1 SHA512 3756b54a51fe8da88383589936b7f275a81984e76066f4c011857e0bbb5cdab09d5bea2f0187b7c9b0f0a89d51c90a8ef1c514028e5bc0d9c4367d302c277845
 MISC metadata.xml 436 BLAKE2B 7b97cad83675445e816a4f92d2e9c2c4167457df244fd166b6388be7c9336b4852c3873fff4e9d18bf1cccaaeaec849a1b340fa92a15e54180652e53cb023859 SHA512 312c58bb9ef49585287db38ff0f4e6cb6486477f4c84246610c443fb07ced2129017462ef91fab147dde7d69b0923605dc5b68fe71f6cd80f0ed1115b4a9ca6b
diff --git a/dev-libs/kosmindoormap/kosmindoormap-22.04.0.ebuild b/dev-libs/kosmindoormap/kosmindoormap-22.04.2.ebuild
index 29434919a3c0..db79b01a49e9 100644
--- a/dev-libs/kosmindoormap/kosmindoormap-22.04.0.ebuild
+++ b/dev-libs/kosmindoormap/kosmindoormap-22.04.2.ebuild
@@ -7,7 +7,7 @@ ECM_TEST="true"
 KDE_GEAR="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.92.0
-QTMIN=5.15.2
+QTMIN=5.15.3
 inherit ecm kde.org
 
 DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index bff3cfc9cda2..47a6dc305344 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -4,5 +4,5 @@ DIST kpathsea-texmf.d-11.tar.xz 12616 BLAKE2B f64dcaae859d6c95d534907f6951942897
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 DIST tl-kpathsea-2021.tar.xz 32308 BLAKE2B 83052cefc5699d46ce104e4379d39eee8e86b514d25245a6104fc9940accf131790ae144ca11dbd3b99a31a06017495bb5a53afb1e49da71a2c9eec008200653 SHA512 398358b84ecb81fece969fbd3521b093f7e791feec828c218e6371c26d57956491328999517a65711d45dfb04c83fd643ef0fad6a0153590866eddf485d5c575
 DIST tl-kpathsea.doc-2021.tar.xz 1066608 BLAKE2B 798ccf9953e4fa2037f81b56dfa30cf99c56c17e2942d5a0f2041b871958284f05150e5d7631b542896190f178327f009130e6bb07f60e8173ec1e9f12c4cda9 SHA512 8ecccee7ad99220f91139dcd9c2ce0bd19eb0e2fe74f0a965f68e59a28bd3de454624d6e014ef2a5c481a537acb95b08a9546a79abd8df429300043ecf973545
-EBUILD kpathsea-6.3.3_p20210325.ebuild 3303 BLAKE2B 315d8a7a66c5b0a2489bc62797621a84dd7970f47198d86d47e3cef74cfca201d2521bc11dc68cf5ef501c6b940160e5a8874c8ec40ab67ba88db3da56f1e0ed SHA512 27d40f28bfd25feb1f8b67d4c44c3bb63ac637866a8999a57e1e17d0f6b55fd86c219588b21774a5086dca8f2529fd02c33409b254ba204c384c139dbee4f270
+EBUILD kpathsea-6.3.3_p20210325.ebuild 3310 BLAKE2B 742570b3575dd5ae4155ade4d9942ac20c17ad204238b3dd3e47876440fd070f2989ba714bde51cb22f2f860e5dd764d9211a94628945d476848aa44ec3d1857 SHA512 4a6b03cca7ba488bae72d9b402e93addef9a0056810babb0efe342fa058f16df1b56016f6535bebd08f605a5448de86e09ff4ff979bf71c556f469f7c08ff15a
 MISC metadata.xml 359 BLAKE2B f8f134283ba7c09acbe2287098bf3730562d5eba164a72164f74af41454ee332ae783ebe74b795e8ef47357d25601c1e3b9956a46018327ebf9db47c9b5fa431 SHA512 5443fd37f07be32ccbc409f63b8a337888ecea5466871a071b917bedc49b07680ae83d53a4dcdeffb330a985e67e112f04a16576b790f6f02c7a30b716fc7dfb
diff --git a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
index 8c4a6a6153cb..43a961e05eb2 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="GPL-2"
 SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index 58d38133ad26..8fccb325e02d 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,5 +1,5 @@
 DIST kpublictransport-21.12.3.tar.xz 480780 BLAKE2B 949c394497fcd76af7e4cc3d83e1db74cbef221f9f468a4ac247e82000503468e204eaa45ee61b4f5d05d84c1f4878484db342ff760d101a6a0a7b0960937baf SHA512 495fc7e92bab00fa0953fa81d2cb73e37055f8ccee899c8d9f8783e85f83e7f6a4c04a1e48ed607d565926bdc9fcadc539a2738b7c898a07aa6934f5e15038eb
-DIST kpublictransport-22.04.0.tar.xz 484884 BLAKE2B 6712d73ff46a1b16c5a66df644367fba45c82e0b767ff1f110bd18cf50725742a682dc11f453288a8f677868d4f0da313c9f73d1f26980aaca39a1fa2e3999cc SHA512 61c3125d050bfd4717a44ca087acaea110690c44fd6e9ef2b165286d2c88124ddf99f45aeddb33969d087e257e8593ed4b545b164caa99d32f1c98faacc4815b
+DIST kpublictransport-22.04.2.tar.xz 485872 BLAKE2B bc820a67ac26f6ce52e38fad4021e3c432ba2e3ff28b0853e78cca2c6255d6e4e7a40e260b463b7cf23851b673b1b0a51fe97d7cde5c9614219d2c4177f082fc SHA512 77874baacb836ee7cc903122c88d88dcfb277d281aa2777195b701edd33a9293924ca6cd482529f2bebcdc20ee4edf954c53788fdc9951c23cd7cae774a2751a
 EBUILD kpublictransport-21.12.3.ebuild 826 BLAKE2B a3cf204cfbcea9111a4dc415baea208e3e964e376f109eaa2c8a561cd452272c76a12f3926230d29b18ea68ef17532dd22fdf225e6912d318e0c8bd1a4104f57 SHA512 3be3156f902a546f2f79d9909d8ae6262f6dce8b8c43130e44de794c503793ae7a5c0dc54e13718d8c317e0c110571e857f354f7624362ea49798d90486f5e88
-EBUILD kpublictransport-22.04.0.ebuild 826 BLAKE2B 09e4d8bc2a7f66744b6c3f03a4e155cc83c645a076dc6f20d36eaad23d92d2447aa080568db9dd9feeb4526cb0b07e86f5de6e24f3d8c53280328f0913e1c9c5 SHA512 869c1f5e910d5417fec315853c1171b14cee60594bbf41706aa959dea3660cf5e09b4fa2bc1eec248094fd42e4e85ea642850a4e053bb8ab3ebe61127c2cf37b
+EBUILD kpublictransport-22.04.2.ebuild 826 BLAKE2B d5946312a12094348bb73ec014a2103701d786b2d8aa1f2ee3f6bdbef9acbac82e69374b5b2d48b5eb93a461d84adc4fa44bdde367de1a75cc854a39c7bcdcea SHA512 ad92f2c3f0b97d2a8a426ad84bf0b56c64eff14d046df43d606ac86a4050d499f266878b07d05a2d2df4dad4823645849bed54cae1e2b21afa000c7979332210
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kpublictransport/kpublictransport-22.04.0.ebuild b/dev-libs/kpublictransport/kpublictransport-22.04.2.ebuild
index 6dddf2697e4a..e9e30e4aac99 100644
--- a/dev-libs/kpublictransport/kpublictransport-22.04.0.ebuild
+++ b/dev-libs/kpublictransport/kpublictransport-22.04.2.ebuild
@@ -7,7 +7,7 @@ ECM_QTHELP="true"
 ECM_TEST="true"
 KDE_GEAR="true"
 KFMIN=5.92.0
-QTMIN=5.15.2
+QTMIN=5.15.3
 inherit ecm kde.org
 
 DESCRIPTION="Library for accessing public transport timetables and other information"
diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index b7ab0e3f38f6..4feb8a988a12 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -1,4 +1,8 @@
+AUX kreport-3.2.0-Q_REQUIRED_RESULT-placing.patch 2153 BLAKE2B 819f99398b0ab287bce589de13b44686eb686bc174e517780f283f264311a2640b7b8bf6cb4bdeacef553d3a37e60dfbb630b3931eea290f764dc046edcf7650 SHA512 71a982f484069eede1762e777649fc1bf06353fdc43d20f040286b1c8a8a4584c62b6e54bd88578da583622f8a74046ce3da998bd7a95122c048389fe9c5dffd
+AUX kreport-3.2.0-fix-cmake-config.patch 1064 BLAKE2B b66d9d09dc1097a8b06a8b3d7bc3118f837fb76871e72c8c23ff20c618c6760b1fd49f4debcd62d4f203aa77c30520f44a2f2ad692e41bd2dec6489337df1586 SHA512 043bddb0cc5dc6cbb7db4620e9506dd045097478b6743ff016e748aa7dba2f01d4424f86697b53090ae6be8aed931c280543793e94ba42fdeb563065624273f1
+AUX kreport-3.2.0-fix-insane-delay.patch 5496 BLAKE2B 1d3adb61aa38ba73cf58c862fbe941d090a22ad02c60e2e5e0f16b39625febc60e1f1bfac44892ba2b47ae75d6624d5a90456a4168825fcb21753dd1f436c89b SHA512 82cfe9387c636905472d1164c9f8003099e7201baac8bec3361deac15e32e982186d626d5eb5259933e2e2783591141746e16ec116d36d2897263d5ec3c1cb67
 AUX kreport-3.2.0-gcc10.patch 4160 BLAKE2B 1d3e579ac1c2e6da0cecc22a2128746a6f3fdf99c7b4b5b66e0992f10ec9555b83efc6b6eff62acc5c2a72299abf3baf6b0e7fec9b7b0c57702a23d7cdc4cec4 SHA512 a378710adb3c885591dadb878ad6c4c8ed6c3e92feebfd59aaf8eaf1f03ddbe720d4480622e744c37ec0d7bb52812b9e91eef90ff5d3af30f70da7bbbba5aff8
+AUX kreport-3.2.0-gcc12.patch 1014 BLAKE2B 7fa0a343e670f93762832e4667fbef2037dd8330818937040eb5abca5c93c140eda0da002d9013378bf559249690b49289ca86d5f40c6a65e9f3630cec5cb905 SHA512 fffa5455ac114c143f4b5b29440884393234b020b1a773e243fcb223cf08cbffecd00b86111cc99a7090127ff28b2f192b7f6b3eb95d1406bf42032bcd412f4f
 DIST kreport-3.2.0.tar.xz 374072 BLAKE2B b0e4a028464f424e1e6661a02233a0e6f711a890892ea34c8c8ebc12675379a233e9aa8b00f9165e9a82993d43ae2086c7a8c0f5cc17cfaa658614225c7b56c8 SHA512 3f7b8bf8d4c5e88de74b38c55b4c82ac1e3ae11db424b10b85884ff479d25640b0ef7c6f90567cf27a1bab099d4b14a042ddf4549cec9ca7d5b237c3a8f7104c
-EBUILD kreport-3.2.0-r2.ebuild 1265 BLAKE2B 8192cc72634131db78f0e5ddb7c9dd2a3ea160659ec57bc26f0d59da675b4f5c69715767d587a17c2f430e935a87731926d191a854137d4cfdb2bc3ec7ee2e47 SHA512 86f6b3ef6977dd6554666d87623d4f9b0b7f4dedfb6e8bd2661f153580ef441352f1af8ef3b83c018292fc431c9023bba81ccf3fa8c8445f3952e85c3cd4b0da
+EBUILD kreport-3.2.0-r3.ebuild 1505 BLAKE2B 5008ee1558bb5e08d93a8da26921a050e5912850d1010ab5905b2113fbc30f2b94853d87089eda71ccf86976fb758336b4fd3b7c75803076038e113929c636de SHA512 28867ae3b3839112009fdf36172c0067f5fa79eb591ae0c9145d9cb6e9d240e8242977690eaf2d8a0d6f289f7b6bca10d22fe7d7a4319eaa00e67a149cdd6e47
 MISC metadata.xml 513 BLAKE2B 38e212c004da9c51581f191c2cb3852199931eb9135c9f07dfcdfa30ff780630038291169cead63edd1c842bedaaf00c261d20c6871e325f9b9dc8901481b868 SHA512 1f696a012a26537e7025bc3e2e4b4979e90b2a45f79c751ec0b97a7e27db46c946b4eeefe5b16a9ded482e910ed538bb3113757bcca2148252b6b1c2597a3b45
diff --git a/dev-libs/kreport/files/kreport-3.2.0-Q_REQUIRED_RESULT-placing.patch b/dev-libs/kreport/files/kreport-3.2.0-Q_REQUIRED_RESULT-placing.patch
new file mode 100644
index 000000000000..bb90243c688e
--- /dev/null
+++ b/dev-libs/kreport/files/kreport-3.2.0-Q_REQUIRED_RESULT-placing.patch
@@ -0,0 +1,54 @@
+From b37de83728dc7463dea37f71417560ae602f615d Mon Sep 17 00:00:00 2001
+From: Jaroslaw Staniek <staniek@kde.org>
+Date: Sat, 1 Feb 2020 19:07:52 +0100
+Subject: [PATCH] TRIVIAL Move Q_REQUIRED_RESULT to correct place
+
+This can fix builds for newer MSVC
+---
+ src/common/KReportDataSource.h    | 2 +-
+ src/common/KReportPluginManager.h | 2 +-
+ src/wrtembed/KReportDesigner.h    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/common/KReportDataSource.h b/src/common/KReportDataSource.h
+index 4761af6c..89490b47 100644
+--- a/src/common/KReportDataSource.h
++++ b/src/common/KReportDataSource.h
+@@ -124,7 +124,7 @@ public:
+     //! Creates a new instance with data source. Default implementation returns @c nullptr.
+     //! @a source is implementation-specific identifier.
+     //! Owner of the returned pointer is the caller.
+-    virtual KReportDataSource* create(const QString &source) const Q_REQUIRED_RESULT;
++    virtual Q_REQUIRED_RESULT KReportDataSource* create(const QString &source) const;
+ 
+ private:
+     Q_DISABLE_COPY(KReportDataSource)
+diff --git a/src/common/KReportPluginManager.h b/src/common/KReportPluginManager.h
+index a8c4efcf..9ea01804 100644
+--- a/src/common/KReportPluginManager.h
++++ b/src/common/KReportPluginManager.h
+@@ -49,7 +49,7 @@ class KREPORT_EXPORT KReportPluginManager : public QObject
+ 
+         KReportPluginInterface* plugin(const QString& id) const;
+ 
+-        QList<QAction*> createActions(QObject *parent) Q_REQUIRED_RESULT;
++        Q_REQUIRED_RESULT QList<QAction*> createActions(QObject *parent);
+ 
+     private:
+         // class for access to the constructor
+diff --git a/src/wrtembed/KReportDesigner.h b/src/wrtembed/KReportDesigner.h
+index 404c8fd4..b5b64a30 100644
+--- a/src/wrtembed/KReportDesigner.h
++++ b/src/wrtembed/KReportDesigner.h
+@@ -106,7 +106,7 @@ public:
+     @return Pointer to a new report section section object, ownership is transferred to
+             the caller
+     */
+-    KReportDesignerSection* createSection() Q_REQUIRED_RESULT;
++    Q_REQUIRED_RESULT KReportDesignerSection* createSection();
+ 
+     /**
+     @brief Deletes the section specified
+-- 
+GitLab
+
diff --git a/dev-libs/kreport/files/kreport-3.2.0-fix-cmake-config.patch b/dev-libs/kreport/files/kreport-3.2.0-fix-cmake-config.patch
new file mode 100644
index 000000000000..625a05bd7f21
--- /dev/null
+++ b/dev-libs/kreport/files/kreport-3.2.0-fix-cmake-config.patch
@@ -0,0 +1,35 @@
+From 4ce3e8a857f2540909e1c23b73beef62eb3ab5fa Mon Sep 17 00:00:00 2001
+From: jordi fita i mas <jfita@infoblitz.com>
+Date: Sat, 11 Apr 2020 22:37:20 +0200
+Subject: [PATCH] Add Qt5PrintSupport and KF5CoreAddons dependencies to CMake
+ config
+
+Reviewers: staniek
+
+Reviewed By: staniek
+
+Subscribers: staniek
+
+Tags: #kreport
+
+Differential Revision: https://phabricator.kde.org/D28736
+---
+ src/KReportConfig.cmake.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/KReportConfig.cmake.in b/src/KReportConfig.cmake.in
+index 7d74122b..9828fcc1 100644
+--- a/src/KReportConfig.cmake.in
++++ b/src/KReportConfig.cmake.in
+@@ -20,6 +20,8 @@ include(CMakeFindDependencyMacro)
+ find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
+ find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
+ find_dependency(Qt5Xml @REQUIRED_QT_VERSION@)
++find_dependency(Qt5PrintSupport @REQUIRED_QT_VERSION@)
++find_dependency(KF5CoreAddons @REQUIRED_KF5_VERSION@)
+ find_dependency(KPropertyWidgets @REQUIRED_KPROPERTY_VERSION@)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/KReportTargets.cmake")
+-- 
+GitLab
+
diff --git a/dev-libs/kreport/files/kreport-3.2.0-fix-insane-delay.patch b/dev-libs/kreport/files/kreport-3.2.0-fix-insane-delay.patch
new file mode 100644
index 000000000000..cf059f0ca829
--- /dev/null
+++ b/dev-libs/kreport/files/kreport-3.2.0-fix-insane-delay.patch
@@ -0,0 +1,166 @@
+From 779479c5474e080a857b2d80bdc86b9cab6531a0 Mon Sep 17 00:00:00 2001
+From: Jaroslaw Staniek <staniek@kde.org>
+Date: Fri, 1 Nov 2019 19:54:00 +0100
+Subject: [PATCH] Fix insane delay in report items creation
+
+Summary:
+Fix insane delay in report items creation by not instantiating hi-resolution QPrinter object for each item.
+
+To be honest I am not understanding the whole word-wrapping algorithm used here.
+
+Test Plan:
+Approach 1: Run KEXI and create report with large number of pages. Use at
+least one text element.
+Before the fix there's noticeable O(N) delay.
+
+Approach 2: Also if we enter static value for the text item the kreportexample
+app, there is noticeable delay on each key press before this fix.
+
+Expected: all is smooth after the fix.
+
+Reviewers: piggz
+
+Reviewed By: piggz
+
+Subscribers: Kexi-Devel-list
+
+Tags: #kreport
+
+Differential Revision: https://phabricator.kde.org/D25108
+---
+ src/CMakeLists.txt                 |  2 ++
+ src/common/KReportUtils_p.cpp      | 14 +++++++++++---
+ src/common/KReportUtils_p.h        | 12 +++++++++++-
+ src/items/text/KReportItemText.cpp | 11 ++++++-----
+ 4 files changed, 30 insertions(+), 9 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e15d5ca6..1cf0b389 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -198,6 +198,8 @@ target_link_libraries(KReportUtilsPrivate
+         Qt5::Widgets
+         KF5::ConfigGui
+         KF5::WidgetsAddons
++    PRIVATE
++        Qt5::PrintSupport
+     )
+ 
+ ecm_setup_version(${PROJECT_VERSION}
+diff --git a/src/common/KReportUtils_p.cpp b/src/common/KReportUtils_p.cpp
+index 5ac288bb..0fd90c2f 100644
+--- a/src/common/KReportUtils_p.cpp
++++ b/src/common/KReportUtils_p.cpp
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+-   Copyright (C) 2015-2016 Jarosław Staniek <staniek@kde.org>
++   Copyright (C) 2015-2019 Jarosław Staniek <staniek@kde.org>
+    Copyright (C) 2016 Adam Pigg <adam@piggz.co.uk>
+ 
+    This library is free software; you can redistribute it and/or
+@@ -26,13 +26,14 @@
+ #include <KMessageBox>
+ 
+ #include <QApplication>
++#include <QDebug>
+ #include <QDir>
+ #include <QFileInfo>
++#include <QGlobalStatic>
++#include <QPrinter>
+ #include <QRegularExpression>
+ #include <QResource>
+ #include <QStandardPaths>
+-#include <QDebug>
+-#include <QGlobalStatic>
+ 
+ #ifdef Q_WS_X11
+ #include <QX11Info>
+@@ -329,6 +330,13 @@ int dpiY()
+     return s_instance->m_dpiY;
+ }
+ 
++Q_GLOBAL_STATIC_WITH_ARGS(QPrinter, s_printerInstance, (QPrinter::HighResolution))
++
++QPrinter* highResolutionPrinter()
++{
++    return s_printerInstance;
++}
++
+ PageLayout::PageLayout() : QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF(0,0,0,0))
+ {
+ }
+diff --git a/src/common/KReportUtils_p.h b/src/common/KReportUtils_p.h
+index 1d223f6e..9e4b111b 100644
+--- a/src/common/KReportUtils_p.h
++++ b/src/common/KReportUtils_p.h
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE project
+-   Copyright (C) 2015-2016 Jarosław Staniek <staniek@kde.org>
++   Copyright (C) 2015-2019 Jarosław Staniek <staniek@kde.org>
+ 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+@@ -26,6 +26,8 @@
+ #include <QRect>
+ #include <QStandardPaths>
+ 
++class QPrinter;
++
+ const bool DEFAULT_SHOW_GRID = true;
+ const bool DEFAULT_SNAP_TO_GRID = true;
+ const int DEFAULT_GRID_DIVISIONS = 4;
+@@ -173,6 +175,14 @@ int dpiX();
+ 
+ int dpiY();
+ 
++/*!
++ * Returns a high-resolution printer
++ *
++ * The QPrinter(QPrinter::HighResolution)) instance is created on first call.
++ * The global printer helps to optimize access to QPrinter when report items need it.
++ */
++QPrinter* highResolutionPrinter();
++
+ //! This class is wrapper that fixes a critical QTBUG-47551 bug in default constructor of QPageLayout
+ //! Default constructor of QPageLayout does not initialize units.
+ //! https://bugreports.qt.io/browse/QTBUG-47551
+diff --git a/src/items/text/KReportItemText.cpp b/src/items/text/KReportItemText.cpp
+index 29f63998..e05088fa 100644
+--- a/src/items/text/KReportItemText.cpp
++++ b/src/items/text/KReportItemText.cpp
+@@ -1,5 +1,6 @@
+ /* This file is part of the KDE project
+  * Copyright (C) 2007-2008 by Adam Pigg (adam@piggz.co.uk)
++ * Copyright (C) 2019 Jarosław Staniek <staniek@kde.org>
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -17,8 +18,9 @@
+ 
+ #include "KReportItemText.h"
+ #include "KReportRenderObjects.h"
+-#include "kreportplugin_debug.h"
+ #include "KReportUtils.h"
++#include "KReportUtils_p.h"
++#include "kreportplugin_debug.h"
+ 
+ #include <KPropertyListData>
+ #include <KPropertySet>
+@@ -217,11 +219,10 @@ int KReportItemText::renderSimpleData(OROPage *page, OROSection *section, const
+         int pos = 0;
+         QChar separator;
+         QRegularExpression re(QLatin1String("\\s"));
+-        QPrinter prnt(QPrinter::HighResolution);
+-        QFontMetricsF fm(font(), &prnt);
++        const QFontMetricsF fm(font(), KReportPrivate::highResolutionPrinter());
+ 
+-        // int   intRectWidth    = (int)(trf.width() * prnt.resolution()) - 10;
+-        int     intRectWidth    = (int)((size().width() / 72) * prnt.resolution());
++        const int intRectWidth
++            = (int)((size().width() / 72) * KReportPrivate::highResolutionPrinter()->resolution());
+         int     intLineCounter  = 0;
+         qreal   intBaseTop      = trf.top();
+         qreal   intRectHeight   = trf.height();
+-- 
+GitLab
+
diff --git a/dev-libs/kreport/files/kreport-3.2.0-gcc12.patch b/dev-libs/kreport/files/kreport-3.2.0-gcc12.patch
new file mode 100644
index 000000000000..ce48a27f1dc3
--- /dev/null
+++ b/dev-libs/kreport/files/kreport-3.2.0-gcc12.patch
@@ -0,0 +1,26 @@
+From 4b4b94f0bafcb49cefb1e453edd04a46d6ceacce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
+Date: Thu, 12 May 2022 05:01:48 +0000
+Subject: [PATCH] Fix build with GCC 12 (standard attributes in middle of
+ decl-specifiers)
+
+---
+ src/common/KReportDataSource.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/KReportDataSource.h b/src/common/KReportDataSource.h
+index 89490b47..0e45b644 100644
+--- a/src/common/KReportDataSource.h
++++ b/src/common/KReportDataSource.h
+@@ -124,7 +124,7 @@ public:
+     //! Creates a new instance with data source. Default implementation returns @c nullptr.
+     //! @a source is implementation-specific identifier.
+     //! Owner of the returned pointer is the caller.
+-    virtual Q_REQUIRED_RESULT KReportDataSource* create(const QString &source) const;
++    Q_REQUIRED_RESULT virtual KReportDataSource* create(const QString &source) const;
+ 
+ private:
+     Q_DISABLE_COPY(KReportDataSource)
+-- 
+GitLab
+
diff --git a/dev-libs/kreport/kreport-3.2.0-r2.ebuild b/dev-libs/kreport/kreport-3.2.0-r3.ebuild
index 2b551fa4ddae..820ffe91a5a8 100644
--- a/dev-libs/kreport/kreport-3.2.0-r2.ebuild
+++ b/dev-libs/kreport/kreport-3.2.0-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.74.0
-QTMIN=5.15.1
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.82.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org python-any-r1
 
@@ -40,7 +40,13 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 "
 
-PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+	"${FILESDIR}/${P}-fix-insane-delay.patch"
+	"${FILESDIR}/${P}-fix-cmake-config.patch"
+	"${FILESDIR}/${P}-Q_REQUIRED_RESULT-placing.patch" # gcc12-patch dep
+	"${FILESDIR}/${P}-gcc12.patch"
+)
 
 pkg_setup() {
 	python-any-r1_pkg_setup
@@ -49,6 +55,7 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
 		$(cmake_use_find_package marble Marble)
 		-DKREPORT_SCRIPTING=$(usex scripting)
 	)
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 8e09c791e355..c17fe029dcd8 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,3 +1,7 @@
 DIST level-zero-1.7.15.tar.gz 396788 BLAKE2B 794b1ee0955ffaa8671918cba8b31f388bfd8464bd59c3e041cc976d36831ee8e11ec64b1428613bd1621a6118b7794c908071756060f1bd8f2239e77f3c6817 SHA512 84600ff4fd18abffc8765c071454e7fef7a49d7ff711c97e326bae4a8e4295f2e611fac99bcaaf7ad555916d7078b36dd91b45cf57a00bd9e995fc028a40fd2e
+DIST level-zero-1.8.0.tar.gz 418939 BLAKE2B c07cf99bed347458fe1680ed572575591eefa2e5cc0a4c4390f2bac603d872dd42173ff691960831900ad9a00e0346c217376d233e07e49ee1f17be13f6dcada SHA512 87c5e3b60e01d7bfd0ddb80403207dffef36eca77119364d92b8b39c7a2d34fd9c59921790395414e162394060c79dd7a73f14bfc1b7fa5d4b05adc1274dd48b
+DIST level-zero-1.8.1.tar.gz 419208 BLAKE2B 0957e1694db80f655dddfae06f13224ec21ed5ee349fe032e3c8fc643a72128c81f9a8dc9f040ad04eb91bc43491f7aa61d6c438276feb05c5e3099e8f18d66d SHA512 b108ed9a8be77924891b543c5b36c50ade7e7e17a9319c9e7b46526c6d4ee1d10397095a3e9ac4b95c14bfb224eb3b608a8e4b4e23740cec217326b203db4136
 EBUILD level-zero-1.7.15.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
+EBUILD level-zero-1.8.0.ebuild 628 BLAKE2B 19db5e3da871d1eafc51d0cb941f4264bf2ae829720ccf185c6167d44aed4aa2f107c96c4009b48ca37c4516aeb77548886d6de8e06d140ebb1b309c73c6d640 SHA512 e61cb69efacfbd907551fcb62c3ebe4f0aeb5c1fbae007607d5af2bac778db2d40cbc3bbf9cb1d8d73cfd547fbf7fc6f2f82ece63f2bcf59a7a72591416cd899
+EBUILD level-zero-1.8.1.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.8.0.ebuild b/dev-libs/level-zero/level-zero-1.8.0.ebuild
new file mode 100644
index 000000000000..84d0079b1c54
--- /dev/null
+++ b/dev-libs/level-zero/level-zero-1.8.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
+HOMEPAGE="https://github.com/oneapi-src/level-zero"
+SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# According to upstream, release tarballs should contain this file but at least
+	# some of them do not. Fortunately it is trivial to make one ourselves.
+	echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
+}
diff --git a/dev-libs/level-zero/level-zero-1.8.1.ebuild b/dev-libs/level-zero/level-zero-1.8.1.ebuild
new file mode 100644
index 000000000000..af873cd942fa
--- /dev/null
+++ b/dev-libs/level-zero/level-zero-1.8.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
+HOMEPAGE="https://github.com/oneapi-src/level-zero"
+SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# According to upstream, release tarballs should contain this file but at least
+	# some of them do not. Fortunately it is trivial to make one ourselves.
+	echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
+}
diff --git a/dev-libs/libIDL/Manifest b/dev-libs/libIDL/Manifest
index ab26807b4c4f..034c455cb482 100644
--- a/dev-libs/libIDL/Manifest
+++ b/dev-libs/libIDL/Manifest
@@ -1,3 +1,3 @@
 DIST libIDL-0.8.14.tar.bz2 427149 BLAKE2B c4fc6e4da9d581ddcaeab492586406902b07f964e70b84352b1436e8bc214986141f0a3d40506a7f408a1919c31275e89039978b09c496d5164e673ec236fe9a SHA512 906dde087908acd64b209fe466a89ae52a6ea23601cb30092063a6e062b1b6640fc2d5f422efcdd52b2b36ce20e6c244da6205fde0bdcec787fe64058be7adac
-EBUILD libIDL-0.8.14-r2.ebuild 784 BLAKE2B a717542a376753bfc164e365436b4bb06cc344696b0044a279daabf1d191866aa3465d45dd74f592fa7de1508a23fca025397ca75f4f8e73b4384796db59a29e SHA512 6f5ecc6d5f96e5e0356a357b3163d60d7897339ae4ced7486a5638dee96664452d2930481b99e699066c7bdc5844d4a541f71f15347dc0bc581e813672c72e24
+EBUILD libIDL-0.8.14-r3.ebuild 762 BLAKE2B 2b7496df7fa2f2e3011f2a2f8cdf0b9c8e7f365eba1d6fa28ae95693534498d4cde2748c1d55840489ef2dc6684458749b68e74800781693d34d5a574a0be93d SHA512 b5dacd70ba1dee9550ba0e24963dba18845c373c0cad0860b224bde4334d2f9917a0d226589c8c3886ffcc8cc243528e3fc0a437948f7467a85c537f2d988ff2
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r3.ebuild
index b8846164f94a..6f9443f5ab35 100644
--- a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r3.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=6
-GNOME_TARBALL_SUFFIX="bz2"
+EAPI=8
 
+GNOME_TARBALL_SUFFIX="bz2"
 inherit gnome2 multilib-minimal
 
 DESCRIPTION="CORBA tree builder"
@@ -12,18 +12,16 @@ HOMEPAGE="https://www.gnome.org/"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 
 multilib_src_configure() {
-	local ECONF_SOURCE="${S}"
-	gnome2_src_configure --disable-static
+	ECONF_SOURCE="${S}" gnome2_src_configure
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 970f2aa1c6d7..f827741f27a7 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,10 +1,11 @@
 AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
 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
+AUX libaio-0.3.113-32-bit-tests.patch 794 BLAKE2B af169fe70e736bcc83bac7394a8c8ac737799a31b23abe1d5a6158f4f118dcdd90378f515279b861f2e5086258f233aa7778062e2e8025788ebbec158dd41993 SHA512 358bab7166887f19c3d64fb8911c4fc9fc0811aabda28838e11013f28f1a6911d5d4ee9b5369e998f01848f1f758cba63644b56ad3b1bd69d0d17f487898e9e1
 AUX libaio-0.3.113-respect-LDFLAGS.patch 537 BLAKE2B 6981fe9a607ddd4f9f803797f91271eaa403d05f65b3c2e778548b30cd486e15245a75a7f201c5f2a573828e20708d77f37d3834e131636228c49d4c697e6ba3 SHA512 726aa73e2d9fd15110acd024312f36293b841aa442a14b77b49cff4dc78961981ba09d406bc1105d31afdb4b96d29906ad4359c23c78a09e0e1d1b26e25ae11a
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 DIST libaio-0.3.113.tar.gz 49980 BLAKE2B 2379c88670310b36942563d10f29dfcba0f49391952ffe7fe18b0c917f33ef610405fe13297d1dbb34b7ad1d3066d4a32587a7fb20babba2f264cfc2ab289e57 SHA512 65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71
 EBUILD libaio-0.3.112.ebuild 2184 BLAKE2B 9af25ed8c5c41bb07f93f6139ba91ae70bac4131fa5171328b527842169bf68bf6c49a2becfc2539e1fc13a16ffc2026b8e208c6f2817d060c534ba5f8b49576 SHA512 695bd6ae41e784f76c16cf1a094f9d9282e8e9918d0612628ae587a669fbbc7bcd1d7276aeb1b421712b278333b33020e3ca1ac22e8be8e06676aff2e8970b28
-EBUILD libaio-0.3.113.ebuild 2355 BLAKE2B 1ce696094fab440ec1fdc0562a070ff4f057c6e8c014f60f71e4b0d83b889e8424eedc137fd84c1344723e7fc79beab100c5c461259bb77b794fecb71bce30d6 SHA512 263f9dd199c584dd82c4f531b85f09d0c6ce1c0863bfc3ba4658468a8c684940eb6bcc68d83d6977cda00144eaa79902b8b517bdd048a0613eac998b28c457de
+EBUILD libaio-0.3.113.ebuild 2230 BLAKE2B 40952c830cfec2f0434fbbdfeb4b21d8f8fef2ec4415d4d4e8553cc592749416ab3697977687ad804bc41cc2229d9115478b1ffad38fc7962ae4ff5ca454362d SHA512 7bf7c76aedd368874191895fec605ed64ae72b12bc3a497c3f4ebd1a2501c05cd4359b25efe42e96721bf256e4eb080340189d17662e1d6dcce3b123ce574c20
 EBUILD libaio-9999.ebuild 2175 BLAKE2B 09786c3428b1e0dafc1959dbf2eec9cbea4cdbcac2384414bf0c53014d355be3c00559ac19c5310236280829008e04fb9c9d008e49bd56c5a5568eea5eea33ae SHA512 c230b35ab0f8c39eb75fc01cae8faf6f2fe5fe6459fa9c11c029cc3529cd8960fbb33d4d8a26e45206a1d17243039126c9d40d1d4f8e917736bf6a970cda3463
 MISC metadata.xml 415 BLAKE2B 5f25806b5b169a85b455a39a9ba1995ccfa3c41e17ce1b8a7f2269167ba477fa0b76abc4ba46d977e5d6bba365b63e342304837a19dd57c0ac8d83e5846a2b22 SHA512 ad7bc8b579f5037c678294b77511af2b9027ed696a814bbbda6e3f630853040092b0abe20967d52fef7f65815c807bd49a2e57f392cd1035d1133e6d48009204
diff --git a/dev-libs/libaio/files/libaio-0.3.113-32-bit-tests.patch b/dev-libs/libaio/files/libaio-0.3.113-32-bit-tests.patch
new file mode 100644
index 000000000000..e8ad07a5cde5
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.113-32-bit-tests.patch
@@ -0,0 +1,31 @@
+https://pagure.io/libaio/pull-request/22.patch
+https://pagure.io/libaio/pull-request/22
+https://pagure.io/libaio/issue/21
+
+From b8eadc9f89e8f7ab0338eacda9f98a6caea76883 Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail@andreasbaumann.cc>
+Date: Jun 02 2022 11:33:11 +0000
+Subject: harness: use off64_t instead of off_t in test 23.t (EINVAL on 32-bit)
+
+--- a/harness/cases/23.t
++++ b/harness/cases/23.t
+@@ -72,7 +72,7 @@ static void fail_errno(const char *format, ...)
+ static void *thrproc2(void *arg)
+ {
+ 	for (;;) {
+-		off_t offset = 0;
++		off64_t offset = 0;
+ 
+ 		pthread_barrier_wait(&barrier);
+ 		if (exiting)
+@@ -92,7 +92,7 @@ static void *thrproc3(void *arg)
+ {
+ 	for (;;) {
+ 		char c;
+-		off_t offset = 0;
++		off64_t offset = 0;
+ 
+ 		pthread_barrier_wait(&barrier);
+ 		if (exiting)
+
+
diff --git a/dev-libs/libaio/libaio-0.3.113.ebuild b/dev-libs/libaio/libaio-0.3.113.ebuild
index c72cf7a83a27..9cc009f24bd3 100644
--- a/dev-libs/libaio/libaio-0.3.113.ebuild
+++ b/dev-libs/libaio/libaio-0.3.113.ebuild
@@ -12,11 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	# Has test failure on abi_x86_32 which needs investigating
-	# https://marc.info/?l=linux-aio&m=164996470108464&w=2
-	# https://pagure.io/libaio/issue/21
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	KEYWORDS="~loong"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
@@ -26,6 +22,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.113-respect-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-0.3.113-32-bit-tests.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 1ac368dc2656..27dcce97720b 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -5,5 +5,5 @@ AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
 DIST libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz 75204 BLAKE2B ccc7909f25946413cf39275d8565afca253b3a2676272e4d3833f030a114e7be695fe958d2d99868a20d03a2b9c4a1fcd7fdfba07325b7a9f7f39879851e0366 SHA512 cc60875b1c4ab06348eece442a59a4057d7e13f25605435902242558e8dd5e66aeeee6725b9bd2662ef89052d3614dc4577ed8c233e9b84236a75e771aa67352
 EBUILD libappindicator-12.10.0-r301.ebuild 2120 BLAKE2B 1463512cb7bc35e86a3aaa486f85637aee8269931b2385d2a6006743be5f7055b16308137631c7f867d5b7b3c7986b94c5736ec2ad7aece1b3f8b8f0d90f67db SHA512 a7aa23d5998bbf8e8e8c8d278fa0ab6acd3ddfe3e4f9a5513f2cec1e14cc2cdee062d76990d248add697f5dc01dd178fc53e0f0a18d16d5623f0a07293f5171f
-EBUILD libappindicator-12.10.1_p20200706.ebuild 2240 BLAKE2B 7def31f93e746be8ec9f41048af3cb47327b47c95e885a3350213171fd9759ae8430c9360410dd7c8850ebaa400ca84acbfaac07b4e9aef5904f9500f8d106a0 SHA512 72d1963126edea276b83d704467faaa3942f1c3fbecee8eb9d78187b021847b273a8176004f27406dace5169257091da31bc5dd29818c3b7b2568337c4bf1088
+EBUILD libappindicator-12.10.1_p20200706.ebuild 2244 BLAKE2B 74ee315275759d4c243ffcfbf12e9ab8bd3b8d9d5855806318412efc79c17e34ac989cffbb8e3f8fc96330dd42c36f6eb12b01a4f7f0d1dbc831709847514305 SHA512 cbb4e97aae7ab98ca9b1e8bebc7c16a0d4593c6a41187c1cb584a8a45ca348a4d6ce9f5bd99d8df93c0c3e29a9b06d6bdf039d02885fa478a813e0c2acc28ab5
 MISC metadata.xml 251 BLAKE2B 71830962e48cc35616817c1673c47891acadbeb1a79efa3b4c84d9e7057762d05d3577a5f46cc52fcc85d15ea8e2e5531a49fcef8c7080777f14cbaa8c40e10c SHA512 343a6329f93d5924cd8f3c055b83e5c8a97ead6c0991d6c9731e49617c4ca16b4261ebb5130a6da6dbec3e0d5a5dc016ea5f5f215f334d1792f8fd1c8335aae7
diff --git a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
index 3595bdcc5389..07df25070ff2 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://ubuntu/pool/main/liba/${PN}/${PN}_${MY_PV}+20.10.${PATCH_VERSI
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 120de31f6e8e..bea619f99f6a 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -4,4 +4,4 @@ DIST libassuan-2.5.5.tar.bz2 572263 BLAKE2B 24952e97c757b97c387ab4c2c4bf7b040f28
 EBUILD libassuan-2.5.3.ebuild 1283 BLAKE2B 1270a517953b68c7a4bdb90ab7f51f857af236b940fbf4695ebe4f645f21bbb2788eeafa8ac59b6c174b598940045f06bb428467a22863faf828fb3f9a3d049f SHA512 5cdb354eeec64ea499dcae2f1aaeb7d33288148e7e45f7e535de4bad9cbe3be58151220fc28ef9f046e500f2d3373f1fd4656274bf69bb31dbe9d8c23afc04a2
 EBUILD libassuan-2.5.4.ebuild 1284 BLAKE2B 2736d8d18a83ec2b531489b151ef2b6f9d9f8bb991eed531fbf154071566a50f12a9e8c2b9f2b33d212eb71d4800817ca17d170fb0bae72d4afde0faef971d7e SHA512 b5672931baaffd044bd156f93459316eb2a9d88ed6c086923fbb04c0a1906280af4ce20d55d87f3d3e776c50dca5ed25694454da618d5c193d98499f672e0329
 EBUILD libassuan-2.5.5.ebuild 1297 BLAKE2B 50b1ed338faf74eb267353a608f28e497daaf61877194209e486386304b4472d7bd9b05a9cb0ddb05093d7c618302d2fead65f4ef985386da428f061d93440f1 SHA512 1bed8caa76f27ac39eb9b6b80e7d715fd3d834a6fdb765090ccf481e9424c2c01dd801e8c0c1ed20051ac83e970ff7af526c191f73470236cec6b2e5a495ae0c
-MISC metadata.xml 870 BLAKE2B 9fb25d250f5db644be49d9858cd1a571c5092fe565c4a89603260337873f0f847990e57ea8c79f5bdcddc78b872fb239c510945eaa5665830c8cc611175b3458 SHA512 9c5faacb4fa39b0af06c5f0969b59f38a1abc583c0de06f7cfeff6b12a861a3a0e373782bcc098e93d576e3e1783014b4d869895670222babdbd5723b6fa0e71
+MISC metadata.xml 882 BLAKE2B ca08da3ad8be4a39e30e8e28f58bd5c4c9e70147a29bc55c9b71b45921141326ccd86d9086b6ae8652465c51fabfe4e024a00be0656042011a27423ac2146f01 SHA512 603d947fcaa43d364136558cd158610edfc2349fe0227259992209894f34fcd21f393fe81aa9f2d40ecb41377c8f7c1d6f8528d6a678709d28820d3b6f253b62
diff --git a/dev-libs/libassuan/metadata.xml b/dev-libs/libassuan/metadata.xml
index 7f2a3782fd3d..2a5683490ac8 100644
--- a/dev-libs/libassuan/metadata.xml
+++ b/dev-libs/libassuan/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<name>Lars Wendler</name>
-	<email>polynomial-c@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
 In an ideal world, Assuan is irrelevant.  Assuan's primary use is to
 allow a client to interact with a non-persistent server.  Using Assuan,
 this is accomplished by forking a subprocess and communicating with it
@@ -15,5 +15,5 @@ across several transactions: not only is there a penalty for an
 increased number of context switches, but also a significant amount of
 data is MEMCPYed from the client to a file descriptor and from the file
 descriptor to the server.
-</longdescription>
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index 0f3b47dc5aee..b93b270020f5 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,4 +1,4 @@
 DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
 DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
-EBUILD libatasmart-0.19_p5.ebuild 1189 BLAKE2B 4eb5d6698f65a4197988ab6082aeab688bc0aac064bf8335b46a84d09c26509357aa8c68c0c08d176d49aecef8980777fcd10d7f76656a2e90a7beab53f98d49 SHA512 2e57a6d7a8e30a9a1cc1b00fe3802d3e852e079ac1570641d0fcd123caef2b00c29519c703e42a7ff6c6a6dffd24510d19802d835bb50fec7a1600651160c772
+EBUILD libatasmart-0.19_p5.ebuild 1196 BLAKE2B 4a1d7b3adad930584e75b57ac2539c3bcac695cfee8e0dda1aec4a680915cffd1c451efe3d253da1c936fe61933bd790d0c12b4b583b268ecc40515072eca4cb SHA512 2ee9f57ef9042f329fbcea1b234e912c3c12ded94b7b393d5845c58dbbc5222991fcf950327ba121d6e5b4c351bcc38ba5bc3c331eeb185fb2b410695eb14d72
 MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
index b25a58b51f21..488991a76989 100644
--- a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 2d3cd67f6029..9c25d240a925 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,5 +1,5 @@
 AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f5960b4b7ca5530096840568dedf4e5f58f2139ab56c5f57382a80540294cb492f6ad619f174184172b3441af SHA512 de78131baa08874000cc52b0b21db4055246a653503301bd82c2e8f5818c955d63727d957d7834f1aed63abad42607480911fa0c2ea8d07d833ebd1f8b338039
-DIST libbpf-0.7.0.tar.gz 900120 BLAKE2B a67d83f52fde8a6d7771b0d31fbfabbc7d81013aacd733b1a71724a30eef47a085884f28687cb9e5a103a08a3bd9dde6eeb93f13fa4f1a04a386fe6887f126eb SHA512 8f1b13d60fc61176567f780a6c34314e5bdf1d2d3a8187c31b83eef74250729612a4333a9f739cd75887a8b7bd94446d6a1e0c8424565366051be9d24aa286b4
-EBUILD libbpf-0.7.0.ebuild 1084 BLAKE2B dc1a4b3f72e0b0ee6e2a02eaea9cced199292d3123ea561d4500ecb046aed913a3b36953ab0834835e21ba479ce5e6e5dfa2886f0dee3a11b3931f5923c346d9 SHA512 a28fa90a912fe5a83c0698f59461d24de22b7176940e248eb217910c58ad4a39f80a942d608bdfee98b256ae15d16f025eec497aeb2c0439cecb014c94fffda1
+DIST libbpf-0.8.0.tar.gz 942574 BLAKE2B c8e380d80f69f10da9d8a6ea4d19a53e8b34ed5a6072e1b57c61273f0714d13135c917224086de37246d9e47e9b848cbe75aced79278711a3007aa9e564db4b5 SHA512 8b034a9c8f23207638630b95ff95a651148a800589eb52f2fe09698bf3c4147f2e2008b24de45a70832cc7669cdfebd78bc491e575ca0b27de5c2de3b1fb5637
+EBUILD libbpf-0.8.0.ebuild 1084 BLAKE2B dc1a4b3f72e0b0ee6e2a02eaea9cced199292d3123ea561d4500ecb046aed913a3b36953ab0834835e21ba479ce5e6e5dfa2886f0dee3a11b3931f5923c346d9 SHA512 a28fa90a912fe5a83c0698f59461d24de22b7176940e248eb217910c58ad4a39f80a942d608bdfee98b256ae15d16f025eec497aeb2c0439cecb014c94fffda1
 EBUILD libbpf-9999.ebuild 1083 BLAKE2B 54ff762df027c679d66b248e7d0d2124acf163a40b9b8b6b5d73a574e1290215d5d60117310561b0b71893a196d1d9839648021b9919d902df6a6da97714d4d0 SHA512 c78ab45c28c6152569571587ae317eac4cf0f84157a395181eb4091e4a1f86ff93bd7303fc471ff0b00fbbb725ee538df22dfdd18395fb663095bd258dd8b118
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-0.7.0.ebuild b/dev-libs/libbpf/libbpf-0.8.0.ebuild
index 47b9e6026fa9..47b9e6026fa9 100644
--- a/dev-libs/libbpf/libbpf-0.7.0.ebuild
+++ b/dev-libs/libbpf/libbpf-0.8.0.ebuild
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 13defa0d2a94..df45688cfafb 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,8 +1,4 @@
-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 1291 BLAKE2B 4f6fe058d4a521a86cb43387840d3f1dda6f9b0ab91c145d5e69a0485da3663348f226990c3cbe519d8a6867e77d0cdbed3ee0a435aab2b681ce689f04b181f6 SHA512 9996dde6f046c7ed92b6c39e19941ca70e5dc917c6a622a4d51f089026668c5f38d3555a47f5fd623027af190d481429bdd8d5d0caa220201ddf9db3389f13d2
+EBUILD libbsd-0.11.6.ebuild 1283 BLAKE2B ede4095fdf806c5f306dde5762d3541044d0892393776c34d17be6801dbfcecba27a95838c30691382930c038be8fe2964a31ceffcd9346591fe094c9ac2d4f6 SHA512 b1c30307e6241bd65ca12e76259be6d37e99e5e02882edb1a3e76bb4fd4b840fed5ac6cff20683d6e136c5eee257890cf6d6bf08d241e0876e323b2790b63242
 MISC metadata.xml 363 BLAKE2B a1c4a829ec2dabf18360ab23b1aed4892f0650849a5287070fa15abffad4dc074d3c9c1fb698aa4da63262dcc1a4b57431654374c2f43764127daa389e7381d4 SHA512 5120ee7fb2fc2513df1a78a279d8d691969ee08d85ad2d960b5579069767eeb20087019a8a95d2f3c3f11d2ae721233a8283e47ad35d4c0fdbdef4cebc1ce930
diff --git a/dev-libs/libbsd/libbsd-0.11.3.ebuild b/dev-libs/libbsd/libbsd-0.11.3.ebuild
deleted file mode 100644
index 1551e7d7f73d..000000000000
--- a/dev-libs/libbsd/libbsd-0.11.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-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"
-
-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
-"
-
-pkg_setup() {
-	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
-	if ! has_version ${CATEGORY}/${PN}; then
-		if [[ -e ${f} ]]; then
-			eerror "${m}"
-			die "You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of 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/libbsd/libbsd-0.11.5.ebuild b/dev-libs/libbsd/libbsd-0.11.5.ebuild
deleted file mode 100644
index 55d75e728bd8..000000000000
--- a/dev-libs/libbsd/libbsd-0.11.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-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"
-
-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
-"
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of 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/libbsd/libbsd-0.11.6.ebuild b/dev-libs/libbsd/libbsd-0.11.6.ebuild
index 780db6c0ee15..f01b8521ce0d 100644
--- a/dev-libs/libbsd/libbsd-0.11.6.ebuild
+++ b/dev-libs/libbsd/libbsd-0.11.6.ebuild
@@ -13,7 +13,7 @@ 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 976d25a372ef..0e2fc1de3b82 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -1,4 +1,4 @@
 AUX libbson-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 DIST libbson-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
-EBUILD libbson-1.18.0.ebuild 1004 BLAKE2B 1bce67d6f1559c7508d8d4c2a3f7ca0799a078d88e84fbe2156da2d358c4fba782eb2f48fe064a764149fad7b870d3629e1caf13f1503538883a4067e1cd03b5 SHA512 fde724848c1b16725e9526f15ca385eec241915016da5cc235162f768de4e002f69b95f9841f9e94dae7701c42914b641a011aa0bdec163c7745a4589f28eab9
+EBUILD libbson-1.18.0.ebuild 1011 BLAKE2B 69d386e2445294336534123136d5185179bc2a8c848dc554d2bc21cb555526a2b4fff97a7c5ac2ffbeb56fad3543d5f25027d329a46dc6bcc5bc525c938f0e4d SHA512 b36a3a37f4e40c36c3c4da52acbb10571d663bb1a4021ef59319ab4f97350fd8b6eb1d344433182ab14c1295f19f29f21aa8c4a0a12394931e4c75caaa1c4119
 MISC metadata.xml 334 BLAKE2B 1ac3657fbaff07b8c50acc95b9df44493770dee67f965a7489b3483d0038c0e5c41a7ca689c7005d2f766993fa1747d0bbcd6277dcd5d68630480e9d58beb323 SHA512 e71f29845e2f49c78bf3f515c601eaf6e01b4fba2c19d78cac11108e49c7f0eb85f24e374843553ec9b139c60fa31d3a9574f30d21225c848fedcf4b317fb6f5
diff --git a/dev-libs/libbson/libbson-1.18.0.ebuild b/dev-libs/libbson/libbson-1.18.0.ebuild
index 6d665fd56c4c..3a0463bafec2 100644
--- a/dev-libs/libbson/libbson-1.18.0.ebuild
+++ b/dev-libs/libbson/libbson-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~riscv ~sparc x86"
 IUSE="examples static-libs"
 
 DEPEND="dev-python/sphinx"
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 5d0ebe9807da..3636b7e01ada 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,7 @@
 AUX libbytesize-2.4-no_Werror.patch 827 BLAKE2B a9192908e7ec0bad0cd4d1f853fd6f48a17977380d6f2e6a0c8255058d1e3ebecbfdaff68311f70f8d26291ed0c917dafb8f7d85fd5ad8f097ea929f4a200677 SHA512 6972e86cdc8de7f27b850742c4e0d8c492e354c1a526e103f4f4ec080cc6543db7ad4abd54a9674807521d083eb19fa811e351942330a73591e0a9700e876bd7
 AUX libbytesize-2.6-configure-bashism.patch 1239 BLAKE2B c579abd45db89e2c252be853edc2306b7c29ea4d74d9c1aeb5f6d937456fb1386f19f7dc114d49959a89ecff641eb63473447478851f60d4a3dd169274af5577 SHA512 50e3f5adde12a809d7356429b39e8746045a88587e21111dfc988e723ee59207d1c786d2405c1a8309b9a92b47512845d11767ed84fd849b2c2b4fe169e7a79e
-DIST libbytesize-2.5.tar.gz 439194 BLAKE2B 8d2cd82cea1e95f3368eed5855abfbc89b410fe1d627f7cbe69974f0d1fc89b600c93ad242816a37c3585b8318fcce77ef0fe6ab349d10f34a8be4c69303e343 SHA512 730d9c84bfc7199424fa34de5037dd9187d60c1f32d82cedc3e395167bf39a98a3b7f20b15f154206e797144c11de05ae0f606e0af6a2157ed946f138a346ad6
 DIST libbytesize-2.6.tar.gz 444795 BLAKE2B 5f89b2c614ebdd8efd3ac0841ad99c32309bdb33236373a0c9b007415a2f40ff30a0edcecb56947f2f41403cabb6a6bff68c2e4ce52e322df15d6daa3e10d2af SHA512 f6e72b763216c54c08318d090d604791c61cd5a3e683ffbe6e9d01de850661bd4e8a3adeb85c6fd0fb60244e2e128292cbae06c0aa2d1fe9f34104e64af8210e
-EBUILD libbytesize-2.5.ebuild 1609 BLAKE2B 6508a1777cf4e28205e371a9bce0e669cb4a5db58af622f9ed1814e3036924ce60ae75aac6ad3ea16fb3bb3604e5f31180797947995e880d2c9a86791e36f794 SHA512 febcd1883b9cee736fb08632c77b10bdacb443e0c2177ecfcd305dbfd4437bcf3fba431081e822f2a33b7212faa3c63d31200f26ae7e074ea8e8e27ecb67e625
-EBUILD libbytesize-2.6.ebuild 1632 BLAKE2B d76ce8a93b59f15d0e26fd02de51ce5936b42e9f1c670a62404b760758f7cb2b1706daaaa5ae86f31f6448ee103716be9a0ab55d66a8abacc33b9fee61bce08b SHA512 f4db7184424318c99f6f9fd51cb5a794b6347eadfa412c24b548916fc4b7e3a268fc781c6b04a126309a0a1c0899a0b031e0bdf8d53bd92f3a183db5b60faa0d
-MISC metadata.xml 426 BLAKE2B 9476445b939bba3c8cc648a30455b653fb77660e010bb8238af7f7773617d28304986dccdb856bff949ca30c8296bda26ecd0cc2d085609b4bcd891c0ed4f110 SHA512 bdb43b7259039d6170cdae6af640bd8eb5e84277db1fb28f51f3eace267ad81ae0546c805ad929b78bab4c5b8603cea2dc9b5a610787a0b7413f32bcf30ab97a
+DIST libbytesize-2.7.tar.gz 445367 BLAKE2B de5e48b4e17364308c19bbf8e8d68f88ee9e79c9b99d77a81f9f7a1b65e09c2af0ca1ae28ac30ad1b1820335afc1aa4a2596cff487cfd770f04fda0fb38258cd SHA512 3f2bdebad1e145227d7c81b25b8832ab9f984513c35d81254f68c0cb50b1883f3b96fbb258d7c8223fb284d79dc4ec8b01beae3f7687cded629b269ef5b7210e
+EBUILD libbytesize-2.6.ebuild 1625 BLAKE2B 3eaf5e035ff1830a2c74b239e25e1d5b3ddd54db029f2485e3351cf128a282fd8da10bc6ccd41b96c1d530ddce019ba5dc22e019cdbbff4b6f21466e99e25cf4 SHA512 cefe63b638b9ed169a1b09d473e722181edc28b931360c00f739f1f0b3d317146081cf80f354f6473aa1ffa67b27b6e06db71f6f9b2b10c2928742835de56b8e
+EBUILD libbytesize-2.7.ebuild 1591 BLAKE2B ad716adb1ae6d61c33b5c2ca8c57396d617120725abcda34b0752445fe2330f009934025c9858dfc296a8b630ebd7a33ba1c92a665bb3e01b8a012440391c60b SHA512 ed7666f64c1f831fb82415f85a86a350535eea2b88609e627ce179acfb2f15aa65094877fb9f81b03c8277e4c9d74cba0ef186e7202bfb269119a91d9a7b3cea
+MISC metadata.xml 337 BLAKE2B cb5eaaef0035e6e9f6ef742190eab40898a8ef60468b2038963676db9ab895c45922dd19bd85b919f883ee5db70c46e88aa6ba3457f32d05ac90407e4213c4ff SHA512 0bdd121bd62a4e2d8f5c24a6913f4a25e6d14a1280f7a4c161c3feca96b371151e3f53f22d7eed3f32910bc36f2c424d29d47f89898961e1cd0b023c4aa06c18
diff --git a/dev-libs/libbytesize/libbytesize-2.6.ebuild b/dev-libs/libbytesize/libbytesize-2.6.ebuild
index 84be8f1ddd9e..65b727521c5e 100644
--- a/dev-libs/libbytesize/libbytesize-2.6.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize"
 SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="doc python test tools"
 
 REQUIRED_USE="
diff --git a/dev-libs/libbytesize/libbytesize-2.5.ebuild b/dev-libs/libbytesize/libbytesize-2.7.ebuild
index 9afd519fb6c1..c57dc622514b 100644
--- a/dev-libs/libbytesize/libbytesize-2.5.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize"
 SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc python test tools"
 
 REQUIRED_USE="
@@ -47,7 +47,7 @@ PATCHES=(
 )
 
 python_do() {
-	if use python; then
+	if use python ; then
 		python_foreach_impl run_in_build_dir "$@"
 	else
 		"$@"
@@ -66,7 +66,7 @@ src_configure() {
 		$(use_with tools)
 	)
 	local ECONF_SOURCE="${S}"
-	CONFIG_SHELL="${BROOT}/bin/bash" python_do econf "${myeconfargs[@]}"
+	python_do econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/dev-libs/libbytesize/metadata.xml b/dev-libs/libbytesize/metadata.xml
index 75f6ddb108b0..947560c105b5 100644
--- a/dev-libs/libbytesize/metadata.xml
+++ b/dev-libs/libbytesize/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>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="tools">Build bscalc python CLI tool</flag>
   </use>
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index 923ee3c40422..6a3fd1085e99 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,5 +1,3 @@
-DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
 DIST libcbor-0.9.0.tar.gz 275405 BLAKE2B 7e78722650c702552dda4844615c454989281abe8c45ba3c9168af16e9d440a1b7e4e0c9afd89faa48e74ba85dcbe0c7733eec3e44fdafc0ca340e97574fe274 SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0
-EBUILD libcbor-0.8.0.ebuild 1400 BLAKE2B 7ac71bd26273ecf58e7aad467dde3ce9ff481df063cc8560430c83315df0811b6449d554fb5d07cf759c7c6d43ad582891b5d77bab131c47886e3ac6a10d9c64 SHA512 8f5a022618f982241debf0dae641c32449c2c7d37099b70efe390833d371ef498cd76556bac9e31431f9da70bedc33f117accfab72ed7203b405a0f56324b95f
-EBUILD libcbor-0.9.0.ebuild 1421 BLAKE2B 4ba52e47b9f5fe428491509f28d4d0b8ecc0176c3d1ae40ede58fd08508425e3f08705c1874a6436e0914352d85b100ed9cfe9af232fb34f2ddbf4be0cd971c0 SHA512 3f09ae08fcce834dcfb9fd0124c7215026144a0253248a7fd4a098ea6a8ed8cfdbc2ac0c305938963896c05a223609919a5d164de2c0bdb59ad1e50370f4d9db
+EBUILD libcbor-0.9.0.ebuild 1414 BLAKE2B 56e45e6db83928f0ad0540c7c3e780482f1cdea38ce4694cba646c56a436ef8796ebb6be5bdbc64f46ee752142ce62350cb36cb293d6417be323d74b7a5b9019 SHA512 8f95cfe216b2ad4a66dea0d9f4d7cc30203e5d6cbb1966c6256e69d3a546751830d6f75f292c31204b1c06d2223686a04795cbb9d6b6dbc2dacdd87140b510bc
 MISC metadata.xml 354 BLAKE2B d9752402ef9faeeaea114dbb4500672b2f4afd3c76787723c7b8037de18bb97e76079da1365905aa1b13d6852302632c7bcb46b8a685c90b5d04cb479c066c21 SHA512 bfe13a6ade46439d252cf3848a006b05ee8ac053fd80b091d0f01a2a67fe4fb1018ddd15d3a410f9061e59001f1dd448caa0a063e5fb5df180864cae830d02e2
diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild
deleted file mode 100644
index 78a7fa5584d4..000000000000
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{8..9} )
-inherit python-any-r1 cmake
-
-DESCRIPTION="CBOR protocol implementation for C and others"
-HOMEPAGE="https://github.com/pjk/libcbor"
-SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+custom-alloc doc test"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-			dev-python/breathe[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-util/cmocka )
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/breathe[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF')
-		-DWITH_TESTS=$(usex test 'ON' 'OFF')
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		pushd doc >/dev/null || die
-		emake html man
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		dodoc -r doc/build/html
-		doman doc/build/man/*
-	fi
-}
diff --git a/dev-libs/libcbor/libcbor-0.9.0.ebuild b/dev-libs/libcbor/libcbor-0.9.0.ebuild
index e232a2794eb9..5878e0247683 100644
--- a/dev-libs/libcbor/libcbor-0.9.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 8c5bd9c9b2b9..198892cc3cec 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,8 +1,16 @@
+DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
+DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD libclc-13.0.1.ebuild 1431 BLAKE2B d5dc6a4642688b46630bb71983f2a12d221dbac023d838cf075ad777cd9221c4426a53f92bafd60003acc973a712666846446937f5e8820d7428205ea8e9a2a1 SHA512 dbab9cb1ba8f5535932f4dd69d50561763ee61041d727a2d23705f0229d6f9f9699a2e9ef89e0844e8045c184b54cf9d425496bbe75857b555c27bf4dbe3aa75
 EBUILD libclc-14.0.1.ebuild 1454 BLAKE2B 6ab617ff1ac0ce7f190015bbd78a2116bc0d2c92d6ff87b9f5e093ec81cb91abe17da8d2f6bc2e97cbefd6bfc1a45249a082c01e654a4f87f2ea5ad635c2340f SHA512 4dc33086bab44e6e9ba6cbb98a7e985c4f0a776baa0ca4df81065ab4b0a0a26dbf42e516682df995c996f982a930d94311d2bad1c73cea5133c76e06780b21af
 EBUILD libclc-14.0.3.ebuild 1455 BLAKE2B a6a252b3c3d8df2bf45a8e37f9f6168663236b097fdf63f451c35557e4cb4167b3fa104a67b39bc83504e4eba82efd15033a0ef89f05be7d67b6686a67fd83d6 SHA512 22a58deaad2de4836ea9e4d5385597e9f4deb96b0285ee66064f46465a10067423490f9197d78b7d137aa65bc28d1f4c90e6ad2905d3be03e589f807cec89fc9
+EBUILD libclc-14.0.4.ebuild 1453 BLAKE2B 8d049f8f1d7b218f164ea21d289ead001d611c2c2f2432ad4661cece52a19ddcc36090d30d4b611e05403d9141c2a23a68df0d3f627ab2dc4f502b2314c4d2fa SHA512 9cfd836743a72ae4864d89464485b7b7c8e546b43db01b4b973dd50cbb90f0a3e5759e5fb348dbc8e4e73d576823dc6b273e27c9083d631a7fcaa45c6965fa0b
+EBUILD libclc-14.0.5.ebuild 1455 BLAKE2B a6a252b3c3d8df2bf45a8e37f9f6168663236b097fdf63f451c35557e4cb4167b3fa104a67b39bc83504e4eba82efd15033a0ef89f05be7d67b6686a67fd83d6 SHA512 22a58deaad2de4836ea9e4d5385597e9f4deb96b0285ee66064f46465a10067423490f9197d78b7d137aa65bc28d1f4c90e6ad2905d3be03e589f807cec89fc9
+EBUILD libclc-14.0.6.ebuild 1455 BLAKE2B a6a252b3c3d8df2bf45a8e37f9f6168663236b097fdf63f451c35557e4cb4167b3fa104a67b39bc83504e4eba82efd15033a0ef89f05be7d67b6686a67fd83d6 SHA512 22a58deaad2de4836ea9e4d5385597e9f4deb96b0285ee66064f46465a10067423490f9197d78b7d137aa65bc28d1f4c90e6ad2905d3be03e589f807cec89fc9
 EBUILD libclc-15.0.0.9999.ebuild 1465 BLAKE2B 9be755012d8d257f856890aab71593255289ef268cc448ea3de19393397702f0a59c9158ac4e4422333a07c9f224c6ec0e057d197cf6e3a60d84cb3ab5bd70ab SHA512 b9c034a32197ff5a434a8f130afa190f3afbaba5fef1ee3cd0de046815e8b783ab50fbef3c86d661b956fbece1de0da32f5a5db230c27829c3bc9151fd8fa563
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
diff --git a/dev-libs/libclc/libclc-14.0.4.ebuild b/dev-libs/libclc/libclc-14.0.4.ebuild
new file mode 100644
index 000000000000..a897f381b9e7
--- /dev/null
+++ b/dev-libs/libclc/libclc-14.0.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+LLVM_MAX_SLOT=14
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		sys-devel/clang:14
+		sys-devel/clang:13
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	# TODO: spirv
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libclc/libclc-14.0.5.ebuild b/dev-libs/libclc/libclc-14.0.5.ebuild
new file mode 100644
index 000000000000..340dfa3ea626
--- /dev/null
+++ b/dev-libs/libclc/libclc-14.0.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+LLVM_MAX_SLOT=14
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		sys-devel/clang:14
+		sys-devel/clang:13
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	# TODO: spirv
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libclc/libclc-14.0.6.ebuild b/dev-libs/libclc/libclc-14.0.6.ebuild
new file mode 100644
index 000000000000..340dfa3ea626
--- /dev/null
+++ b/dev-libs/libclc/libclc-14.0.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+LLVM_MAX_SLOT=14
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		sys-devel/clang:14
+		sys-devel/clang:13
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	# TODO: spirv
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest
index 564b846d809d..b5722d46ed7d 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -1,3 +1,3 @@
 DIST libconfig-1.7.3.tar.gz 3026416 BLAKE2B 94301be4d6e472fc9daeac7a04074855737ddda94bb5748cd0087fafe192cf674ea1c020808ebf855372188b6b27a57ed185323fa26988bb1fccde0566617cba SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4
-EBUILD libconfig-1.7.3.ebuild 1055 BLAKE2B 9b33ad3dc7f77aeb78d11cdf827ba3d709455036e97c868392e7bfc03d738e23ad15f29bdd5bcf70ace9bd98f97bb61a9cf86b52601d013ca7430492e9220f9f SHA512 e644f1dd159e8c3e6a36ef58281285e8f8fdba7420166b66e5f6760b32bec2e3fbd9588e8e478b56ddee816f4dc719085c376e22ee5c59a0a30a868c64ccb140
+EBUILD libconfig-1.7.3.ebuild 1062 BLAKE2B d6d2af94438086cee207722efb26dea6e76ca75c9393c3da6c9034a3a710db24fc3b2de8fff1d85c8bc12a790682d165db9cc2afb5d64e0845c49c762d9507ea SHA512 669b0484731db80331dff6ec1ccca48e0392ddf55c19ce0812632d95e06e41763af6451004b095fca9c2f43278cd1ac4dcb5263cddce187eb8df76bc9f1de1a7
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/libconfig/libconfig-1.7.3.ebuild b/dev-libs/libconfig/libconfig-1.7.3.ebuild
index 5e436a5f4869..4f32196aa919 100644
--- a/dev-libs/libconfig/libconfig-1.7.3.ebuild
+++ b/dev-libs/libconfig/libconfig-1.7.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/11"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="+cxx static-libs"
 
 DEPEND="
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index bafc9a21db73..a51316511892 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,4 +1,4 @@
 AUX libcroco-0.6.13-CVE-2020-12825.patch 7600 BLAKE2B 2303fb7044f7458e5861b0d054bb6c6137265dfa080d6e93b0c10f8fbf0c02104a6f14248ef5a95e1967fa7c55aecfc31f8d15cfb24d792d530f10e9c375a3d3 SHA512 f1704914cf6bad4b530e239998d7c2be7d5bc8b2e071526c04b5797a52513cb50289ca575639872217a64dbe6adbc7e0a352e9427a4df5cc98f36f13baf88a33
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
-EBUILD libcroco-0.6.13-r1.ebuild 1366 BLAKE2B 06f0c1795c8b74e897fffa70d26b4d3a81ca86eeb99a47b0d3ad3eae864e664d88297f875b7e83f53b9d1ff4b16c9daf7b95d1e90add9a91e4a79d9951d5d3a9 SHA512 99a7c151b42a330b22051743c5c051f6951eee15319d4a526a2b1c29eb27f6ffc558e8bc13c50cbbee86286536c681c7c5aa3bd356d75e919e6ab197283b5f5e
+EBUILD libcroco-0.6.13-r1.ebuild 1373 BLAKE2B bd39c8643a31c61d7bee0c81ab4fd649c2e1536e62cce4c4df55fe094ad19c5d599b64e0cda2e52a2e44329346e9e6e211ff32876508f69c6c4ddbace3293fa6 SHA512 59b3298612124760ac6ca73588a36dea05a67d2b4a265abe819071f8215ae5cd71e8ac8479b8449c3c76a9577d59c7ce639da0b60da0d5feef517661207b809a
 MISC metadata.xml 678 BLAKE2B c5691f3979335a9509a9600595ce77672626e1b220cfc5a1bf6003e0c102632988d2198e763853de4ed76e091a28f746e2b27b1a2501085d93240c5628a4b712 SHA512 1d3d2b39bf54fdb1285e039785344e6d151f9dd8147e7632dc5a979a847a670fceb69a7f4c1d655fdf19cf3848edca954b965e7e1075df0a15f0f7a078a0626d
diff --git a/dev-libs/libcroco/libcroco-0.6.13-r1.ebuild b/dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
index 6dc6bb37f910..2bbce851d189 100644
--- a/dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/libcroco"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index a55f0b35a82f..05eb9b86ff96 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,4 +1,4 @@
 AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a822bdd78918791bdcf367775d9f80a9bfcf7e82dcd3b4f45c4f10af31be1bacf4ecdbe119482ac6ee705d99967cf9826 SHA512 19aafe2b9d39484ad01544ad3c7937d98b0e8216de1ed8cd331106004f565a6c094888f1a0fd1f540c790728274079343d5db060a0e1a9647d600cea675994d1
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
-EBUILD libdaemon-0.14-r3.ebuild 1432 BLAKE2B b8ec451e92fe26d82c4124fa025cb1f6dc26eaeaf1eee0cc97dc8b8a696ff41f165d36cfc3ba75313a49eeb8eb7e6f375d47def70decce0df1a25bc62cad53e6 SHA512 1f23aad5a121eed4331f836a1b3748bc04df5697d0250f5e4e593e4757b7b2babe34836529ba4c6ba0b6975ad35ff987ec81900b7efd46692b1acf358e2ced37
+EBUILD libdaemon-0.14-r3.ebuild 1439 BLAKE2B a2e4bf02203e21bd62bf8249b962b4081771791c8c9c546933ee80ab1b32c0bb68a08a39d449100d5d2d5dfb474da9493a4482d93ffeba7e2fd088f13f58643e SHA512 d16ceda7c373a297e64cbb5742303bc886b5b565d13928bf0ab1ef5a66974a9138a47a591793b7849a575f1647041eb5d9b89994c8807c68eac22e68c9a0bcc3
 MISC metadata.xml 264 BLAKE2B d8719650b7f42f0fd73819de2c5bea03b775280ea9d8442332f5a47c48d15ecdb91e085f0c9e4d22b0c3850b0049efc0f169a1e147fb21d3ae9b0987b99ee82c SHA512 644fe886ad7c42724a4a622cce4e716461a751eea6307cb04a6a070d3cf5beb46f30c159539b008fcbbee5afbbbc8a4182df448d12b842b30c41f868c7a60e5e
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 9e21641bd3fa..6e38f45fae5b 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples static-libs"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 532f5db749a9..af6f7d9b6dea 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,3 @@
-DIST libdazzle-3.42.0.tar.xz 450636 BLAKE2B 0a77a9ceeca2af8a001b75dbffa04cd385be89d9fac898e6b90111d240b409a54357d9668ca33e494dbb0ed932f16605f363aa69b92c548981be0db971b67dfe SHA512 db6ac54deba034627726747b8c15472aa2f640617473825698e23ca6527d5b69e9103dd82141e82b7dd7fa8bd57eadf054cdd300d46e1b65ced0fffcbc55a301
 DIST libdazzle-3.44.0.tar.xz 454948 BLAKE2B d42d98e820e7af18fc8c8a75f7b77b5d84f03a367925d16b35fe88fd5a74e69d2f170233dd6986ad47dfc4cdd2f9690323d1053341ecb11e324e758f63a25bba SHA512 eff3f65cbfd4f780afb4bda6137e8d4f1ee2cd0ab21288d07315415944ced1aa2d7ef89c2b7ebb373ac4c46b91d341bed063e9c7d1c21fa083514c8c3c9c518f
-EBUILD libdazzle-3.42.0.ebuild 1701 BLAKE2B 52083fcba3194aad21f21aa6eee9819c4c721be3417be40538db6febcda99ae4451d43bef4da00d3945b06c271dd4a7c9ea13f4b0d55abf0ffd1cd0dedbe5742 SHA512 dcbe89393adb92734e7b22612ad9bb88bf5de8fd4ffcd49c943009e10c6c6dfea6a0e358d904f96303f01522e98308c8a9248867bf293024320c324a4465da73
-EBUILD libdazzle-3.44.0.ebuild 1686 BLAKE2B 959ffcd47783ee28464fac52b01862a7321f3c35b693f7cb23a744303ffb8c758fa111c57cfeb05edb7cceeb0248710628725869e760a82ab556275a94b16fc7 SHA512 d08758411ad0a3605f8d236817ede25176dd97302cf247c6d7170a94474534e5bd55f74045122e6007a13fe83ad977b02298161839efda6c4c00c16a9137c056
+EBUILD libdazzle-3.44.0.ebuild 1683 BLAKE2B 0731e73965e3b190e26348cd6f558bb0fd5ccd13e3429fa873b15535477435d6131135c76ffb36de8fe3c57ac1dd9d42d5da016709b1a9c271aeb44a2ec71792 SHA512 f9d98cf79f96998ffe012f78b2428f7ff15dc3ca8040ac62f07bcae058c1c5d98a635e02d9524e070f1341cc1ac2d1b4a4f94a6e5da7d4b465834bddf53ed06c
 MISC metadata.xml 562 BLAKE2B d07bb8d5805ff6659c6984057084cc5daa294cd33d87ba9f152aeab79b425626673c83e2cd5046914381a8c0432cfd34994fd61aadc1c9263367ba9c9506903f SHA512 be5ed6332538f24044008dcb91b93771ff7afb73e5e7d2351474b6a9d3dca57a790cb27831ca869057ece03989c49d7e49213240cb1c1f0c5c93346a4a157710
diff --git a/dev-libs/libdazzle/libdazzle-3.42.0.ebuild b/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
deleted file mode 100644
index c14f4e044587..000000000000
--- a/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Experimental new features for GTK+ and GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
-BDEPEND="
-	>=dev-util/meson-0.49.0
-	vala? ( $(vala_depend) )
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false # extra trace debugging that would make things slower
-		-Denable_profiling=false # -pg passing
-		# On linux it'll always use a vdso based implementation that is even faster
-		# than rdtscp insn, thus never build with rdtscp until we don't support non-linux
-		# as the rdtscp using function will never get called anyways.
-		-Denable_rdtscp=false
-		-Denable_tools=true # /usr/bin/dazzle-list-counters
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libdazzle/libdazzle-3.44.0.ebuild b/dev-libs/libdazzle/libdazzle-3.44.0.ebuild
index e2f4a4679d48..bcec09a0e1ad 100644
--- a/dev-libs/libdazzle/libdazzle-3.44.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.44.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index db9a96d0f2f8..0f05b502c2fc 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,4 +1,4 @@
 AUX libdbusmenu-qt-0.9.3_pre20160218-cmake.patch 7959 BLAKE2B feef71cd51c36607b60104d0ca24eadd269e79ad22a633625b1b855137f97b8da645e15b10a374911bb5e9ea33b71e17d9336211233f4f12155f3dfc5f28b685 SHA512 00db7fd1c5d90f03f0963abb413349043ef215cd7a9f41f78e4233ff53590a9b9854ad500b9899f7b344ce9853d8d8200abb31565fda855793e1edd6e76800c0
 DIST libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz 46438 BLAKE2B 66b1fa44f28b5f4d5fa09afa988ca793ae892a7aeab6290b1650876a992e27a15af5a6a999080aa4c499295e2fa3de768fe5f185b5df2af36b957766508c1804 SHA512 dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9
-EBUILD libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild 818 BLAKE2B db8b88ae62187cf9b757f0ca8e3972f69f9c37c15b2cd78c30917412421db9f34e72e04055df7b69f0b0f06ae54d7f8a0e2e2c2b959ff302108664baaa8e73a5 SHA512 ac4dd5571b4a2f0010bd028ddb70257a9fea66ee3add004547830ae24538f5725cd455f6b8852cd20a78768f8d7da706f12b865fc18bcb07acefab0dfdcc60c4
+EBUILD libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild 825 BLAKE2B e1265bee71b91c6762e7f0b3c0815c025bb442a53ecbef0815259eb706c34848ad85d3ffac4ab18ace717be5d72eb2b4516484dcd13e0e61e9a290afda51aab5 SHA512 abe38150c64cff90f421688a1736adb1d14b02733dfe6a6aaaa6640f86374eec97cc53fe7b6c1b86fb73cb447569cb9005801955e0788a4de712fa0e58709a07
 MISC metadata.xml 324 BLAKE2B b25d42994359e16a2d0609116619b3bb8b9ec0aa1bc5a8961dd5f8f878acf6f42bb5a0502e915c0d0af3cfdac390d9430072189364269d97662bd51677dbc24b SHA512 7eab0243281c926bdba43daff971de02d7c3a70b7f43d1fdff0d2402807ec9a63d0d86c50cd4a0f2f34ffca8760737f92bcd73aa5c8423929e35e7f5badace4d
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
index eb4f1fbabce0..e1c1e7580ead 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.ori
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 310bb396d9d1..2af414fd58d0 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -2,4 +2,5 @@ AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
 EBUILD libdbusmenu-16.04.0-r1.ebuild 3881 BLAKE2B a98ac44ba760b367bfb0473ece2d77419d6ba659700e412a8b6a6d335e7cb9d3e680a496621c2ac2ff0df2cb4d90345484a17b3f81feba56a549db6e3a1cc9a3 SHA512 23ff195bf5c1eb0e37f7dc7de5adf6e242b287c843d192544fca5234978c093bfea4a5159dd0dfe1db34d9c0aa91f86375e18baea1b9254a2d1678c677dd4e39
+EBUILD libdbusmenu-16.04.0-r2.ebuild 3860 BLAKE2B 7a0fffc637e98a01e9cb9af1402ebbc417a25cab400379f772aeeed96a6b97fdb8d249c1ba05c3e10ba21d160c3b982a9cc82fdbb731d64fe2d0ea3ab9ada256 SHA512 089545eb708a2c50539fbf4127847465d3deedd11bcca28554d4c8fa18e45bd6f08ed929f72a92534616fedaae98134186e3f62065a3182700fda12844d5ae9e
 MISC metadata.xml 362 BLAKE2B 30fac8611210ba6263d5a91f9975741f1c799d5b841d278ccdf440e67f7dc3040f9937a79bbf6028b1ff6d1f2389eea6746e0772048b7c9b71978cc75fbac20f SHA512 80dff178352278089470bd2465f750e336056cba3321719b18dce1188c5dfde302c6bc0efcaa84fcc049840616a9949fd1a39e143ca2c61e7a8eaeb317b74c4d
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
new file mode 100644
index 000000000000..4754b3f644b0
--- /dev/null
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MIN_API_VERSION=0.16
+VALA_USE_DEPEND=vapigen
+VIRTUALX_REQUIRED=manual
+
+inherit autotools flag-o-matic multilib-minimal vala virtualx xdg-utils
+
+DESCRIPTION="Library to pass menu structure across DBus"
+HOMEPAGE="https://launchpad.net/libdbusmenu"
+SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug gtk gtk3 +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.35.4[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] )
+	gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1 )"
+# tests also have optional dep on valgrind which we do not enforce
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( $(vala_depend) )
+	test? (
+		>=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}]
+		>=dev-util/dbus-test-runner-15.04.0_p100
+		gtk? ( ${VIRTUALX_DEPEND} )
+		gtk3? ( ${VIRTUALX_DEPEND} )
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-configure-fix.patch"
+	"${FILESDIR}/${P}-werror.patch"
+)
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if use introspection; then
+		vala_setup
+		export VALA_API_GEN="${VAPIGEN}"
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #414323
+	append-flags -Wno-error
+
+	local myconf=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--disable-gtk
+		--disable-static
+		# dumper extra tool is only for GTK+-2.x
+		--disable-dumper
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable introspection vala)
+		$(use_enable debug massivedebugging)
+		$(use_enable test tests)
+	)
+
+	local ECONF_SOURCE="${S}"
+	econf "${myconf[@]}"
+
+	GTK_VARIANTS=( $(usex gtk 2 '') $(usex gtk3 3 '') )
+	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
+	local top_builddir=${BUILD_DIR}
+
+	gtk_configure() {
+		local gtkconf=(
+			"${myconf[@]}"
+			--enable-gtk
+			--with-gtk="${MULTIBUILD_VARIANT}"
+		)
+
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+		econf "${gtkconf[@]}"
+
+		rm -r libdbusmenu-glib || die
+		ln -s "${top_builddir}"/libdbusmenu-glib libdbusmenu-glib || die
+	}
+
+	[[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant gtk_configure
+}
+
+gtk_emake() {
+	emake -C "${BUILD_DIR}"/libdbusmenu-gtk "${@}"
+	multilib_is_native_abi && \
+		emake -C "${BUILD_DIR}"/docs/libdbusmenu-gtk "${@}"
+}
+
+multilib_src_compile() {
+	emake
+
+	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
+	[[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \
+		gtk_emake
+}
+
+multilib_src_test() {
+	emake check
+
+	gtk_test() {
+		# please keep the list of GTK+ tests up-to-date
+		emake -C "${BUILD_DIR}"/tests check \
+			TESTS="test-gtk-objects-test test-gtk-label
+				test-gtk-shortcut test-gtk-reorder test-gtk-remove"
+	}
+	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
+	[[ ${GTK_VARIANTS[@]} ]] && virtx multibuild_foreach_variant \
+		gtk_test
+}
+
+multilib_src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
+	[[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \
+		gtk_emake -j1 install DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	# Kill old symlinks that Portage will preserve and break install
+	if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib ]]; then
+		rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib" || die
+	fi
+
+	if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk ]]; then
+		rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk" || die
+	fi
+}
diff --git a/dev-libs/libdispatch/Manifest b/dev-libs/libdispatch/Manifest
index a0ab9c8bec66..de619be8e20e 100644
--- a/dev-libs/libdispatch/Manifest
+++ b/dev-libs/libdispatch/Manifest
@@ -2,6 +2,8 @@ AUX libdispatch-5.3.3-musl.patch 1213 BLAKE2B 76db17275b46160840867ae2956b58f38b
 AUX remove-Werror.patch 1217 BLAKE2B f7ef18089abcd11fb8ed36980e681a804649b8ad8891b97113966c099bb05178604983359b79eb853ad6256a6c116fa8fdca116b29e2d6108c2a38fff01472a1 SHA512 0c17b1b36a02b401182a91e1f751f71b343f1d61ce7340230fdb13e89354316d0f2863fc3ea2f1a33bee6033c79e30e35024519c515a03a4d88467456ef340cc
 DIST libdispatch-5.3.3.tar.gz 591794 BLAKE2B 982b99227a1292d999639e7b16c1382a38dd6799a0ea1b83dd66333d5b6388be809127565fafc7f171dab9d8aa388cf67316d7eb6fa2ae2e1b8ccf660b32f0ab SHA512 b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909
 DIST libdispatch-5.5.tar.gz 592054 BLAKE2B 500ae44069063f202b48cfab2df1fb7fc012f1a1048d2460054e34f18629feefd38952d08f9de310d71774120a0516b4f9210147869e2ce34c266bf44e6fa0d7 SHA512 58ad7122d2fac7b117f4e81eec2b5c1dfdf5256865337110d660790744e83c3fea5e82fbe521b6e56fd0e2f09684e5e1475cf2cac67989a8f78dd0a284fb0d21
+DIST libdispatch-5.6.1.tar.gz 592615 BLAKE2B bbd495717456163b0740cd6bcb92d9dfa7a728b88ab6c3ec6c25bcd4bcc3575cb3eb5e93416ddf8293854c17566f4d0ef7ee4280cf15944ddf224e7439b59a5b SHA512 083a8ebdea87cc04f856db1833adcfca83b16568cff311123ccc6a835f73979ac1051f1733feacfa04155fcabc97f561738adf8e871468e808cf8048bea063b1
 EBUILD libdispatch-5.3.3-r1.ebuild 1065 BLAKE2B 34f48796234e44a1c856c7cbba8caded4998e8200ce2799820cb2cde28c72c882d459fad02723c2d77819db8be1e551a6065358811a20091d4a7ce011ea9e100 SHA512 338c0902dcf7fe48bfb8bdb26b695bc78325c737b7425ec31765e74f6ccf8d1d28e4b2a072d09436f3e85876067d0bdd665e6ee2b5cce9ab953e6b656cc8747f
 EBUILD libdispatch-5.5.ebuild 1096 BLAKE2B 9ecf38085edb6ab2a5a5117618892a1106a976cfc8735fe01ce8cba99168ce1aaf6656ec535b9429e988420f9194ed78d7f069ad7043a10d62d1d99de95f267b SHA512 eb842fd1d6908dbead8b360566d05a0b6a7818b7e28055faae20aae8dcfba3a4f835b080304b3f6d00007f7d2e0ce2b810ce528540732a9ccffc0c6f99afbaf7
+EBUILD libdispatch-5.6.1.ebuild 1096 BLAKE2B 9ecf38085edb6ab2a5a5117618892a1106a976cfc8735fe01ce8cba99168ce1aaf6656ec535b9429e988420f9194ed78d7f069ad7043a10d62d1d99de95f267b SHA512 eb842fd1d6908dbead8b360566d05a0b6a7818b7e28055faae20aae8dcfba3a4f835b080304b3f6d00007f7d2e0ce2b810ce528540732a9ccffc0c6f99afbaf7
 MISC metadata.xml 350 BLAKE2B 179ce6945eeec3c78414fb6dd66822f26ac6b629528da5868b44d3715355ec80acb1cc5dd8357b659f31877c83bfc10ae8b236367904bbbdd36d2ec7c1458739 SHA512 64646993f5469b2573385aa94fa578ae0e7645f4c5a30b631cf1d0de9ac5ef88270ba85e95f684b884631ec21d7ef31c4d68b563923901651da2ec631b0ccff5
diff --git a/dev-libs/libdispatch/libdispatch-5.6.1.ebuild b/dev-libs/libdispatch/libdispatch-5.6.1.ebuild
new file mode 100644
index 000000000000..af88a1aec21c
--- /dev/null
+++ b/dev-libs/libdispatch/libdispatch-5.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake toolchain-funcs
+
+MY_PN="swift-corelibs-${PN}"
+MY_PV="swift-${PV}-RELEASE"
+
+DESCRIPTION="A library for concurrent code execution on multicore hardware"
+HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
+SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	!gnustep-base/libobjc2
+	!sys-libs/blocksruntime
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/clang
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/remove-Werror.patch"
+	"${FILESDIR}/libdispatch-5.3.3-musl.patch"
+)
+
+src_configure () {
+	if ! tc-is-clang ; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index fca2f70a167f..7868fc64d287 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,5 +1,7 @@
 AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
+DIST libdnet-1.16.1.tar.gz 666619 BLAKE2B 74472af1bc97c4771909e926eb9b27193c50d665036672fc89ff21159408daeef090e682c5e76e19f31d04e802fb73edf01d1aa057b543568f534d31f8db375b SHA512 9c6899b42502f3892463f1ec694934cc3b02831222fa15b5a899868229366ed4e9cc728ea2c70ec857ee9d676d763b1e390f6878a597a33f7d1cd5a7bd870586
 EBUILD libdnet-1.14-r2.ebuild 1556 BLAKE2B aba5cb0562c56bd846bfa6a3c42d465c8685dd697f896d845500c5b4b238223d0eddbaa4b6d7eda48b4d820effc0450e5de4ef30c5bd04ea8a4e85416cb03249 SHA512 b4a021ba7509f2f36cb81f7fcad709119c55a2275137bfce5f2f764a122cc3f41c3da01a09f75f526d0ddff39580f6576a7bebf80a82caf8c7f017853c301113
+EBUILD libdnet-1.16.1.ebuild 1578 BLAKE2B 0b4a234b89a7c57bd110e034a8d398cb6718ea62e0d7ee78d3ef1c8f2a13f6cc34771bc4cd9490cd28c6f6543915df0af6e4a20f2ac9a678e5cdb991c15b5081 SHA512 cd84f76deb54e64422c77d69d613b45d05aa1c075ea82b8f8b0e0c1b05855b31f770dea5407e70da602b662b83733e285f1aee7a0a7dedefc85bbce8968582ac
 MISC metadata.xml 413 BLAKE2B 91e8ea8dfe7585b6bcce394bc63e466cd7094b8b12ecb4f6b03303b37575387250f81c85a3be03cf8b36cbe10ef724794c86afec5decb5f042d0cde5db2bfdc6 SHA512 af7f752fa0811cb6e57b2398a86f5c57bbc0af1e3392ff3c26af27568ae3ed5232f765558f5e3b01cb6a6e3debfe2b0b893fc2c3598776d94eb6318744ca6fce
diff --git a/dev-libs/libdnet/libdnet-1.16.1.ebuild b/dev-libs/libdnet/libdnet-1.16.1.ebuild
new file mode 100644
index 000000000000..112351021f1d
--- /dev/null
+++ b/dev-libs/libdnet/libdnet-1.16.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1
+
+DESCRIPTION="Simplified, portable interface to several low-level networking routines"
+HOMEPAGE="https://github.com/ofalk/libdnet"
+SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="dev-libs/libbsd
+	python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+BDEPEND="python? ( dev-python/cython[${PYTHON_USEDEP}] )
+	test? ( dev-libs/check )"
+
+DOCS=( README.md THANKS )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/libcheck.a/libcheck.so/g' \
+		configure.ac || die
+	sed -i \
+		-e 's|-L$libdir ||g' \
+		dnet-config.in || die
+	sed -i \
+		-e '/^SUBDIRS/s|python||g' \
+		Makefile.am || die
+
+	# Stale e.g. pkg-config macros w/ bashisms
+	rm aclocal.m4 {config,m4}/libtool.m4 || die
+
+	AT_M4DIR="config" eautoreconf
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with python) \
+		--with-check=$(usex test "${ESYSROOT}/usr")
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+
+	if use python; then
+		cd python || die
+		unset DOCS
+		distutils-r1_src_install
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libee/Manifest b/dev-libs/libee/Manifest
index 751a4141a069..1efbf3a2633a 100644
--- a/dev-libs/libee/Manifest
+++ b/dev-libs/libee/Manifest
@@ -1,3 +1,3 @@
 DIST libee-0.4.1.tar.gz 357116 BLAKE2B 121f7cbdea1978889b6fcc24bfabee0c64276bf060265578e7b8067d217ee6371dc6e49b7ac733aeb0abe57bcc1df1552029831bd7a6bc6b42431d3166f90037 SHA512 810cbca8077c975b045b6761de22642708b3555aa8959c17e6be3f3865612642176762ca4def09274a6291256608f11b5833bfaaa25ba0d66f71d0dee6f594d4
 EBUILD libee-0.4.1.ebuild 640 BLAKE2B e6ef5dfd7b87ab0f43bdca4ca591a145b5d5e72003338f62ffb7d6cbd86b4155116ec9aaae749534a6b4363d3a18ac69e60fed46cd857fb74bc4c7457b39f0b9 SHA512 e6309f5ea159a198ff2549fd7ab2cdc8db35c1367a580c9395b1353825e77abe1071441e7eec8a5fb6ae7c654540ea06a4b56f8162ee21e0438b124002077fb7
-MISC metadata.xml 248 BLAKE2B 658d7a07a8f8a3e4efaf1a52d982cbbd49fa5516c3d5ba7491d875873f0884d02cbcc74a52b256b4de07b838381b9acfe257e046d94f241ef99103d51cf3c26d SHA512 3233b4d097ddbaa87c05ccab6951bf716708fd536ee24d1ac284c08a4ab8c3784cac93c88ca549325162cb0a77b610955c478748398f3d4f8d281bee8538ec54
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/libee/metadata.xml b/dev-libs/libee/metadata.xml
index c420a82a567a..85e4ed814fa2 100644
--- a/dev-libs/libee/metadata.xml
+++ b/dev-libs/libee/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>whissi@gentoo.org</email>
-	<name>Thomas Deutschmann</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index 3c8f50700910..dca443321791 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -1,3 +1,3 @@
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
-EBUILD libestr-0.1.11.ebuild 725 BLAKE2B bc5b1d5478fb10f3c1bb8adab2d4eb69c82b95431a147eedbb7b1c65b262fa59d35221095f0f3f5a8212c96ffb50501e648ae6e44fcbe0badeadc479e606372f SHA512 bf44bf03be423b00bf154df8df420f0b79b1a6e8c8e6f8c367a7c6b0d8c56770c42ce2e3da94b051525b652fe25a48ad65f7aba7a9cd9c9dc339e3778523f784
-MISC metadata.xml 454 BLAKE2B 8e167f4beca4c3be27837775ccf7c295f254478129a26ae0c5de0b6fe433e6ae8db1590ad9c6fd1525d93a733e42688c34bef1c47c9128eaf1aa53b46a12db30 SHA512 c77418fef5b1d67cb0323533eda87c6adf94e2b6943171cb69a24031b81580e76f091e695681c248355322ec50d976e78016ca78cee6bb0fbb394b6b0191cce0
+EBUILD libestr-0.1.11-r1.ebuild 690 BLAKE2B dbd667c51020b588ca753c4ee6586bbcb78e4e6483bbf2dba4e51123ed3b9a3ac0c8b6b6a29c3c456740d16491419a854d2aa6cef7e460147f5460050b25c879 SHA512 256fdf772747b4910b958d7a5152f4b331a70eab463a6060cf82217e90e3824ba3e6e7918b5674abb4bf3a175f51604d7e5aeea91e0635d25110ff0af4efd013
+MISC metadata.xml 462 BLAKE2B 696a08fee40fe4e1f50e56aaa61cc0d6b797b7820e2f83795b15fbe78642aa5c5c84a611bc2c03174f0aecc065b980f192bc53ae1454969a924d4cf88646218f SHA512 3b3927b1a013e5a27f29b27d738a9e8cee30e1167bf9fac811998410b74bde036762e403a2dc05d3b1f56e58dd3a2fe0eb6f2aa9aacbdda126b813680fe2c23b
diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11-r1.ebuild
index 46bfad9d48e4..ad8ff4a5ae64 100644
--- a/dev-libs/libestr/libestr-0.1.11.ebuild
+++ b/dev-libs/libestr/libestr-0.1.11-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit autotools
 
@@ -15,12 +15,8 @@ KEYWORDS="amd64 arm arm64 ~hppa x86"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -30,7 +26,6 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable test testbench)
 	)
-
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml
index ca8f6f06bde4..c9f48fd2bf41 100644
--- a/dev-libs/libestr/metadata.xml
+++ b/dev-libs/libestr/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/rsyslog/libestr/issues</bugs-to>
-		<remote-id type="github">rsyslog/libestr</remote-id>
-		<remote-id type="cpe">cpe:/a:adiscon:libestr</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/rsyslog/libestr/issues/</bugs-to>
+    <remote-id type="github">rsyslog/libestr</remote-id>
+    <remote-id type="cpe">cpe:/a:adiscon:libestr</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 6ae2014f488e..9a41dff44bea 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,4 @@
-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 1128 BLAKE2B 72419304fb535caa9cd7663b91797ce95822ebc0d4a7ac50a223f84683a096571a3e5d830678a859914c2f4c3caad30b39bee34df0edb69cf9b193d7100c1410 SHA512 0cdd098c042908023607012e3d720d6287ea389ef2705a5da01f54d16f1f21f9f419224407a59f1df52803964be9c1617222010e7ffd0e1252c4316adbaf6d8d
+EBUILD libevdev-1.12.1.ebuild 1124 BLAKE2B 16e83557d0e0a4f0a8b619ffb2562ddf8198bdba660a00ff63e72dc7ee7c92d7541fb44f80f48c954a13eb7902bc2a64ae8a2717f4c29b626592ceac087043f3 SHA512 278b1fa8c4c44aefede7fb3a3eab51c0c3456befbd6df801abf28013ad2ad90d140c3657dd7b7afeae7e32bff1dc306d9ca3a7694da54c2e0d15bd95744f76fd
 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.0.ebuild b/dev-libs/libevdev/libevdev-1.12.0.ebuild
deleted file mode 100644
index d44903015d0c..000000000000
--- a/dev-libs/libevdev/libevdev-1.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit 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/libevdev/libevdev-1.12.1.ebuild b/dev-libs/libevdev/libevdev-1.12.1.ebuild
index a1a35572caec..1b3bfadb1175 100644
--- a/dev-libs/libevdev/libevdev-1.12.1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libfastjson/Manifest b/dev-libs/libfastjson/Manifest
index 658c3785f5ef..3d1ce83e684f 100644
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@@ -1,5 +1,5 @@
 DIST libfastjson-0.99.8.tar.gz 433819 BLAKE2B f988c01de8e7becc5a848825c18151fec2b80f81eb5b50e459b1a3bb535f5521fb63e9350eb133eb984f57f42c5f529220a0c9461eb4689e1421ad815c4c4d87 SHA512 1e7eb7eaae2c6ccb78b77ac883808e1d311b03bad083dc72ab7712765a2ed139accd762850d60f54c6fe0ad48c4385714818fd2c8ed76700ce3546e5aff1c823
 DIST libfastjson-0.99.9.tar.gz 436502 BLAKE2B 5ed542f373dee2e28c85f8b48e9d35c7727d7e565c691f90caed7a9ac1192814c6371e03bce18dd9765b4251e6a78b7e612eeb38872d2833cd72021d41fb889a SHA512 90505fba033179aa92f12ac5dbbb071f69f3491de5bbbbb46d553b08ac325448459c9e33ba22ef4f9db0bae4496cca60046eebf6325d70b045c1a0a9845b0d48
-EBUILD libfastjson-0.99.8.ebuild 798 BLAKE2B 128eb7191ddb61e58a1fbf7a0d3628c7e2be7e75b95b177e9052c41f29eea8fe0f286a6fb9e3980b0896ac0626bf05618e6b5e51d7166113f758f20401fffbb8 SHA512 9609f897070f08b031ff226023afe58db45cd34b2200c5f636d71f1bc1665214e054004e3117edd5bf0f01fc1c30cb4542e0fbd9c2b24c91bab5c29b6945526b
-EBUILD libfastjson-0.99.9.ebuild 795 BLAKE2B b57d5436f2f39e460fa6634aad2a15849c59add08702526cf896cd676c7a16c40b38c95c65b85742c93852bdd69ea5ab7a3cdd0dc2701943a231d01419a1960f SHA512 3f15bfcd722b95943d5279aebb79e16fd592a279cae859fa2fae75ac461fe574b865a78079ffa35680ff6d28b01836237d035fd456598481abf5005ec2c21fab
-MISC metadata.xml 539 BLAKE2B bcff2b92a00b7823a52eb521dbcf4312d3c3eab092282f5c68cf6ade49806bf4a3596e23401c8bc34e707d96e49f15c6bcc2585544722722bb44a32ae5c22278 SHA512 d26c8d9c262fde59719594e16291308809d082095fa6d28725d06c94a182452d25426fc9e4203b0a7f46e1c70e8a7b6cf6cddd1cd2f09773fcd8f99ff754ef66
+EBUILD libfastjson-0.99.8-r1.ebuild 775 BLAKE2B 260f5c33d47a2c07a92ac8b17674247e87cf19eb1aea0ff7fe9366652c03a8cd8a65198da62acdabb7c406288486ca72ad9931250efffd60b3872193e9f32e17 SHA512 9c8bdfebfbac330c56f6f05a2a4404c13b3e508fef2dd33ec4e7ac6c1f0fae10dbe8c706a63cf2cb9ca3750cf6c98e6531fb2664f31ff7dccbe9289c355bb975
+EBUILD libfastjson-0.99.9-r1.ebuild 775 BLAKE2B c5724a7228fe6fb0ca1da4ad664264acb5e062b0da14f1564dc7a6fd0c39587b2bf25ea2c76e06fd3cbc969989a149e5a7ec165cdf22f794830c418faef5a727 SHA512 6b1cb84cfa5c3cd200c65d7e08ceecb6beda411cf7a1034f72cb41694d0e73e903b21665f1fad7876ef22777aef3c8fdc50ff3455e385ee09d8c3380a819e1c2
+MISC metadata.xml 769 BLAKE2B d7d5734c90b908013bf01df55cb72fb2908df2189773692ff15d0f2ee1e162d31cae68394322050950a1774919f48c8579c625a697d811e53a80fc36e074d65c SHA512 547ba3d80b494b311f5281f97ea6eff685fda5a02b876a551cb78b7aa6e5314239d5958c1419c8e861a6799ffc301af8e776a9f953c031e18f79f4333d848014
diff --git a/dev-libs/libfastjson/libfastjson-0.99.8.ebuild b/dev-libs/libfastjson/libfastjson-0.99.8-r1.ebuild
index d708a382d6a2..8d9063c9799e 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.8.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.8-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools
 
@@ -13,28 +13,26 @@ SLOT="0/4.2.0"
 KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
 IUSE="static-libs"
 
-DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
-RDEPEND=""
+BEPEND=">=sys-devel/autoconf-archive-2015.02.04"
+
+DOCS=( AUTHORS ChangeLog )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
-		--enable-compile-warnings=yes
 		$(use_enable static-libs static)
 		--disable-rdrand
+		--enable-compile-warnings=yes
 	)
-
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	local DOCS=( AUTHORS ChangeLog )
 	default
 
-	find "${ED}"usr/lib* -name '*.la' -delete || die
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
 }
diff --git a/dev-libs/libfastjson/libfastjson-0.99.9.ebuild b/dev-libs/libfastjson/libfastjson-0.99.9-r1.ebuild
index e398fef4b3d2..56d3287ed32a 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.9-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools
 
@@ -13,28 +13,26 @@ SLOT="0/4.3.0"
 KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
 IUSE="static-libs"
 
-DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
-RDEPEND=""
+BEPEND=">=sys-devel/autoconf-archive-2015.02.04"
+
+DOCS=( AUTHORS ChangeLog )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
-		--enable-compile-warnings=yes
 		$(use_enable static-libs static)
 		--disable-rdrand
+		--enable-compile-warnings=yes
 	)
-
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	local DOCS=( AUTHORS ChangeLog )
 	default
 
-	find "${ED}"usr/lib* -name '*.la' -delete || die
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
 }
diff --git a/dev-libs/libfastjson/metadata.xml b/dev-libs/libfastjson/metadata.xml
index 09a879535239..dcbe41f54074 100644
--- a/dev-libs/libfastjson/metadata.xml
+++ b/dev-libs/libfastjson/metadata.xml
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
-	<slots>
-		<subslots>Reflect ABI of libfastjson.so.</subslots>
-	</slots>
-	<upstream>
-		<bugs-to>https://github.com/rsyslog/libfastjson/issues</bugs-to>
-		<remote-id type="github">rsyslog/libfastjson</remote-id>
-		<remote-id type="cpe">cpe:/a:rsyslog:libfastjson</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
+    libfastjson project's aim is: to provide a small library with essential
+    JSON handling functions, sufficiently good json support and be very fast in
+    JSON processing.
+  </longdescription>
+  <slots>
+    <subslots>Reflect ABI of libfastjson.so.</subslots>
+  </slots>
+  <upstream>
+    <bugs-to>https://github.com/rsyslog/libfastjson/issues/</bugs-to>
+    <remote-id type="github">rsyslog/libfastjson</remote-id>
+    <remote-id type="cpe">cpe:/a:rsyslog:libfastjson</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest
index 0baf5f53e0c6..3d997180ba67 100644
--- a/dev-libs/libffi-compat/Manifest
+++ b/dev-libs/libffi-compat/Manifest
@@ -16,5 +16,5 @@ AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 EBUILD libffi-compat-3.2.1-r3.ebuild 1534 BLAKE2B e148290c7b6c8b0c783dd758863c471c73bad73bcdbe58cd3ff0e0637094877697de7d2e8929f647db9525234d5723fd861b68ad2f9dd1998fdb1b75c6ff64e6 SHA512 31cb87e70e761b05a9b8e464dbb524ab8d86ac29923decb073d150c10556a0fe37120741d79bcb352815c93cf4fd998f55dc1d94ee8e47319662ae4d534d1fb5
-EBUILD libffi-compat-3.3-r2.ebuild 2232 BLAKE2B 5748abb00034cbc59966f5dab9832548f3bf933923d6f6cf4b13e55fe4ededdcb2dccd884faed6bd7866ae82265307baf436b8be19086e28e809967811487e53 SHA512 1d727d6c8da072be94b0e71d98dda124814c5fedcf914923f6c84ba41cfadb7635b28b0327ee7e4a50a38ee25f237adbaf88a335ce5bbc65dec979946940ea4f
+EBUILD libffi-compat-3.3-r2.ebuild 2230 BLAKE2B fdc59c9545b02a147198e05fa8064e29b4c39c8c747bdd29853ec0e022a83bbf93a1268086231f525077e94e0617f236916866db989aa00cb9f7f8cb114fd991 SHA512 b79ede0f6af5bc2d784a5c10921c54bbd8e91cdcfc0596499d576fb527288e2f4c8ee5345c280f0826925899642a26fb5e47081fb3c41d5944eff9fd8c986502
 MISC metadata.xml 1957 BLAKE2B 567c2909e3799d2f3266bc6817f4e3a1024bb4985593cf7e81439d8a8b9499fa996e4a44f12e6e755c3d5538879dc890abb0bcda6279c73eb996f52f05851c71 SHA512 1ea70c162253294aad59ab9cb75e3ffce0aebe566163d702b0f7f49d6d4ee9a06c6e4f36fc9e1b3fbcad0aca4dcd0ff2dac4b3cfb587a68936f97f24ab2e2b55
diff --git a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
index 2db083d7054e..3ae81a7d2e4f 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${PV}/libffi-${PV}.
 
 LICENSE="MIT"
 SLOT="7" # SONAME=libffi.so.7
-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="debug pax-kernel test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 7cfc0c24b398..0cc73b3ef1b3 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -10,5 +10,5 @@ DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa5
 DIST libffi-3.4.2-loongarch64-20220428.patch.xz 64932 BLAKE2B d144dc28a7fce008bc5cd43d9e04125ea8e972324d77951d42039d46e818014079c871f87a0cdbec758b55320c02dff718cf2449f9c630cc899e8e1610784a60 SHA512 33715b21fe027692cc584d6524c03510af7876cc35f318221e1b2b91644cf165c02979c8b426228a8cc6c471e6a59d0435e761b6b7aef589c41a4f28caa36e62
 DIST libffi-3.4.2.tar.gz 1351355 BLAKE2B a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308 SHA512 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
 EBUILD libffi-3.3-r2.ebuild 2257 BLAKE2B 5a212c60da8441e8fa7ae839bde431f4f74025cfb975836f3369138931ece80d140c109d79d5fba45bd5d684ae96abd273004e211c4782cfcd56d83714b76e93 SHA512 8d4be46533328714d161a6d52ef0316c2286f50d6cce723fa8c1ae9b2bb29336fbb666992c9662da4eaf0dd9d983be79f3177b3d398edceb1223a358340320be
-EBUILD libffi-3.4.2-r1.ebuild 2536 BLAKE2B 2de1e9338aa5bc3ede5406a4572ce4f691f6bb893dbfc12825afcbcae422da9cd5063e3a2f4c5d0c8a01849767056ac05e7b05e6fece7bbb64b72927a9504b62 SHA512 41ceb3dbaf0d54831016042bf5e0eafd1e28086e79a0b7442b153e3987c2f163a77f38a6e602c1188849eead1b2dd69ca228d50d7e2a1150788bb75f0c16d83b
+EBUILD libffi-3.4.2-r1.ebuild 2528 BLAKE2B e94c8e41d88a5c24914d36fbcdc84b5ad9bf5454d1a440e2a6e8fb1a9e2f6da5ae4acc8fa4387422a949a200aab092cabd0fc324acd7fc58e1a95b6c9aa27795 SHA512 27b02c6d584a01b63b7ef542dee022fbdb550e4748c2c57f2d0b19c563793fe780a4fd73a00a7a3d25089699ea1d4a1489e5eaf5773ddb00994a48bd699658f4
 MISC metadata.xml 2134 BLAKE2B 55a67beb917d8f4b342712b0de198d11b6a579ed7b3fa29a523869162d9103c0a9c4034db69835f1583963ffabf33573632266ae4c4206c957f5fe8897dae3da SHA512 e8d0867e4aa99a0227c5e62f2ee28e4235ea100789328168b061fd318af5b705cff097bbd9e98540457dc8f3da09e12b0c94f5fda6fd2240e592bd20595eaa45
diff --git a/dev-libs/libffi/libffi-3.4.2-r1.ebuild b/dev-libs/libffi/libffi-3.4.2-r1.ebuild
index 9c4a5672ce13..c5d52adb0a81 100644
--- a/dev-libs/libffi/libffi-3.4.2-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.2-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # with FEATURES="-preserved-libs" or another package manager if SONAME
 # changes.
 SLOT="0/8" # SONAME=libffi.so.8
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug exec-static-trampoline experimental-loong pax-kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 5624459f9d26..e7041fedd4a6 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,8 +1,5 @@
+AUX libfido2-1.11.0-regress-tests.patch 2545 BLAKE2B deed72f2a6237515200371b6f1b066fda27df6ce00325086adcb1065a3c9a70f4f1ce94640dc46b620db716c870f3fab8d6481df5c2a690f039a084665be3e8e SHA512 acca7ae882c4e3715c30161c1ebfdf02428b8749f4ef884f9b66d654b1b943d36edde5578e416d673eb3eae79dc15082526acf6f31c1ceb55fc84be4bc51229f
 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 1007 BLAKE2B 785a20506432e84e5a868327ce7b9953556fc6a96efdcf17609c513fb5676b3b45a81dd1efb05a66a9a42346178ae70c92eee11163855e6bac545b906127abfd SHA512 7d1be3650c7b09ef3d888022664eff9c2610bf767338529eed6ff48344e42a80c4abb4d79908761c9520985b0935fa55035359753554455b3308195f1b99d5cc
-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
+DIST libfido2-1.11.0.tar.gz 624148 BLAKE2B ac123145f22260922e1d83653ba5781c5f41b410760f2c26b7cab7cb0871079aed66a8d9747393843738e4c2ed7ba8ba0292075516ef0354fd4328df967b7a6d SHA512 d9644453d67b84ec8385dfb63796adb3eae2d7f7cb47fbb1bcf9ca7f5cce400623738cc3317d629c2f0af630424cb2788217f8c7f20d1b52b7369c729052d572
+EBUILD libfido2-1.11.0.ebuild 1079 BLAKE2B 92af2b2246a9d3fd3f90d684cfd1f57f87b6c3ed8bc4262cf91dd88c39698f184d28a54e743280ddeb206971dcaf1acd9d2f222dd4767f96fa149c86c27dabf5 SHA512 575639ed512a85fd5354350e550d678b20aa981a1099dcdfaa87e281df83a7d143580b71e6d7ffba70046b2b5701300cc2b07e2b48980a76268c69c875d51bc7
+MISC metadata.xml 411 BLAKE2B 3b2e2850f194b8518267bb8125401bf7049f1b63158bdb28e63e63c03f1c50c918164911a7899790f12c2a207eee88970663a57ebdaf26fa601d77da299a0797 SHA512 dd6d40f9827d7dfb35548c201f90571cec364fe89e4b1811b37f34c1435d05c078585ed8254884370fe575a6fb58c4fb271b87007915c38dae8f945735c0b2ed
diff --git a/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch b/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch
new file mode 100644
index 000000000000..391aae014661
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch
@@ -0,0 +1,81 @@
+https://github.com/Yubico/libfido2/pull/579
+
+From c359e5dba24ae7b44cc0d61fb7c00e652465853b Mon Sep 17 00:00:00 2001
+From: Silke Hofstra <silke@slxh.eu>
+Date: Fri, 6 May 2022 15:36:02 +0200
+Subject: [PATCH 1/3] regress: link against chosen library
+
+Compile `regress` against `${_FIDO2_LIBRARY}` so it links against
+the shared library when building with `BUILD_STATIC_LIBS=OFF`.
+--- a/regress/CMakeLists.txt
++++ b/regress/CMakeLists.txt
+@@ -6,7 +6,7 @@ add_custom_target(regress)
+ 
+ macro(add_regress_test NAME SOURCES)
+ 	add_executable(${NAME} ${SOURCES})
+-	target_link_libraries(${NAME} fido2)
++	target_link_libraries(${NAME} ${_FIDO2_LIBRARY})
+ 	add_test(${NAME} ${NAME})
+ 	add_dependencies(regress ${NAME})
+ endmacro()
+@@ -17,6 +17,7 @@ if(MSVC AND BUILD_SHARED_LIBS)
+ 		"${CBOR_BIN_DIRS}/${CBOR_LIBRARIES}.dll"
+ 		"${CRYPTO_BIN_DIRS}/${CRYPTO_LIBRARIES}.dll"
+ 		"${ZLIB_BIN_DIRS}/${ZLIB_LIBRARIES}.dll"
++		"$<TARGET_FILE:${_FIDO2_LIBRARY}>"
+ 		"${CMAKE_CURRENT_BINARY_DIR}")
+ endif()
+ 
+
+From a5413255cb0dd4579faf0dda0ce1b3e45db398e9 Mon Sep 17 00:00:00 2001
+From: Silke Hofstra <silke@slxh.eu>
+Date: Mon, 9 May 2022 10:56:29 +0200
+Subject: [PATCH 3/3] regress: run compression test against static lib only
+
+--- a/regress/CMakeLists.txt
++++ b/regress/CMakeLists.txt
+@@ -4,13 +4,22 @@
+ 
+ add_custom_target(regress)
+ 
+-macro(add_regress_test NAME SOURCES)
++macro(add_regress_test_common NAME SOURCES)
+ 	add_executable(${NAME} ${SOURCES})
+-	target_link_libraries(${NAME} ${_FIDO2_LIBRARY})
+ 	add_test(${NAME} ${NAME})
+ 	add_dependencies(regress ${NAME})
+ endmacro()
+ 
++macro(add_regress_test NAME SOURCES)
++	add_regress_test_common(${NAME} ${SOURCES})
++	target_link_libraries(${NAME} ${_FIDO2_LIBRARY})
++endmacro()
++
++macro(add_regress_static_test NAME SOURCES)
++	add_regress_test_common(${NAME} ${SOURCES})
++	target_link_libraries(${NAME} fido2)
++endmacro()
++
+ if(MSVC AND BUILD_SHARED_LIBS)
+ 	add_custom_command(TARGET regress POST_BUILD
+ 	    COMMAND "${CMAKE_COMMAND}" -E copy
+@@ -33,13 +42,17 @@ else()
+ endif()
+ 
+ add_regress_test(regress_assert assert.c)
+-add_regress_test(regress_compress compress.c)
+ add_regress_test(regress_cred cred.c)
+ add_regress_test(regress_dev dev.c)
+ add_regress_test(regress_eddsa eddsa.c)
+ add_regress_test(regress_es256 es256.c)
+ add_regress_test(regress_rs256 rs256.c)
+ 
++# Run these tests only against the static library
++if(BUILD_STATIC_LIBS)
++	add_regress_static_test(regress_compress compress.c)
++endif()
++
+ if(MINGW)
+ 	# needed for nanosleep() in mingw
+ 	target_link_libraries(regress_dev winpthread)
+
diff --git a/dev-libs/libfido2/libfido2-1.10.0.ebuild b/dev-libs/libfido2/libfido2-1.11.0.ebuild
index 97e040b99ca4..34f4ead4ef7b 100644
--- a/dev-libs/libfido2/libfido2-1.10.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.11.0.ebuild
@@ -11,7 +11,7 @@ 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nfc static-libs"
 
 DEPEND="dev-libs/libcbor:=
@@ -22,7 +22,8 @@ RDEPEND="${DEPEND}
 	acct-group/plugdev"
 
 PATCHES=(
-	"${FILESDIR}"/libfido2-1.7.0-cmakelists.patch
+	"${FILESDIR}"/${PN}-1.7.0-cmakelists.patch
+	"${FILESDIR}"/${PN}-1.11.0-regress-tests.patch
 )
 
 pkg_pretend() {
@@ -46,5 +47,10 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
+
 	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/dev-libs/libfido2/libfido2-1.8.0.ebuild b/dev-libs/libfido2/libfido2-1.8.0.ebuild
deleted file mode 100644
index c736e0198436..000000000000
--- a/dev-libs/libfido2/libfido2-1.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2021 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 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="nfc static-libs"
-
-DEPEND="
-	dev-libs/libcbor:=
-	dev-libs/openssl:0=
-	sys-libs/zlib:0=
-	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/libfido2/libfido2-1.9.0.ebuild b/dev-libs/libfido2/libfido2-1.9.0.ebuild
deleted file mode 100644
index 3ff00061a391..000000000000
--- a/dev-libs/libfido2/libfido2-1.9.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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:0=
-	sys-libs/zlib:0=
-	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/libfido2/metadata.xml b/dev-libs/libfido2/metadata.xml
index db083c992c6a..df607fde9962 100644
--- a/dev-libs/libfido2/metadata.xml
+++ b/dev-libs/libfido2/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="nfc">Enable experimental NFC support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Yubico/libfido2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 16fc541f358c..cdafe81484fa 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -5,4 +5,4 @@ DIST libfilezilla-0.37.2.tar.bz2 609128 BLAKE2B 8ff4bee0c007c2c527d172bef8a6efd4
 EBUILD libfilezilla-0.36.0.ebuild 1218 BLAKE2B a8ccc2d27988cb10a8180cfd56a245f7873c7fdea11540f15f749cfdda758791757803604343b8bb2674d99801b4c606305410d8fc4884662111dca6a0ace408 SHA512 220634a047b5e8b36556f335c0471f21000f367d842d07f694b407a6c8e55477e621b2caa0a0a3378bbcea88d956d3810100df731b7dd455fcec8f30ed26a546
 EBUILD libfilezilla-0.37.1-r1.ebuild 1283 BLAKE2B fd86b8ffc3eec38564ea75cfdb446655ac9565f4a06d902b901295ef3ad35974781395881c4140188ff9a377a7cb25754a1ddc5c16624471a645ca2c90457cf5 SHA512 4d46fff18f04ea8ab430a63f77b9e84fa29af327c072ef130c3ad5088078318871c58b5a2151ece53b9e642cbee5ba1b3e8e7499a27dcd6db129d3b946c2a9f4
 EBUILD libfilezilla-0.37.2.ebuild 1283 BLAKE2B fd86b8ffc3eec38564ea75cfdb446655ac9565f4a06d902b901295ef3ad35974781395881c4140188ff9a377a7cb25754a1ddc5c16624471a645ca2c90457cf5 SHA512 4d46fff18f04ea8ab430a63f77b9e84fa29af327c072ef130c3ad5088078318871c58b5a2151ece53b9e642cbee5ba1b3e8e7499a27dcd6db129d3b946c2a9f4
-MISC metadata.xml 1237 BLAKE2B 35c09669194bf4094045776f3731e95c5f7035b37286fc7ebff12787a7281254a357c76e10c4d190702b71c8021d885da77055d49fad6d4d788013acc1db0887 SHA512 29b26a5431791e018ca66b3aaebd8e4e541c7a24e6d36d9dd003cd7a816dbfdcb8439166277d5c2542a49cee90693a6b88ab898e40785803e833f9a7c2e34d5f
+MISC metadata.xml 1125 BLAKE2B eddf5dd9e7af700c9cdfd68918acef8a6064a8f26e4531f047315df70a4c2d1e2d2a4b3257062e5af1973fef5490606f08a0c6460e220d25b3d615c7d4626e57 SHA512 6038a9eb07bf8c4adaf9bd3abaa3abc283ba8d8c432aa193fcc1932071afdbd6a6bb50a16e5e7f4f0cce4afbc341bb26b1b265b8f0da12728f8db06103d73ba5
diff --git a/dev-libs/libfilezilla/metadata.xml b/dev-libs/libfilezilla/metadata.xml
index 7a207a3b0757..f6ca9ca99085 100644
--- a/dev-libs/libfilezilla/metadata.xml
+++ b/dev-libs/libfilezilla/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest
index 3c72122fad26..996f680dcabb 100644
--- a/dev-libs/libfstrcmp/Manifest
+++ b/dev-libs/libfstrcmp/Manifest
@@ -1,4 +1,7 @@
+AUX libfstrcmp-0.7-docdir.patch 4491 BLAKE2B 31bfda4805b99de8e590861ff5445bbc88424e1e19b3f70bfac8c86474383ee8cb90bc42daa8a5da05868880336b197f130a4925c7f524224da3ffdf0fe6b680 SHA512 b45621d8cafe0f5f0f70f12e2b2e35399d5e471c724cc4957ee019da40fd6e01bc4b9b2367349fbfb61deec7f1b128c5fd8fce2a2288271295813ad6d0a6641f
+AUX libfstrcmp-0.7-libtool.patch 1905 BLAKE2B d74c235e4bbfc7a5e3e055beecdda3cd0b215adb537fead2b76bd0ed070cc4f24d4d2d27839ba7cb13dd79004d1ecfd61db5d4202b6ef2d81102c1f970dd356b SHA512 36f3a43dca917fbca4b43236b02033c627c1e36221ab98f0bfc7f85cf926c5634fe05410d87649cf30541bcb014b8c40f18c6f040a74a6e1bb8af21ecde49860
 DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c
 EBUILD libfstrcmp-0.7-r1.ebuild 936 BLAKE2B aec038edb10757e1e674b8bf6cce2cc455651d6d4c44fcb9144b766f3e515ff7a8be4e00f2fad33db2b5832b2ad36d924d25c70f51766a4dfe10d3acdd325242 SHA512 93a6953dfd66031ff561a0693aece3c1a2a518e9f2d9f4f4d4e77fcf4e922eb87708a31a9dcbb9f625c138d3247aa1ef80d9ad2d38eb71e68fadb49af592657b
+EBUILD libfstrcmp-0.7-r3.ebuild 1042 BLAKE2B db0746e6cd7a4be0e2acdb5700ba4b223f542620b7c1024c270c8bdbea17ef01a35057ab1f2935c805f6693c5e981a6ef2e4ca01c2031aa2d8d8e94c6bad25e1 SHA512 23a876364cc03743592e90b766246348b4be9a78d1e3e8508c0330e15d12fee95da1c3af4bbed5a3b2e16e287d2268c084532a757b8d54472476173611a7f407
 EBUILD libfstrcmp-0.7.ebuild 798 BLAKE2B 6b0fa888e5ecbad92001c73cc21a2371719b044e1054d79160b7f0ace9fd3706b60b623240555c99f60c6c139e91a8c97017df5c6350895e769786302fb32a14 SHA512 b2ba229672a48f925bf39d0d6246cb5e958f7290b8eecd226084875e9d8dbc0c71d656dd034da0e31b39531fbf7e0d4f836b7f41e2789c14eab2575f55172683
 MISC metadata.xml 326 BLAKE2B 926108a5954c15305765e37bb63c177e30757266bdc7267d0693f8d9412cca3bc0f1eab55463fe5198980e5adafe191e36fec7bf0dbde4fc72d203d0666b3608 SHA512 abd7abb1a7b5d420e540dae2eea944bad4b16334c40e677277b9a610cf342781e9a38613218ec215a5c3c3abe14c1f83b24185c6061f70d20a28b1c3af6dd395
diff --git a/dev-libs/libfstrcmp/files/libfstrcmp-0.7-docdir.patch b/dev-libs/libfstrcmp/files/libfstrcmp-0.7-docdir.patch
new file mode 100644
index 000000000000..197c6220c575
--- /dev/null
+++ b/dev-libs/libfstrcmp/files/libfstrcmp-0.7-docdir.patch
@@ -0,0 +1,140 @@
+https://bugs.gentoo.org/853133
+
+From: orbea <orbea@riseup.net>
+Date: Mon, 20 Jun 2022 07:49:14 -0700
+Subject: [PATCH] build: Support docdir
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -31,6 +31,14 @@
+ # Use "./configure --help" for a list of options.
+ #
+ 
++#
++# the name of the package
++#
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++
+ #
+ # directory containing the source
+ #
+@@ -86,6 +94,16 @@ exec_prefix = @exec_prefix@
+ #
+ bindir = $(DESTDIR)@bindir@
+ 
++#
++# Where to put the documentation.
++#
++# On a network, this would be shared between all machines on the network. It can
++# be read-only.
++#
++# The $(DESTDIR) is for packaging.
++#
++docdir = $(DESTDIR)@docdir@
++
+ #
+ # Where to put the manuals.
+ #
+@@ -97,7 +115,7 @@ bindir = $(DESTDIR)@bindir@
+ mandir = $(DESTDIR)@mandir@
+ 
+ # define this to silence ./configure warning
+-datarootdir = $(DESTDIR)@datarootdir@
++datarootdir = @datarootdir@
+ 
+ #
+ # Where to put the supplementary package executables.
+@@ -164,7 +182,7 @@ etc/building.pdf: etc/building.man man/man1/z_copyright.so
+ 	ps2pdf etc/building.ps $@
+ 	rm etc/building.ps
+ 
+-$(datarootdir)/doc/fstrcmp/building.pdf: .mkdir.__datarootdir__doc_fstrcmp \
++$(docdir)/building.pdf: .mkdir.__datarootdir__doc_fstrcmp \
+ 		etc/building.pdf
+ 	$(INSTALL_DATA) etc/building.pdf $@
+ 
+@@ -175,7 +193,7 @@ etc/readme.pdf: etc/new.0.1.so etc/new.0.2.so etc/new.0.3.so etc/new.0.4.so \
+ 	ps2pdf etc/readme.ps $@
+ 	rm etc/readme.ps
+ 
+-$(datarootdir)/doc/fstrcmp/readme.pdf: .mkdir.__datarootdir__doc_fstrcmp \
++$(docdir)/readme.pdf: .mkdir.__datarootdir__doc_fstrcmp \
+ 		etc/readme.pdf
+ 	$(INSTALL_DATA) etc/readme.pdf $@
+ 
+@@ -191,7 +209,7 @@ etc/reference.pdf: etc/building.man etc/new.0.1.so etc/new.0.2.so \
+ 	ps2pdf etc/reference.ps $@
+ 	rm etc/reference.ps
+ 
+-$(datarootdir)/doc/fstrcmp/reference.pdf: .mkdir.__datarootdir__doc_fstrcmp \
++$(docdir)/reference.pdf: .mkdir.__datarootdir__doc_fstrcmp \
+ 		etc/reference.pdf
+ 	$(INSTALL_DATA) etc/reference.pdf $@
+ 
+@@ -532,14 +550,9 @@ $(libdir)/libfstrcmp.la: .mkdir.__libdir_ lib/libfstrcmp.la
+ 	@-test -d $(datarootdir) && touch $@
+ 	@sleep 1
+ 
+-.mkdir.__datarootdir__doc: .mkdir.__datarootdir_
+-	-$(INSTALL_DIR) $(datarootdir)/doc
+-	@-test -d $(datarootdir)/doc && touch $@
+-	@sleep 1
+-
+-.mkdir.__datarootdir__doc_fstrcmp: .mkdir.__datarootdir__doc
+-	-$(INSTALL_DIR) $(datarootdir)/doc/fstrcmp
+-	@-test -d $(datarootdir)/doc/fstrcmp && touch $@
++.mkdir.__datarootdir__doc_fstrcmp: .mkdir.__datarootdir_
++	-$(INSTALL_DIR) $(docdir)
++	@-test -d $(docdir) && touch $@
+ 	@sleep 1
+ 
+ .mkdir.__includedir_:
+@@ -633,7 +646,7 @@ clean-doc:
+ 
+ clean-misc:
+ 	rm -f .bin .mkdir.__bindir_ .mkdir.__datarootdir_
+-	rm -f .mkdir.__datarootdir__doc .mkdir.__datarootdir__doc_fstrcmp
++	rm -f .mkdir.__datarootdir__doc_fstrcmp
+ 	rm -f .mkdir.__includedir_ .mkdir.__libdir_ .mkdir.__libdir__pkgconfig
+ 	rm -f .mkdir.__mandir_ .mkdir.__mandir__man1 .mkdir.__mandir__man3 core
+ 	rm -f etc/building.pdf etc/readme.pdf etc/reference.pdf
+@@ -666,9 +679,9 @@ install: install-bin install-doc install-include install-libdir install-man
+ 
+ install-bin: $(bindir)/fstrcmp$(EXEEXT)
+ 
+-install-doc: $(datarootdir)/doc/fstrcmp/building.pdf \
+-		$(datarootdir)/doc/fstrcmp/readme.pdf \
+-		$(datarootdir)/doc/fstrcmp/reference.pdf
++install-doc: $(docdir)/building.pdf \
++		$(docdir)/readme.pdf \
++		$(docdir)/reference.pdf
+ 
+ install-include: $(includedir)/fstrcmp.h
+ 
+@@ -687,9 +700,9 @@ install-man: $(mandir)/man1/fstrcmp.1 $(mandir)/man1/fstrcmp_license.1 \
+ 		$(mandir)/man3/fwcscmp.3 $(mandir)/man3/fwcscmpi.3
+ 
+ uninstall:
+-	rm -f $(bindir)/fstrcmp$(EXEEXT) $(datarootdir)/doc/fstrcmp/building.pdf
+-	rm -f $(datarootdir)/doc/fstrcmp/readme.pdf
+-	rm -f $(datarootdir)/doc/fstrcmp/reference.pdf $(includedir)/fstrcmp.h
++	rm -f $(bindir)/fstrcmp$(EXEEXT) $(docdir)/building.pdf
++	rm -f $(docdir)/readme.pdf
++	rm -f $(docdir)/reference.pdf $(includedir)/fstrcmp.h
+ 	rm -f $(libdir)/libfstrcmp.a $(libdir)/libfstrcmp.la
+ 	rm -f $(libdir)/libfstrcmp.so* $(libdir)/pkgconfig/fstrcmp.pc
+ 	rm -f $(mandir)/man1/fstrcmp.1 $(mandir)/man1/fstrcmp_license.1
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,7 +16,7 @@ dnl!
+ dnl! You should have received a copy of the GNU General Public License
+ dnl! along with this program. If not, see <http://www.gnu.org/licenses/>.
+ dnl!
+-AC_INIT(install-sh)
++AC_INIT([fstrcmp], [0.7])
+ AC_CONFIG_HEADER(lib/config.h)
+ AC_PROG_CC
+ AC_CANONICAL_HOST
diff --git a/dev-libs/libfstrcmp/files/libfstrcmp-0.7-libtool.patch b/dev-libs/libfstrcmp/files/libfstrcmp-0.7-libtool.patch
new file mode 100644
index 000000000000..4d893a5b2262
--- /dev/null
+++ b/dev-libs/libfstrcmp/files/libfstrcmp-0.7-libtool.patch
@@ -0,0 +1,81 @@
+https://bugs.gentoo.org/778371
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 20:49:52 -0700
+Subject: [PATCH] configure: Use LT_INIT to find libtool
+
+LT_INIT will generate libtool for the build which is required by
+rlibtool to determine if building shared or static libraries.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -37,6 +37,11 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
++#
++# directory containing the build
++#
++top_builddir = @top_builddir@
++
+ #
+ # the name of the install program to use
+ #
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ AC_PROG_CC
+ AC_CANONICAL_HOST
+ AC_GNU_SOURCE
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
++LT_INIT
+ AC_CHECK_PROGS(AR, ar)
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+@@ -32,6 +32,8 @@ AC_ISC_POSIX
+ AC_OBJEXT
+ AC_EXEEXT
+ 
++AC_SUBST([top_builddir], [$abs_builddir])
++
+ dnl @synopsis AC_ADD_CFLAGS
+ dnl
+ dnl Add the given option to CFLAGS, if it doesn't break the compiler
+@@ -53,37 +55,6 @@ AC_ADD_CFLAGS(-Wshadow)
+ dnl! AC_ADD_CFLAGS(-Werror)
+ dnl! AC_ADD_CFLAGS([-Wl,--as-needed])
+ 
+-AC_CHECK_PROGS(LIBTOOL, libtool)
+-
+-if test -z "$LIBTOOL"
+-then
+-  AC_MSG_RESULT([
+-        You must have GNU Libtool installed to build fstrcmp.
+-        Homepage: http://www.gnu.org/software/libtool/])
+-  OK=no
+-  if apt-get --version > /dev/null 2> /dev/null; then
+-    AC_MSG_RESULT([
+-        The following command may be used to install it:
+-        sudo apt-get install libtool
+-    ])
+-    OK=yes
+-  fi
+-  if yum --version > /dev/null 2> /dev/null; then
+-    AC_MSG_RESULT([
+-        The following command may be used to install it:
+-        sudo yum install libtool
+-    ])
+-    OK=yes
+-  fi
+-  if test "$OK" != "yes"; then
+-    AC_MSG_RESULT([
+-        If you are using a package based install, you will need the
+-        libtool package.
+-    ])
+-  fi
+-  exit 1
+-fi
+-
+ AC_CHECK_PROGS(GROFF, groff roff)
+ AC_CHECK_PROGS(SOELIM, gsoelim soelim)
+ AC_CHECK_PROGS(REFER, refer grefer)
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild
new file mode 100644
index 000000000000..1f812c5f4edd
--- /dev/null
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Make fuzzy comparisons of strings and byte arrays"
+HOMEPAGE="http://fstrcmp.sourceforge.net/"
+SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-${PV}.D001.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/fstrcmp-${PV}.D001"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="doc static-libs test"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	sys-apps/groff
+	doc? ( app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libtool.patch # 778371
+	"${FILESDIR}"/${P}-docdir.patch # 853133
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake all-bin
+	use doc && emake all-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-bin install-include install-libdir install-man
+	find "${D}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+	use doc && emake DESTDIR="${D}" install-doc
+	einstalldocs
+}
diff --git a/dev-libs/libg15/Manifest b/dev-libs/libg15/Manifest
index 29694fbadc44..8e679ad061dc 100644
--- a/dev-libs/libg15/Manifest
+++ b/dev-libs/libg15/Manifest
@@ -1,4 +1,6 @@
 DIST libg15-1.2.7.tar.bz2 232475 BLAKE2B 490193410f2127d4efc0bcf64909514faff2ecce57bba08e1cf53a958ab296a59bc12867bbd14ca1bf866e5f69833d99f4e3ebb7d078ece35725afe2c0dd03ab SHA512 ddffb38f5c3d9ce0cb90b0375c2f5d317a7bb3889fe59d56932a0889c6e15bc2f1e590757d3182eddf7c5bd3101303b332b18fbd37247c20f66e1be256aa93c0
+DIST libg15-3.0.7.tar.bz2 327738 BLAKE2B 3879e8119380fc514e04b63723601a97e1efacda48435ce79815faf2e525482cc0e3b9d6bebf135068f0c9d16b6753b8eb7dfb71bed2cfdb531983283e3fcd8e SHA512 f8f5a363fe6457e9845bea37260d1e8e266503822c554b4c51caeadf3364acb9d76e3535b9ddf633cdde6082f166f8b41141fae3d8f5fe83885b16d228aedb01
 EBUILD libg15-1.2.7-r1.ebuild 790 BLAKE2B c7f2b779ca56a859bc7bba90cff13050946f36e3f941cea04d7bfa8523f9a4a9b42040a628171d74fcdc5e53dcbfea3fc54ecaa88c524840312c916cf67d83b0 SHA512 4865cf40233ae17987d4cce07a59e3fcca1370a52a7558c9380748be457899b6263943f2c995bee5e8f12f942eba4fff24cf9ca07d1be0b5cbe50e7b2f9b4213
-EBUILD libg15-9999.ebuild 790 BLAKE2B c7f2b779ca56a859bc7bba90cff13050946f36e3f941cea04d7bfa8523f9a4a9b42040a628171d74fcdc5e53dcbfea3fc54ecaa88c524840312c916cf67d83b0 SHA512 4865cf40233ae17987d4cce07a59e3fcca1370a52a7558c9380748be457899b6263943f2c995bee5e8f12f942eba4fff24cf9ca07d1be0b5cbe50e7b2f9b4213
-MISC metadata.xml 409 BLAKE2B 9b5ac727b748a784cb3e909027ae200bf988866605e2d766d2ee92ec3a9a1ae753c38733522f4d36e464aad43f489eb4debf08b8533ad21234e7269a82d4a0f6 SHA512 864b38fac10bc788122cd8cc9ce153ff45479bc4486b117290d7827ac55e6843be558c94fc563c774717c78ae8d60d5ccd210801a3d23f5beb4c81bb41c472c5
+EBUILD libg15-3.0.7.ebuild 760 BLAKE2B ef39a52bd31f4a3ad140c89a6193c62e3d49e9e0f1a131600dc04c6502622f85dfce912746d80c1e4910ede919e1d95d9c9451b28c862841cfa56bba8cdc698c SHA512 3274e76bef481e1040d7b27d23c198940a79f07a9b8310acb480d3e1e1103f64a8c46c5ac3fe4c865251d3c7de370be5d4ec36033b5a555daf16f14f216ac91c
+EBUILD libg15-9999.ebuild 760 BLAKE2B ef39a52bd31f4a3ad140c89a6193c62e3d49e9e0f1a131600dc04c6502622f85dfce912746d80c1e4910ede919e1d95d9c9451b28c862841cfa56bba8cdc698c SHA512 3274e76bef481e1040d7b27d23c198940a79f07a9b8310acb480d3e1e1103f64a8c46c5ac3fe4c865251d3c7de370be5d4ec36033b5a555daf16f14f216ac91c
+MISC metadata.xml 297 BLAKE2B e99602692f6e8088ab7498eff9b8cba7c30e67897b51d032d52dc6b896c735e0d7e8814da90f385882e5d5ffdc27f569b77e20bce0b7d3a66edecb62e05dce51 SHA512 43e029e26caf0a8bcbcfe2e86d1f923f82e59b28aac358e53c493daae165aaa05732fc2283d50dd856967a460b0ce21a5530c599b83929f0c94ae09b76d4da79
diff --git a/dev-libs/libg15/libg15-3.0.7.ebuild b/dev-libs/libg15/libg15-3.0.7.ebuild
new file mode 100644
index 000000000000..0a74e03e1c6a
--- /dev/null
+++ b/dev-libs/libg15/libg15-3.0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.com/menelkir/libg15.git"
+else
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
+HOMEPAGE="https://gitlab.com/menelkir/libg15"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libg15/libg15-9999.ebuild b/dev-libs/libg15/libg15-9999.ebuild
index 638cbaf73401..0a74e03e1c6a 100644
--- a/dev-libs/libg15/libg15-9999.ebuild
+++ b/dev-libs/libg15/libg15-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} == *9999 ]]; then
-	inherit autotools subversion
-	ESVN_PROJECT=g15tools/trunk
-	ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.com/menelkir/libg15.git"
 else
-	KEYWORDS="amd64 ppc ppc64 x86"
-	SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
 fi
 
 DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
-HOMEPAGE="https://sourceforge.net/projects/g15tools/"
+HOMEPAGE="https://gitlab.com/menelkir/libg15"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-libs/libg15/metadata.xml b/dev-libs/libg15/metadata.xml
index f545d7a2f439..947c62c9e342 100644
--- a/dev-libs/libg15/metadata.xml
+++ b/dev-libs/libg15/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">g15tools</remote-id>
 	</upstream>
diff --git a/dev-libs/libg15render/Manifest b/dev-libs/libg15render/Manifest
index 8b0df6f4a400..de8186deadda 100644
--- a/dev-libs/libg15render/Manifest
+++ b/dev-libs/libg15render/Manifest
@@ -1,5 +1,10 @@
 AUX libg15render-1.2-freetype_pkgconfig.patch 1660 BLAKE2B ac8e1a850a796592a248e9a5231376d906aee234a57c075af76a9c812f27f401e9e6eba79eec5dc6abeaf72968c99a39b0213bfbaf8d72e48037e0b69af35961 SHA512 f06d0d85924c543dfc8a9593e9c99ee6394f3032f57d1059d7c47698aab99b263d2d17ecfc0089375f3c59531a4f990edd11974dfd5962939b301c7975c24c10
 AUX libg15render-1.2-pixel-c.patch 686 BLAKE2B a6273daa806090247eab17e2f03f3baa3fbcd7ffe4ee502611a4ecb39134dea809a46d77243c61e949f732b9f7fabd7a7002cc0434dad7e7986da1f25dc2962d SHA512 f1d40893c1f2f17d42c9ca6941d802e0c22a5eb85d9f8167612f7bf21045c096744634ea38928ecfc30c39a6085e6b8652168e711534edf82e3d8f5243c072a4
+AUX libg15render-3.0.4-docdir.patch 716 BLAKE2B 11adf063140a938951eab6784b4cd73399d5103a6ceb7e64f59a2d56d3dc473832252bd068c5ed4384be5b1f9894926223a3ee9239a71d6da96f4fe67bcae50e SHA512 61f8e273161607d6878199225832e05d6c547f5e9ca190296b6205c1f97d3f3897a3893195819ed1528d314b76e12cab0c959f0d1ca36cda079f93df19dd692d
+AUX libg15render-3.0.4-freetype_pkgconfig.patch 1696 BLAKE2B b4a1f6e9117e74fa98d38faff8bd23d03dce13612dcf84280d12b37e1d7a7ebaa2fce94ef19a3670b5c80f131118c3ff8a30e2ca68f292477ed8ae3985346a3f SHA512 bdda475e9a479ca21c70e89e68e9bebee89b993314940869f834a6b687219359430d3944a8c0b01955f289fa7fb0cb560ba55deed4c4a0850a7ef30273f3e551
 DIST libg15render-1.2.tar.bz2 246034 BLAKE2B 70c21341949186dc65bec7ef0f695c783928ab024e5bd3f83eedc527a501bee64cf0561f5e642e3e9173f063b6f74ecca458262ee9c40a2a8837f197338bbb31 SHA512 960fd6bc6159b1b12e1de3b0c07e5960d7d5056d4927be8eddf89a911e2c97a8677ef41456aa255399e8a86cd354b848fab28a47005ee2d1b6640e0c886deaac
+DIST libg15render-3.0.4.tar.bz2 293668 BLAKE2B 82fece311baf59098d6196b5aa31d6584bf3f610854839e3dcf2318f3e3275ae9394ea2b21576d6e6cc4fffb2440d19b7322704087988de8c47e60d822949758 SHA512 f11470b4c8709b7cab8747d8eca4d55ddf88f6dd0a46f11de78612d6070c8b5ea7188ec1ea0236edbb0e5904e6dffd7c75831d5e00564b3cebf8b9dc58b0100e
 EBUILD libg15render-1.2-r2.ebuild 908 BLAKE2B b00eef7bae1cc5c90765738005428c5a440da9d9928f4342581c290a7b883dd2733cf6e2c48589a46f6791b0bec1a357f0ba2eb3802990b0f31d901f56df1237 SHA512 3395d96ff0ad3352c7794b7ef3aa65e75c13bf4f66a4b8db2d1ea47e400331b9e53ccf01663d067b730d65a2aa762eff2cd1a62ec486d34ef03bffd8ca984b83
-MISC metadata.xml 409 BLAKE2B 9b5ac727b748a784cb3e909027ae200bf988866605e2d766d2ee92ec3a9a1ae753c38733522f4d36e464aad43f489eb4debf08b8533ad21234e7269a82d4a0f6 SHA512 864b38fac10bc788122cd8cc9ce153ff45479bc4486b117290d7827ac55e6843be558c94fc563c774717c78ae8d60d5ccd210801a3d23f5beb4c81bb41c472c5
+EBUILD libg15render-3.0.4.ebuild 1032 BLAKE2B 28f64fb8740a2a6e1863a3c3076219d648f05c8dfa74f1db13ec1feea6a46c935684b6c4afac91bdde03140e1cfa8c113ae9a17ac3bebe5c4f3d901644e2a712 SHA512 f7ac050c524e6a4678ab0e58ba51fd3962c93a60827e430c049b3a13f2aba06d2b4d2b4a7b4ce7a92f1dcfabb30157522bb1600421d5417e5a6fe78ba992f2cd
+EBUILD libg15render-9999.ebuild 987 BLAKE2B 63d263a43766e6605c712f97d3dcb97ee195866d97463f0372ea565564b01289c8f811b45c292c83f9cf7af64026c18b87ec1edf45ead4dc370d2b9b1195cb09 SHA512 8439c0144154f3643acfd07b1b8c4e9ec0f8b0ca9bce22b337c1b0acb82c0194cc04ab86377b3187fbd07c63f73de7159a4ed4f10be5bfd4cb7a7e9f45b4e689
+MISC metadata.xml 297 BLAKE2B e99602692f6e8088ab7498eff9b8cba7c30e67897b51d032d52dc6b896c735e0d7e8814da90f385882e5d5ffdc27f569b77e20bce0b7d3a66edecb62e05dce51 SHA512 43e029e26caf0a8bcbcfe2e86d1f923f82e59b28aac358e53c493daae165aaa05732fc2283d50dd856967a460b0ce21a5530c599b83929f0c94ae09b76d4da79
diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch b/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch
new file mode 100644
index 000000000000..781c9b6bfcaf
--- /dev/null
+++ b/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch
@@ -0,0 +1,25 @@
+From 2900f3f8a90915f59a25c8b3fb27912492e7b044 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sat, 14 May 2022 18:20:24 +0200
+Subject: [PATCH] Makefile.am: Make docdir selectable
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2fdacd7..cf00f1c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,7 @@ libg15render_la_LDFLAGS = -version-info 3:0
+ include_HEADERS= libg15render.h
+ EXTRA_DIST = debian libg15render.3
+ man3_MANS = $(top_srcdir)/libg15render.3
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = AUTHORS ChangeLog COPYING NEWS README
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-- 
+2.36.1
+
diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..54a8fd4c07d3
--- /dev/null
+++ b/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch
@@ -0,0 +1,59 @@
+diff --git a/configure.ac b/configure.ac
+index 97338f3..a64f64c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,19 +13,41 @@ AC_PROG_CC
+ LT_INIT
+ 
+ # Checks for --enable args
+-AC_MSG_CHECKING(whether to enable FreeType2 support)
+-AC_ARG_ENABLE(ttf, [  --enable-ttf		enable FreeType2 support],
+-	if [[[ "$enableval" = "yes" ]]]; then
+-		AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
+-		CFLAGS="$CFLAGS `freetype-config --cflags`"
+-		FTLIB="-lfreetype"
+-		ttf_support="yes"
+-	else
+-		ttf_support="no"
+-	fi,
+-	ttf_support="no"
+-)
+-AC_MSG_RESULT($ttf_support)
++AC_ARG_ENABLE(ttf, [  --enable-ttf		enable FreeType2 support],,[enable_ttf=no])
++AS_IF([test "x$enable_ttf" != "xno"], [
++    m4_ifdef([PKG_PROG_PKG_CONFIG], [
++	PKG_PROG_PKG_CONFIG
++	PKG_CHECK_MODULES(FREETYPE, freetype2,
++		[
++			AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
++			CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
++			FTLIB="$FREETYPE_LIBS"
++		], [
++			AS_IF([test "x$enable_ttf" = "xyes"], [
++				AC_MSG_ERROR([Cannot find freetype2])
++			])
++		])
++	], [
++		AC_MSG_CHECKING(whether to enable FreeType2 support)
++		AC_PATH_PROG([FTCONFIG], [freetype-config])
++		AS_IF([test -n "$FTCONFIG" ], [
++			CFLAGS="$CFLAGS `$FTCONFIG --cflags`"
++			FTLIB="-lfreetype"
++			AC_DEFINE(TTF_SUPPORT, [1])
++			AC_MSG_RESULT([yes])
++		], [
++			AS_IF([test "x$enable_ttf" = "xyes"], [
++				AC_MSG_ERROR([Cannot find freetype-config])
++			], [
++				AC_DEFINE(TTF_SUPPORT, [0])
++			])
++		])
++		AC_MSG_RESULT([no])
++	]
++    )
++], [
++	AC_MSG_RESULT(No Freetype is being used)
++])
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"]))
diff --git a/dev-libs/libg15render/libg15render-3.0.4.ebuild b/dev-libs/libg15render/libg15render-3.0.4.ebuild
new file mode 100644
index 000000000000..5ac51ead28ff
--- /dev/null
+++ b/dev-libs/libg15render/libg15render-3.0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
+HOMEPAGE="https://gitlab.com/menelkir/libg15render"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git"
+else
+	SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="truetype"
+
+RDEPEND="
+	>=dev-libs/libg15-3.0
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	truetype? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-freetype_pkgconfig.patch"
+	"${FILESDIR}/${PN}-3.0.4-docdir.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype ttf)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libg15render/libg15render-9999.ebuild b/dev-libs/libg15render/libg15render-9999.ebuild
new file mode 100644
index 000000000000..bafaecea0fdc
--- /dev/null
+++ b/dev-libs/libg15render/libg15render-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
+HOMEPAGE="https://gitlab.com/menelkir/libg15render"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git"
+else
+	SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="truetype"
+
+RDEPEND="
+	>=dev-libs/libg15-3.0
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	truetype? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-docdir.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype ttf)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libg15render/metadata.xml b/dev-libs/libg15render/metadata.xml
index f545d7a2f439..947c62c9e342 100644
--- a/dev-libs/libg15render/metadata.xml
+++ b/dev-libs/libg15render/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">g15tools</remote-id>
 	</upstream>
diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest
index 5392c5df0b71..68a902d24242 100644
--- a/dev-libs/libgaminggear/Manifest
+++ b/dev-libs/libgaminggear/Manifest
@@ -2,4 +2,4 @@ AUX libgaminggear-0.10.0-doc.patch 484 BLAKE2B 9a63685991e322157ba941ae167ce6dea
 AUX libgaminggear-0.15.1-cmake-3.13.patch 613 BLAKE2B 4f2690aff5f33555a5fd446cc3ae8d9f7a417fc8753f2b8f77451394b1ed57d3be277e8d0bb02cb573a0efce3b15fe00f1e9f37139b0de24a78c3aadd70c67ed SHA512 e9a9173f9d5749803b88be2fdc4f5d2fd2207131622d558316428c791983f76ba477c645b2a410a7536b5614c141fc91dc9b51e84e3ff3d8167589e7bfb95a4a
 DIST libgaminggear-0.15.1.tar.bz2 111959 BLAKE2B 6a8d5cd01adcee1d870aada9f20b229e95975a013bfb8076c8135a7b4cbd5f2043b68ad481d0df1b369f560c2ea2172ff2a542ca61ce30317deeeb66a5aa2588 SHA512 a6635a74557f276ab65eda4610ba8a053fedf10f9d898a1dc875082a36b2822544f61fc7a274691673670b12d4de968aa4921d102a588f3d0777397730082990
 EBUILD libgaminggear-0.15.1.ebuild 1072 BLAKE2B e1c177e6a86973bbb2cdc162d83395ed45a906638fb75d1ef60b8d5df82234822247675d28e71223ee38c5b8e18a2b513aa7b994146ae4094b7db65395ab9985 SHA512 5ec36b2c5589bbe336fcbeb95653eb6d1230624cb46c40da6f8b677e0fc66b571398aacf66a80a4e14ec25387e629e3d148bed40440254b252f49b80427f3996
-MISC metadata.xml 335 BLAKE2B 460b92ae25ab55d5b732845cb90e5936f58d89831bf1a81bce05848215c77192876631e95300c5f0a86f81e19efc14d68b621c8c7d1b32251b6feab8ff38f197 SHA512 5d3dfe0b54bc9692dfaafedb058f5a12c84cc26d0f1c776faa38813cfaed3227732fb3209778f487163d5c45ab0b67674862837e9c37e87483facb3fddee1ae6
+MISC metadata.xml 251 BLAKE2B 9647e79cad0b6505c23b13c0837f3c2832bfceaa49b658d6c9bf2a171adfe24c5ce619e0a9bf9cf6a00aada0151051c0036a61b7c45cb32f392b2df764db84d5 SHA512 11e5c997a70338f3d5c9611467e9f3313faceac3c93669812ca4609c5222c1dfceedb67f83f15a624e493f8d4775946566f8d8640334a0555cd35c6594b5086b
diff --git a/dev-libs/libgaminggear/metadata.xml b/dev-libs/libgaminggear/metadata.xml
index dfc863688f72..7b28a38420b3 100644
--- a/dev-libs/libgaminggear/metadata.xml
+++ b/dev-libs/libgaminggear/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>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">libgaminggear</remote-id>
 	</upstream>
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 2c577c2b084c..829053661c02 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,16 +1,11 @@
-AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
+AUX libgcrypt-1.10.1-fix-no-asm-hppa.patch 1166 BLAKE2B 17b27fd88b0e9ccf97c3f46780f16495d6df84e3d58ed9073af6f200908422273a6cbaa18a7285b87db2203c12a9f45f6d2853caf05d667be94a95979b5a0c47 SHA512 02e0c174844fd56da7212518f41b582894e72714e9cbc013448a5eea748cedc7d6ee5719af4049ee6695b83b5f44eb63e6c95972096ba0fc180c2cfe2482ad6e
 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.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.1.ebuild 4995 BLAKE2B fdd0fff1d60aa2d68b8e0a78fed591533d17afa0b2b14a7d9f75a998fb1b62504328e48bf775f99e70d928a4368fa955ae42c843ffc81e2606b0f096b3c5fe50 SHA512 d1fbb464b6037763154708075e219a7336214d9397cf1dee4d8079687f13bb4c7097037fe33b4f6ce8412f63e5c1bf93f91b60bf301e62a481c6a183a18816c4
-EBUILD libgcrypt-1.8.8.ebuild 2372 BLAKE2B 21f92c71781df1c5a9aee35607d715862a7e783b3cbd0bc1d485d301561b93575eec52de5719340fd12ab70deaae597986d018ed54843b6b0ad2dcc3c688e862 SHA512 e3b54b5d8e03fd05635f743d88810df26e30b7a49f0e2b97357c9d6e817069d1dd67fea06c5ff9868fc82c4b08aa6f15c6cc0c162b4cfd6e07fe612471751b38
-EBUILD libgcrypt-1.8.9.ebuild 2988 BLAKE2B fcaf467155ca9920783968abca12c3fd38f08feac71bd2761ad20c7ccedc6bbd2ac4d135b50aa15725513fe575f23f44aa442d2cac984dfbf9c902a3c4bb836e SHA512 57b5be8ed25acf4c8e94619daaa420e44629e0e0d2edf7895ca071f587b90e9ca564845ba5d78443e317a99f1a9fd32de6e4baec3853db7f03a3d4f0f8374f3b
-EBUILD libgcrypt-1.9.4-r1.ebuild 5034 BLAKE2B 7d86db0250845980cc3a75d080d2e6c7bafc50228067d91ab79c0adae9e513fd3b62454913d496af23e8f490ef9288ac0e0f26613c3817c5c0b0dd588a33a85b SHA512 e94468aadb9da088f536e8cba8d0247e972d40c7f1bf6f644ee169bf7c8ccb9ff51f7d4ec7f2f1b7a85e5056ab2311b61ca59227b7badf848fa7b02b2a2c3182
+EBUILD libgcrypt-1.10.1-r1.ebuild 4973 BLAKE2B 9b4e61d861451d60dc27e330a4c8573033e602b96a2ecd871ad8998740c81a1642487f53a4f0442db95ac1f1147afc459cc0cab8fd0bb67ec873958161dafef7 SHA512 240b5b4fce16dcf8da47329616036ac9bc60a3297da01c2d2424b520852e8e3fb1025fbd19735a1b70b62f590df5b05d306dee9af8e50c00e161964b2230659c
+EBUILD libgcrypt-1.9.4-r1.ebuild 4962 BLAKE2B 5f7437ccbd2e5c7a4b9224e7b0a8676856c75a5765477147c524cbf4ca8f5c7d30b626b2ecda429161cd64e067ddda634da62be0fd5c68de03f5cfc7c6bad065 SHA512 01a11ba7af71892211fc0fbe382021aafee7c56f930af1ff581c248a1f29fbc4456bf125328a069eca024925c4f686825d91bb1644a128e87a8258dde676c7a7
 MISC metadata.xml 524 BLAKE2B ab417ec172246d92822cafcadf2ccb72d2b8e0c056d93f1575284afbfc30dae74086d5a3b2d0bc60ec03de0a9f02ac08dc8f961f1f38eb639d862708886141ee SHA512 52d663d33d8d76f5a4613d1fded0630a5597796b0c20ddfc5eecda92fbf28f4f3b8c976e2fdb418cebd9d743ca26b1c6329ad65e1655f6eae5c1d797df1d1f95
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch b/dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch
new file mode 100644
index 000000000000..e665749db3a5
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch
@@ -0,0 +1,35 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=c0692324fe8b3806eefc5017767917dca9cd94d0
+https://dev.gnupg.org/T5976
+https://bugs.gentoo.org/832871
+
+From c0692324fe8b3806eefc5017767917dca9cd94d0 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Tue, 17 May 2022 10:44:55 +0900
+Subject: [PATCH] mpi: Allow building with --disable-asm for HPPA.
+
+* mpi/longlong.h [__hppa] (udiv_qrnnd): Only define
+when assembler is enabled.
+
+--
+
+GnuPG-bug-id: 5976
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+--- a/mpi/longlong.h
++++ b/mpi/longlong.h
+@@ -430,14 +430,14 @@ extern UDItype __udiv_qrnnd ();
+ #  define UMUL_TIME 40
+ #  define UDIV_TIME 80
+ # endif
+-# ifndef LONGLONG_STANDALONE
++# if !defined(LONGLONG_STANDALONE) && !defined(ASM_DISABLED)
+ #  define udiv_qrnnd(q, r, n1, n0, d) \
+   do { USItype __r;							\
+     (q) = __udiv_qrnnd (&__r, (n1), (n0), (d)); 			\
+     (r) = __r;								\
+   } while (0)
+ extern USItype __udiv_qrnnd ();
+-# endif /* !LONGLONG_STANDALONE */
++# endif /* !LONGLONG_STANDALONE && !ASM_DISABLED */
+ # define count_leading_zeros(count, x) \
+   do {								       \
+     USItype __tmp;						       \
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch
deleted file mode 100644
index 22bfac3104bc..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-The version taken from GnuPG 1.4 assumes any cross-compiled package have
-prefixed underscores, which is not the case; by using libtool's own macro,
-we can avoid the whole issue.
-
---- libgcrypt-1.6.1/configure.ac
-+++ libgcrypt-1.6.1/configure.ac
-@@ -1022,7 +1022,7 @@
- # Check whether underscores in symbols are required.  This needs to be
- # done before setting up the assembler stuff.
- #
--GNUPG_SYS_SYMBOL_UNDERSCORE()
-+LT_SYS_SYMBOL_USCORE
- 
- 
- #################################
---- libgcrypt-1.6.1/mpi/config.links
-+++ libgcrypt-1.6.1/mpi/config.links
-@@ -362,7 +362,7 @@
- 
- # Make sysdep.h
- echo '/* created by config.links - do not edit */' >./mpi/sysdep.h
--if test x$ac_cv_sys_symbol_underscore = xyes; then
-+if test x$sys_symbol_underscore = xyes; then
-     cat <<EOF >>./mpi/sysdep.h
- #if __STDC__
- #define C_SYMBOL_NAME(name) _##name
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild
index a3eb80ef2918..b7a3aa4aaf26 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="doc? ( virtual/texi2dvi )
 PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
 	"${FILESDIR}"/${PN}-powerpc-darwin.patch
+	"${FILESDIR}"/${PN}-1.10.1-fix-no-asm-hppa.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -101,8 +102,6 @@ multilib_src_configure() {
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
 		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-		# bug #832871
-		$([[ ${CHOST} == hppa1.1* ]] && echo "--disable-asm")
 
 		$(use asm || echo "--disable-asm")
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
deleted file mode 100644
index ce9198c81c91..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="https://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/texi2dvi )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if [[ ${CHOST} == *86*-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-
-	local myeconfargs=(
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-		--enable-noexecstack
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-
-		# http://trac.videolan.org/vlc/ticket/620
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-		# bug #832871
-		$([[ ${CHOST} == hppa1.1* ]] && echo "--disable-asm")
-
-		$(use asm || echo "--disable-asm")
-
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-}
-
-multilib_src_compile() {
-	default
-
-	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild
deleted file mode 100644
index b9701d819762..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="https://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/texi2dvi )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if [[ ${CHOST} == *86*-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-
-	# Workaround for GCC < 11.3 bug
-	# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29
-	# https://dev.gnupg.org/T5581
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124
-	if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
-		append-flags -fno-tree-loop-vectorize
-	fi
-
-	local myeconfargs=(
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-		--enable-noexecstack
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-
-		# http://trac.videolan.org/vlc/ticket/620
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-		# bug #832871
-		$([[ ${CHOST} == hppa1.1* ]] && echo "--disable-asm")
-
-		$(use asm || echo "--disable-asm")
-
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-}
-
-multilib_src_compile() {
-	default
-
-	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
index e7d9fb4c996d..713d3c7e3a16 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
@@ -102,8 +102,6 @@ multilib_src_configure() {
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
 		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-		# bug #832871
-		$([[ ${CHOST} == hppa1.1* ]] && echo "--disable-asm")
 
 		$(use asm || echo "--disable-asm")
 
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 4a74b46c491d..95e11e50fb1e 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,3 +1,3 @@
 DIST libgdata-0.18.1.tar.xz 851584 BLAKE2B 860cc42c4d0bdbdd6ca1a1001ec7ea5acc26dd1339052365554123e6524fddce65704a11614c8a081eb3eef10395fb1b4d2dfd3cf942dd1ae3556507af4c7c52 SHA512 15ff708760ca5023b692fd565c26a7c3acf035073534c0cd3f1f90e46ee0c60d14dedf360d3ac146d37135e200d9c2bc4b657e81468d0efde4821a9219875b98
-EBUILD libgdata-0.18.1.ebuild 1748 BLAKE2B d63884528605ff548cec9634c6cfdfcd19d698b78fd703f04daab0931652de829e6f76a1a1bea182301d173a8bae651ad720258d7744d1219695edfd5fa688c4 SHA512 a414e197d2298d6a07a09d01ae0abc52d63e8cf156538398d02c15413397df853126e9be2619119ff5ffa2014de5800fd01525586e2bfad917ef373428bdb924
+EBUILD libgdata-0.18.1.ebuild 1755 BLAKE2B 66335bda623aec5fd7ff51fc27339a4ded90cea1c23bd3cc9701f1dff5999061a94c37c6f56a56d634c3331faa49eb925ea959831ddc0684025d8c46f4cdccbe SHA512 c881627703b105947406de0db4b7b4850832481b27d192f646dc267d16fccbcf9616ee22f237211748fc49a16f5aefd5b80f66f7b51732b86219d975e5529fdb
 MISC metadata.xml 497 BLAKE2B d37f531312afe7c129727bcc21bbf9becd1e4b5b19df4f6cd7905ffabc830cd90d8db26953392dd8a016a6af63fc0e65833485a080bc305b08f641ea53fc9189 SHA512 9bd7c944419ed799887f104711a7a9fd954138d744355095dbb1625cc259a5df98b8b635651200287b0a16872bdd05fe7fe70335a67b14dd69b25148ea351e61
diff --git a/dev-libs/libgdata/libgdata-0.18.1.ebuild b/dev-libs/libgdata/libgdata-0.18.1.ebuild
index 57b506ffed8f..6680b91f3fa8 100644
--- a/dev-libs/libgdata/libgdata-0.18.1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index beda1e375b57..f6039e2bf19b 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1,4 @@
+AUX libgit2-1.4.3-test.patch 1230 BLAKE2B 155f958aab27ec7d941ac0303e8d65d87ea82b22e592060e4ca67e865aac519901c6509d2f57c36285864b0d15c94bed8357ca616c8e4838cf09e97156ecf541 SHA512 a6fcb8acc119634ad1f1f9290da0c72076233a1af63f4a66346a0bb37beedd079c72be1ca48746bfeb75c2e94b4e48f6b3881adcb2cbf90b186c86ef384da066
 DIST libgit2-1.3.0.tar.gz 5599575 BLAKE2B b701c105bb0a5bdcdd5ed1db180662ad4949c540944664d5d8c2f5d78998f15d15bd3669ae3e3d43bfa1b81207c0a94b7e49fc76e57f4cc8ef791ab26e62fc70 SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e
 DIST libgit2-1.3.1.tar.gz 5602265 BLAKE2B ecf1fb30fbc40b09edcd3862d0831bc7d4d1da1aa8e738c78cf77bda5a0bd5d9c6a60fe7ce9827e058c04ac88d89a7d6c05c54c01bd77d1a8b0b091495bbf871 SHA512 012ffda7e8b9557923758fdbe68869875977d419bfa60b61f90adadc056600e2b1cc2db1c2a003315ea0e193c0145c1f431054f7bd960c5e6e14fa541e46cba3
 DIST libgit2-1.4.2.tar.gz 5629585 BLAKE2B 61e269fd08beb9579838a13b661b4270f1e8d2d3d1e67f6b8357e92a5ee4aaccbe637644dc87cc8b04d9c181e37808352077b75fed8753a4b2d8868eaf248b62 SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277
@@ -6,5 +7,5 @@ EBUILD libgit2-1.3.0.ebuild 1691 BLAKE2B 60ba697df7bf967756ee9c0d2501e035803f09a
 EBUILD libgit2-1.3.1.ebuild 1704 BLAKE2B 6e01d5495917e853b232f06e34c20d9bda631e706262aeb19d4db991065817f30852290247aa13dbdc581cb007b559bb644b5dd66adfcf758fa940e7a9539a6f SHA512 3eff6e6deebf5f2aea88d1b971a00db1b54fcbea98f722576f66736076255115dd588d8efe9dbb7985ec3b63a6bb680ffa4dc03897013f56fa7f40e436fa4fdb
 EBUILD libgit2-1.4.2-r1.ebuild 1654 BLAKE2B e3f7bd625d0b8b0907419152e36efb41fa741ceb86b0a1054e5f46051e3738e7824d1c256b180b08d46035211b4b9bc17c1c8ff0af81aaaa47e3a5ed1bb5a0c9 SHA512 c37e36aee1b72ddf33bf190b4e7ee39d80b20e5e8d3297185aabe4af1db35a6de97e5eb7c3ac3c79437b493371e1001f798ecbae6fd7da10ee5131e8a482873d
 EBUILD libgit2-1.4.2.ebuild 1646 BLAKE2B 91667e774f00a64aeb4a78cca562eb99f04130ac87320d152f77fd16f345d888eafeabf02515f938dbe66904bd867390065dc72ec51195441d5ec67dc5a5c0c7 SHA512 7da2def0d3ff13b956234d2c2819fbdc1215dca6874c3707c867173137f5b64e2e305ab9ea75034d76a5d4073318e203d74f1f773e1dfb632a8c14e3cf4ae162
-EBUILD libgit2-1.4.3.ebuild 1661 BLAKE2B c96b1c5fe64fefe7cad34acb93e5d782052823687c394785b3b58cc4671839f883ddefced357d29a1f28cc0278ee9b98b0689beee210af43cbd74f2a669e9327 SHA512 73659ea3404950f2e82cb09e9547e97e34d2973f8f2c3fa5a2caf0c268f04758d6f2c0363ed5ad40b2e13d3907a3b1da76629d93ec57479974cd464c2722535d
+EBUILD libgit2-1.4.3.ebuild 1699 BLAKE2B 23f3196cbf11b5dd91af8231344989e917f3f81502821c15a61bb4d0b19991bfafc9a217498112e0ff943b7244ae261bd2b5d045129173d1df6f8a0585f62f34 SHA512 28af72c276b82ed0a2bdd5f80f3fff5d107f50f379668d3261ee1d58ac128dc2ceef1e107c142c11544eeb00e3438b172b0df2cdae97b50fad03c7cd25990b05
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/files/libgit2-1.4.3-test.patch b/dev-libs/libgit2/files/libgit2-1.4.3-test.patch
new file mode 100644
index 000000000000..23349e6307ef
--- /dev/null
+++ b/dev-libs/libgit2/files/libgit2-1.4.3-test.patch
@@ -0,0 +1,30 @@
+From c013fca6b091e36805659ebb26ccaaffae8806dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <carlosmn@github.com>
+Date: Tue, 3 May 2022 09:28:43 +0200
+Subject: [PATCH] revparse: adjust reflog test as we move away from the dates
+
+The dates we use in `refs::revparse::date` has just passed the ten years, so
+now everything is beyond ten years, leading to an unexpected commit being
+returned.
+
+Adjust it to 11 years so it all looks fine again.
+---
+ tests/refs/revparse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/refs/revparse.c b/tests/refs/revparse.c
+index 0bd2ae5bc..93d7ce6db 100644
+--- a/tests/refs/revparse.c
++++ b/tests/refs/revparse.c
+@@ -399,7 +399,7 @@ void test_refs_revparse__date(void)
+ 	 * a65fedf HEAD@{1335806603 -0900}: commit:
+ 	 * be3563a HEAD@{1335806563 -0700}: clone: from /Users/ben/src/libgit2/tests/resour
+ 	 */
+-	test_object("HEAD@{10 years ago}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
++	test_object("HEAD@{11 years ago}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
+ 
+ 	test_object("HEAD@{1 second}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+ 	test_object("HEAD@{1 second ago}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+-- 
+2.35.1
+
diff --git a/dev-libs/libgit2/libgit2-1.4.3.ebuild b/dev-libs/libgit2/libgit2-1.4.3.ebuild
index 55dbaa51683d..a957a5adafb3 100644
--- a/dev-libs/libgit2/libgit2-1.4.3.ebuild
+++ b/dev-libs/libgit2/libgit2-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake python-any-r1
 
 DESCRIPTION="A linkable library for Git"
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
@@ -35,6 +35,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# relying on forked http-parser to support some obscure URI form
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index 8eb10a49aca3..8a734e126592 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,5 @@
 DIST libgnome-games-support-1.8.2.tar.xz 45328 BLAKE2B 6df5e49629f65a12a683b6c026afa0629132ef3462d714f751fe75595a74dc3d3ab24c50c4a05e893999271ca66cd8395f36fc56ad01139a16b7f0c610fa2def SHA512 6c622b8a64df02be53b56cf8f2da6c9bc866f30042eb61c621db5ab38c4b88e90151c81a71eeba4f8d182b76d581df31f822409e633b45ee928737001f65f16e
 DIST libgnome-games-support-2.0.0.tar.xz 46204 BLAKE2B 3c3399f3912dd2d0e5fda510fe529894862f1922523622b8294ab0a3bb8c4a2055bcd54ace27b2d11e329b6ea6eccd8652832471a7b6b691b73d4081e05e354a SHA512 56d0bafd7cd9b8000c7b8be6ffd8d74ea4ba5164a60490665163d8f86d6f19a34b549eec21ae3a4feecb8313851c32621d8d48638dfdaeea812c5ba7c9447111
 EBUILD libgnome-games-support-1.8.2.ebuild 645 BLAKE2B 45dccd029189634f514013993789fe18471155ed705c5383b2a5fce01e293a8d25ed2178bc10c8947f8efd925f40a41d9a2b727dec3dc93a77430823574ad73a SHA512 a5a130c36deab9e4237a0834f2309867ae84cfcc35ff7e15038cc528509f718b94936f0b5bf4567a1575656b9c2d4e04d7289621688f63852ddde81d3ad56858
-EBUILD libgnome-games-support-2.0.0.ebuild 645 BLAKE2B 6b2366b427926e618b4a973165723aa8855ce2837f9edd9749e1f47ed041e827652ef825f817c39bc3c8e14b266cb81cddff84593037d965f29df8dc8149a4c6 SHA512 20d50ac8fde9a15fe9b511e5aaa0b3a588768707e67e8419a7b7e5ed32917e45095a6cd1d376373beb3f9b057e692b89645bb531f484d787be75aa09816730b2
+EBUILD libgnome-games-support-2.0.0.ebuild 642 BLAKE2B ef997361faac998c8bd64233beb1a4637b7110b72e182719b64fa98a150858f28dfcd691187e859669d8a43a6f787f5032d885da4be486110668bfbe0efa6ebe SHA512 2372c84bda86749f11fbd261fd357f492be5799e825503ce12442ba457c4cfeb3713ce07115d28ef0b97655a5df0a5e9150dd1e7ec0562ac2a1aa4a66e116326
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild
index da8a1d932f7a..6d27b4edade6 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
 
 LICENSE="LGPL-3+"
 SLOT="2/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 # glib dep in meson is 2.40, but vala is passed 2.44 target
 RDEPEND="
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index 7ad492390617..5502fd3b0027 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -4,4 +4,4 @@ DIST libgnt-2.14.2.tar.xz 106128 BLAKE2B d3db0ba3a297c14f32cc49b4e5b3392f47031e9
 DIST libgnt-2.14.3.tar.xz 106388 BLAKE2B bba785c998e53c75ed9c3b0b4ad1d96d63628a6e2b0ac7abec76a671ddfc0284fd787cd6793433aef83e6b31c6efecce0c656e131ca9b8bf548486de1010e1f9 SHA512 7131834cfe585177865bebf26167de08a04fced3da4e9a072d9b09b3becd1194914757b1a1fc8f129ae6c8fefe3ec1ce0d80d6c50cb624a5698b66ee2e06c6c8
 EBUILD libgnt-2.14.2.ebuild 779 BLAKE2B 4276e180412105d5a1efb42d90e63f53005314233b3eff2d080c9055d057377a0e8a151b536e4b9ca76c53e0cfdfbba79dd6372f5eaa8d35bd115a1fa86926b7 SHA512 9607b64bc4070f2817a9dab608af514bdd0bdb6fc9d338178aaf5d482b0b4c61835e8e9c71f9c60ba089c3576860d0a4cde8f12b537c7d0f020a1dcc721b52fe
 EBUILD libgnt-2.14.3.ebuild 749 BLAKE2B f8cc7f4f6e97f662133563b5d179b7bcef271b88c42fd2f60371c9b26acc3160753e4ebcb6722beca75b69a8b41f8955b66288745c62417a053de516093f7042 SHA512 ef01ab6a4ae687c335f098aa84400c15fc7a116f1c8896df9ddf4f0663df2ebfecb413616ef6ead6ed35b7dc7078004633f65113fec98ee3bcd738ae82e61e30
-MISC metadata.xml 258 BLAKE2B bd458e931e669f3599d041086b28cb8e05f9daca13a17504ca4bdf6a19f9e0e0bce389981d9b65875a04e7a6e068aab4d7f92819a6c545638a1e37ed462866ac SHA512 f3d8019f0e5fb12b60d75645d9d8468cc5ca283d1df19b23604a58221cf08b7a5b63744e4e99f26c80b798e2caf52c5a69f8d383c3aed06f7a1996e72f7f36bc
+MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/dev-libs/libgnt/metadata.xml b/dev-libs/libgnt/metadata.xml
index 2ac0eef8d76b..bef24d2c2337 100644
--- a/dev-libs/libgnt/metadata.xml
+++ b/dev-libs/libgnt/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index da107a197df8..4a59eb34e1ae 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -6,5 +6,5 @@ DIST libgpg-error-1.44.tar.bz2 1014475 BLAKE2B dc101769510bc9edff38048216a961df8
 DIST libgpg-error-1.45.tar.bz2 1015954 BLAKE2B 277892df6691ff2807335954fa786c1d452d58e6f15aa2f73bffd1ddc97b9276646afe8831c0b67107ac768e0590f046030da6d370eb2871e94154f50dabf67b SHA512 882f2dd617e89137d7a9d61b60488dac32321dd4fdb699e9687b6bd9380c056c027da502837f4482289c0fe00e7de01210e804428f05a0843ae2ca23fdcc6457
 EBUILD libgpg-error-1.42.ebuild 1898 BLAKE2B 05436135f19c5e2422f08274f1f3ad755b8683fcd9dfa56914ed8822b816e070cf910c92a6dc385e824ead0f5e85cc89e9fc4f4652e4119a2a5a5571b2cc7666 SHA512 fe0532eaa898e8a39c79651121593e907cc0fca3ddf5db54dcc2889309c2980055e52a54438452d320c38e3f45ff705327185962d4c6c7fb40cca7013c311cab
 EBUILD libgpg-error-1.44.ebuild 1866 BLAKE2B 0071a99bf76003193009345c97d685e4030495c529e5b5bc74b0e5cbf29c73c3bbe4290acaecf09d2a9818b2a7331b264c6e430cad84822ffa31ca441372ec41 SHA512 7c12fca0e1fd6ba8f446de4d1234c90ee7afa836a38bb81ba0712ba337ce9a3a5d84a37341d8a96ada56912a1044d0bc0176116dcfdaa2bb1c2cc06212b2d31c
-EBUILD libgpg-error-1.45.ebuild 1873 BLAKE2B 4ff13e322f2a73c9def4de41306a6d6a45505d2909fc81660b2ce6dd158f0cdebdc70e77c733a290b96b1c58a50f9492fc34393cfb3bfaca6b7f26f32d8f5771 SHA512 b11e794f86fbfdd4af1d2b757a4e6c5b39352a3945a63c0432647e9c6283b872de40a4f2d5dafd3f962263e1a1bd42f9e85974b849fe8c2221825027022da92d
-MISC metadata.xml 414 BLAKE2B 3d1e1094b2527b3462c9791d278b82e0003201c1ac9a4fca2fceb1f1265384b6a0cb3617bf2e6416afd2a1044564e6cb2beeb7df926017bfdeb88fa61177faa8 SHA512 2254c2fb4aebd808a733fc5264c722b374e85ceabe540257ab7ecd4f46d6ce6a12bfbf4c4ec59af62c8a1601189d693bb33eb69eb28a7a6fdf8210458d173fb8
+EBUILD libgpg-error-1.45.ebuild 1924 BLAKE2B a082e0038c6372f379492fbbd381fff2c1ede5eb56077b14eeba019fdde88cd3978c35d4f08bcf31e3f814c25cd95b1db91511f57d1c3be691d7b61a23803354 SHA512 a0f50c1e76f2ecf9c1550e2b95dd27d888ffa96bf3cf13abe5a0f4514ef973534ff75fe6e3449c7624ac23dff32dfd1d925ffe0e40c69dae02fef57d39df43ce
+MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305
diff --git a/dev-libs/libgpg-error/libgpg-error-1.45.ebuild b/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
index f79b1022d939..9fa4a0eb08bd 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
@@ -11,8 +11,9 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
@@ -52,6 +53,7 @@ multilib_src_configure() {
 		$(use_enable nls)
 		# required for sys-power/suspend[crypt], bug 751568
 		$(use_enable static-libs static)
+		$(use_enable test tests)
 		--enable-threads
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
diff --git a/dev-libs/libgpg-error/metadata.xml b/dev-libs/libgpg-error/metadata.xml
index 6cb5d85f1092..0c03a7f54792 100644
--- a/dev-libs/libgpg-error/metadata.xml
+++ b/dev-libs/libgpg-error/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Lars Wendler</name>
-		<email>polynomial-c@gentoo.org</email>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 8cc08ee520f8..383c21cac579 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -2,5 +2,5 @@ AUX libgudev-test-double.patch 923 BLAKE2B e8351510cd918befad8c9059dde42f5ceb6df
 DIST libgudev-236.tar.xz 28428 BLAKE2B cee5098f851183131db88812c8a985a3617fec7a2257f3c05ae0f06e423f15efa89801ef0c75cbb6e5ea9fb7a9db3c4d9215a3689e5d1ddb4832ef17442753cf SHA512 b00c30a7d57de8cca92a22f4c4da878c7cce448b1177858cc9ee0b99c5bc4fd0fbd01d8f4f9a9b9ef073af8f51c26533f2e7896c01ed9fed0a2bcfa6b2cfcbc2
 DIST libgudev-237.tar.xz 29060 BLAKE2B 5d39d4d26d8c8b3fa877319c294036294dbda96b340d2d04d7a35449d91b58de876b96b5e3d9423cdf3e1d3e2a94f5a861b1ac1e74a610637e0fc66248c68309 SHA512 2d68981e3ba5c58ee080b6ed5cd5152c1c352b2bdb3ecb5eaf2b91f6800d3369121222a7fe4f82630aabd164069ee7276c52082b2fc2ff5f318481b85b25abc6
 EBUILD libgudev-236.ebuild 1070 BLAKE2B e353dceec8a5bde960cad17d994f0d861eb2b619a191235f6d8a876cad3daecea52fee39f176d375fdbc0d86c51015c99785e3e4c2335fc5fa707cd8cfa41e85 SHA512 9c84e51ae33a92da3046e6d878379e0574277c656d83382d16c39a466c18ce9ac01ab21c55b1f8e7fb188f63f0a994c34b439575cad62b9e5daac6819405868f
-EBUILD libgudev-237-r1.ebuild 1238 BLAKE2B 43b3dd7757545909d9af96e5064d83d8bcad69233708cb053239330cf752929e310802cc83af755f9231e091d82535fb280033835d631617a83cbf488131ab10 SHA512 91d65bcc233931edfc6db9a1c44af2c71c2e9a6638c890cf9c4642b7e22b4e22ba7f585e5ea01f53804042d1c6e1df728b36aa20ab4802bd81e26e49d716a052
+EBUILD libgudev-237-r1.ebuild 1245 BLAKE2B 73bdb30244cae4f3ee0ff7f2e0d0412558b721d1c681bddc44539bd5422223427709b0c818ec5328d74d071272bbb596102d88271576dcd8ec765983510f5179 SHA512 69bd3fd124f012293ca2742ec06b751a7393f3f14f0d3a1cdda8d63e124617eabbf12c81479c133badc87414e7c9a12f4d4969be107d9ab1e19cbc802bfb4832
 MISC metadata.xml 334 BLAKE2B 16d65758def16c080294ffb595910025504d5a99302bf2e6901a9e24780ded6358396e7a7376538c5d6236f4fa277d450559d601d2969b417a81a3b54d607a96 SHA512 2ca5619250aa499b2580f036db00a273f0d719dc1ee283e1e6931c1a56d87275e130fafc9ef8f776aa2894b11ed3adb895a1f8cbf75a03bbbd86a3a9b3781075
diff --git a/dev-libs/libgudev/libgudev-237-r1.ebuild b/dev-libs/libgudev/libgudev-237-r1.ebuild
index 0d33ffc69483..a6fc1c64e605 100644
--- a/dev-libs/libgudev/libgudev-237-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-237-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2015-2021 Gentoo Authors
+# Copyright 2015-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 4557ff00fbc7..9e47d5a8a0e2 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,3 +1,3 @@
 DIST libgusb-0.3.10.tar.xz 42972 BLAKE2B 4c49aa15cbbbb56d5ee5b896adb3e34b45332cd846933fd3aa86a645e7d897418d0e7a30d9972980e6527f1e60fc6e579f5df119708a12b3e504ff695c94d922 SHA512 66bd7c292cb9df2799b02acd48dc4b07794e7339ea1bd6473ea512dfec1b8e7e58abbd40f16a2a4805240cc8df4aec050335edb4f4178ad12ac5275438b8ae59
-EBUILD libgusb-0.3.10.ebuild 1512 BLAKE2B 2211671dcf8d9d9206cf680cb23971a1486a3115f5ebee32550cac9e64e598e02afb09ff76717ba59e6039177db43e5dd8c4b768dd6e00652360cfb58f8970ce SHA512 f56bd75efc228a983e8909aa236cfcf34b173bacbf94978630241b63dffbb2ecbcac88929282ac7201f04e34ecf6dbad0ea3de198b190777266bd0e111939aff
+EBUILD libgusb-0.3.10.ebuild 1519 BLAKE2B 63ca13cf5c6fca4a3654de2f41603a384248c5479a5fd54b25cddf5823c97be152d6b25e63ea8c29cda59738893a494083788d6f25a7e6dad6f7a32095668c72 SHA512 c19ec7712e2a532dba2b640ef9bb2e0d371a4de265ed8e5c12f23527f7300fa95a3d79e9d0b149560b51712b2596bc1a4ce3645906553f3e6edabadc35260b64
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.3.10.ebuild b/dev-libs/libgusb/libgusb-0.3.10.ebuild
index 087083aac2ca..29e94cb87a56 100644
--- a/dev-libs/libgusb/libgusb-0.3.10.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index f3d9ffd590dc..5dd5921bf4df 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -5,6 +5,6 @@ AUX 40.0-meson-tweaks.patch 3192 BLAKE2B e30f8f47beaa9683b6709389a0c603b28bbf160
 AUX 40.0-tests-locale.patch 2023 BLAKE2B 97acdc022d38e465bd114dd3411b33752827b77167894386384614a1e0ec19f8abe1a2f52aa785dc768bb3599e20fcf64330dfb220c3519da93b42b38e736c3c SHA512 4e8edc725bccaa30ecf19f428e2e863b2cfabeb209bedd9095b12e149600ec2fce7ac8b385b1e7655d0262c8810a60891272956a829e70b513b16af0c1463435
 DIST libgweather-4.0.0.tar.xz 4722620 BLAKE2B f2500d065fe9607b740c2f6c87378d5fc86c15951b2880f89c3ac22021d085eed601b645dcf1c9864fe1fa47860aa14ed1ab858263a7634c3b7615231d3ee6d1 SHA512 1441b8996a53b277e9453d3fcf32448800c963f40c32542f9055362bc3188dcf2e706466133d53b3f1b6343dc97b15cf5eabe16b950e7c9451cb79eeef87a9c3
 DIST libgweather-40.0.tar.xz 2704404 BLAKE2B 27bc69c350ae91a07307d75b5ea1d03bb251f51bf87d5d54861965b61d7ed825ab708466cbe9d961c4f544b8b17ca6ed37b723c003ce2c1ef020270d6812c61d SHA512 72e295246bf03550039a70bd4bf5b8f06357a6b70e04308c197fba309e406d410a97d128d849d97a29a6a114faa1ef5452e6632870b7ea45223a0c305c228cc1
-EBUILD libgweather-4.0.0.ebuild 1714 BLAKE2B 0649c0a0cd15e507e2cbbc75d2c29c4dd6f85e4b51cb10998140698e8d21053e2eb1df08260700c93bc8e238d841b1975cafa59bf0c540f2920a84fcbb2adfca SHA512 2c36d5b7a30c24d3049c434f4392d757e3f6e9a6492deadaae0a6702ee5854c9e042351eba7023b9ea689ac573471f6a761e38538f5e7f402ad2c14682dfc9f7
+EBUILD libgweather-4.0.0.ebuild 1711 BLAKE2B 2fe9021098d355bbea6827a490bc218a9ac1182890ea71726e45b3bf78825f895d5b4504e4b33e6620851c552586accf26faa5f524caf112f65d11b1b1784cfb SHA512 30ab755dd61ad78acae55beaca4124f6faa42bf422265c50ca4ece0da3960c5fc390d30df146bea493d5862336931f0b8d05ac66c29e9c5732ca09ef941fbe00
 EBUILD libgweather-40.0.ebuild 2116 BLAKE2B 2faac8e29708c643ff2e7086294871bede550d97bea1429af2cc64a1216c2fc9d9a66534bc36227cc5586a5618336fff3bfb25d43350d3e92c53fe123d7e40b6 SHA512 55a446794a6ffafff387f2254b550a5045a3f94bb740443aa33a37db32f02e094915c8e3204d77fa66e10125797215dc06ea34c59d8f1637de8361f8ac47f4c0
 MISC metadata.xml 350 BLAKE2B cba370b67a1b0ecfa341989e9590fe3c5dfb165349c5a874bc968ed5d3f2e42185f2872034dc8d847f878b68f6bef6d40a19883868945834bbab18edc6fe028f SHA512 3f2b10a36dd71f822b9cf2c799832c8725778c918c4a83e80431443b2c4ae3fc8a5d36071e0b02549fcde4f11aa8f38297fa7394363182abf0ab1a06639f92a2
diff --git a/dev-libs/libgweather/libgweather-4.0.0.ebuild b/dev-libs/libgweather/libgweather-4.0.0.ebuild
index daa592786342..1eacd217ee12 100644
--- a/dev-libs/libgweather/libgweather-4.0.0.ebuild
+++ b/dev-libs/libgweather/libgweather-4.0.0.ebuild
@@ -16,7 +16,7 @@ IUSE="gtk-doc +introspection test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 4d1b34a2ed67..2faa93006c83 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -3,6 +3,5 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17
 DIST libical-3.0.12.tar.gz 883537 BLAKE2B a67cbf767f5dba7717c80b2ed90f257025544b6fbbd85e4d10712fb63ec5d750c00e9a1d664b0c75f7e833847aeee2fc1412866bf4b599ead663132b3665835f SHA512 e97aec11895d4c51fcb1fe32598f5fc23bbffc26274d1f46e74d1b9a365bea65446563224b852d13a763334eab0375e77cabb5ba535d3b2f89b652bbe24b4517
 DIST libical-3.0.14.tar.gz 887795 BLAKE2B 8c073b77b5e4e6b24e3dfae7ac7a5f88da874bdfa53489cd04afd4d458d2fc963d39c2816691e777003ca9af510ceaf7bab9d7e1021942aa9c3adaad32ca8341 SHA512 36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8
 EBUILD libical-3.0.12.ebuild 2470 BLAKE2B b88d73cf9650df8db27900f7d6cf7dec9147fbec3baa47739a2952d04b7296896db5a045822462b5083791ab744da8572f875c9c3cfeb0b56638c6bfd91e1ac5 SHA512 1ad241526b56cf35498e582887e66813486b7922eef140b92b0a12861f6ef2d373b798961eab25870e031f352909ed9e20443e0991bf725f25e68f7e2f5c1163
-EBUILD libical-3.0.14-r1.ebuild 2440 BLAKE2B 4c80199afe8ad9cb6326d45099b35da71d6ccaca648fc32dbe56230aadcc515d4143bb0d276806504ba921bb72395ebffa6be2bd47e69848884c0107aa41e5ce SHA512 1d1e5f6dc065b5450149c4516a6e23e1b3a741ce6c98bdd13c4c3c288e8e9f77f78dc1b009dbdbb94ccec09bcde1c6230852e45ba9a50e7a864ab7a4ab29955d
-EBUILD libical-3.0.14.ebuild 2483 BLAKE2B 2c8f9a13664b4bbf048ddb2ff2d527fe19afa756ebeb6095ec499476e3e5905c5096ba29065b4debbff0e8e748a0c648a982fbf7629a348904e958a34c159c69 SHA512 d756f5e5513b0b313222ca381fb2c3c48522e7928c6b1454db2336cbb09de4819d90da890f962186638dcf8acfe219c00e5faa89a7afd41aaf1b217e27aa7124
+EBUILD libical-3.0.14-r1.ebuild 2433 BLAKE2B a56e65ff0920b976bb409ab6c1e28726a9a23dd4ce17bde1254ed17b44cb4ab6f151fc49777c38408eb15afd3e5f9ea31c5d2e78ee4be04d9a2781f0a10ab558 SHA512 db89e44f96d3f1f8744660289441859234c940e1920fc3eea10eeabaaefcb508e06414d4146c4bf2ebc1d8298945d57103d3989e9bbf4f38d4d5053ddb8f6aa0
 MISC metadata.xml 415 BLAKE2B a03d59a58e875698695319e5f427ef82ef11dd8aaa457cc6647039ec57583d730d53c5040b5b76007bf9662a78684968791f0a15ae7172007d4c49ffe8fd2318 SHA512 0663988285e1881903c0e8f62bd5ef99c26089b54f4abfeaa0a97f5ecc9820586b1a20077ddea24bf4e513b8049110f08c33acde433777adc1dd6d03f7ea7966
diff --git a/dev-libs/libical/libical-3.0.14-r1.ebuild b/dev-libs/libical/libical-3.0.14-r1.ebuild
index 727ee343e87a..0d3758945c83 100644
--- a/dev-libs/libical/libical-3.0.14-r1.ebuild
+++ b/dev-libs/libical/libical-3.0.14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libical/libical-3.0.14.ebuild b/dev-libs/libical/libical-3.0.14.ebuild
deleted file mode 100644
index d42636f3b9c9..000000000000
--- a/dev-libs/libical/libical-3.0.14.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_USE_DEPEND="vapigen"
-inherit cmake python-any-r1 vala
-
-DESCRIPTION="Implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="berkdb doc examples +glib +introspection static-libs test vala"
-
-REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	berkdb? ( sys-libs/db:= )
-	glib? ( dev-libs/glib:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	glib? ( dev-libs/libxml2:2 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-libs/timezone-data
-"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		glib? ( dev-util/gtk-doc )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	test? (
-		${PYTHON_DEPS}
-		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
-	)
-	vala? ( $(vala_depend) )
-"
-
-DOCS=(
-	AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents.txt,UsingLibical.md}
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.4-tests.patch"
-	"${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use examples || cmake_comment_add_subdirectory examples
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package berkdb BerkeleyDB)
-		-DICAL_BUILD_DOCS=$(usex doc)
-		-DICAL_GLIB=$(usex glib)
-		-DGOBJECT_INTROSPECTION=$(usex introspection)
-		-DSHARED_ONLY=$(usex !static-libs)
-		-DLIBICAL_BUILD_TESTING=$(usex test)
-		-DICAL_GLIB_VAPI=$(usex vala)
-	)
-	if use vala; then
-		mycmakeargs+=(
-			-DVALAC="${VALAC}"
-			-DVAPIGEN="${VAPIGEN}"
-		)
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile docs
-}
-
-src_test() {
-	local myctestargs=(
-		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
-	cmake_src_install
-
-	if use examples; then
-		rm examples/CMakeLists.txt || die
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index cc13ce0d5c50..a7bff0e68e21 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -3,6 +3,8 @@ AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81
 AUX libiconv-1.16-fix-link-install.patch 968 BLAKE2B 29d67eb01de00f68b1245a8fe521caf3da262ac0d78da615aeec1e67e08220e6366e1cf708775217e94e282a7b6c236edc322016c3ebdb37486f5e789e4655a1 SHA512 fe5b5376f491df5ef2d01496232e56742b86d52ef043dad21993cb4f463b404c0b8bfaf46ef7fb0d3d8f19504af9875b5096c6a4392ec0666416e0389b1d1923
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
 DIST libiconv-1.16.tar.gz 5166734 BLAKE2B 8e7f4d64d757db6c3ffa973c9cebcf20b34f9859a547dbba8cebe3a4865bda86f33c5be197951877c46eff5a7fc00b1b11474fb3baa036f08ac2faf97eca138c SHA512 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7
+DIST libiconv-1.17.tar.gz 5413283 BLAKE2B 1d317dd0655c680a2082c38561cdff51ac1a9181d4734a8bb1e86861dfd66f1a6c0846a90b5b88f3b38b1fa9983d9e563551f27e95a8e329896b71becceae52b SHA512 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86
 EBUILD libiconv-1.15.ebuild 1661 BLAKE2B 71536b7702adf5254b7018586b1013bdffa69f012ed63debf67d6928436b78e1cb40d423cac2d364632e87e3a24e6910bbc20a99bb29a1e733ccd417e3505df9 SHA512 b6073de175b3f5ebde9fe78b92017190344f8f9c98f76a33b9624be25fa1742ee57d43e5c1a163d5168d8ff27b445966db1deb5456dad201040d6a0b451535e5
 EBUILD libiconv-1.16.ebuild 1509 BLAKE2B 2ed27646d9ade07f36d40d8cc169f79f24916891355168a4872e09a8294811a9136eeca7b2b61357fb7589e6f6ae86f89b0315f7ff0f41196d2f82e0d08ffa7e SHA512 c8aeb2cba82f35c60d4364feda8cfe88da5ffd2d49a183dcc5de5a46a2398d2d8493d3faf1d9274573acbba999abaee121e146fe39593d8973d0fca5a9dfb667
+EBUILD libiconv-1.17.ebuild 1448 BLAKE2B ab9b62762e91b21e7ad3caa3e4405e54c8717ea8f5029e07f2a095e6147977e96b9e59c9912680df4786f75084a0870dc266ebc2ec90d6e3c73b1b7997c74eb7 SHA512 5b28395bbf30c90877cc222bb8ec27cdc14a3a546706a64e9238144aa6ef22c32b027546693deb1cbed0d475c8a962bbf2941db6b6a8d0c7731472cdf2071a19
 MISC metadata.xml 466 BLAKE2B 6393ff7a79bc98751c816e1c753f86224a305e5cf242028d29559ce27f4439f76cae30f735298efb69ad2d1059d636d8c753e21c4f12000c8e024afea9f0df5d SHA512 71547717b83a866737aa75d79a488a6c1ac1003bd44fac367df845a2bca95d986b7e90c0d85e807212f66ef7ca23ccc622c239ff1ebea4e8d331bc013ea97d55
diff --git a/dev-libs/libiconv/libiconv-1.17.ebuild b/dev-libs/libiconv/libiconv-1.17.ebuild
new file mode 100644
index 000000000000..44e0fff50f00
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.17.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+HOMEPAGE="https://www.gnu.org/software/libiconv/"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="prefix static-libs"
+
+DEPEND="!sys-libs/glibc
+	!sys-libs/musl"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.16-fix-link-install.patch"
+)
+
+multilib_src_configure() {
+	if use prefix ; then
+		# In Prefix we want to have the same header declaration on every
+		# platform, so make configure find that it should do
+		# "const char * *inbuf"
+		export am_cv_func_iconv=no
+	fi
+
+	# Disable NLS support because that creates a circular dependency
+	# between libiconv and gettext
+	ECONF_SOURCE="${S}" \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}/html" \
+		--disable-nls \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name 'lib*.la' -delete
+
+	# We need to rename our copies, bug #503162
+	cd "${ED}"/usr/share/man || die
+	local f
+	for f in man*/*.[0-9] ; do
+		mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+	done
+}
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 56a1b26b67ad..1ea996062f1f 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,5 @@
 AUX libindicate-0.6.1-no-mono.patch 1888 BLAKE2B 60cb0434e3974cf474fca729be08defcaa01d713e4039001f4994bcaae0a657fd04b0c2eafa447c25c2e56d92bddd39f2b17915fdb7d26b916eae3e3315588d7 SHA512 b2623349c139321403e285ce384191f2741b6216dd87ce5e05a439bd175a2846bca111ade729e87322a413bfc518fdfc2546274114fe5726de171b51d3be7cb1
 AUX libindicate-12.10.1-werror.patch 343 BLAKE2B d7c64d707ef1d5dc47e865458ac6617c49842cf26001a1f74c69b226cf13b281c08cc854ae4df2de6cb36a5031eac107c88592a0134075e7b91f5b67a7c7c683 SHA512 8a385ed6cd0a9a216c675eb003497e15415a25666a2a475be2bbe7fd077ebf4fb8566a4252e53123f372adcf49fac48cfa8ffaef7c6ee6fabef98edf06f3d00f
 DIST libindicate-12.10.1.tar.gz 550378 BLAKE2B 9966c645c2538bf9246221e138771ce38e7f74629ae2365cd803a5e26372922cd5194ca1449f79a35f2bcd391e3ee2056183ab53b11fa8d92a8b2c258ead9c6d SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06
-EBUILD libindicate-12.10.1-r3.ebuild 1702 BLAKE2B 4d85590aac09c71161deb2deaac47082d7cb742a1cf25388a83e0c7e5c1d68756f14900a5c645728eee7f9bb7fffe17ff6b8d9691d63563af30a2761f7204b74 SHA512 058fbf32fcb53cf08b8da92ec7fa1fc30ccac7af3aebff141dcba226919ff5cd3f1b5edbf7b42b04ef81bdcd7b42e55eac02e1e63e3c153ef94887ae2cdb32fd
+EBUILD libindicate-12.10.1-r3.ebuild 1707 BLAKE2B f9e96c55d3964d41f9f6ddb3528b931873e28d5e4e37ff93feaf05149f0e7dafc4728bf0c2b0908c28eed2b68779ce644f23d177ecd293bb6365463607d8ceb6 SHA512 bc20655fd05ab98607c908005c99378f9b90ac1067b051c0010255fd5a857c904e8dd02761181de428621dd01f00cc2771a32f7a96e7d5beace0f78c06c4df97
 MISC metadata.xml 247 BLAKE2B eec2dcbcd33f264a92a826ef6e2817dc76b1fa8612c04d9b6404e24b0d210071908466c77f9dffa1349f49b14920c37c017b65f7f184166ca816840ada88edf3 SHA512 e9bb0332e8873e5fc733d47280c49cbeef950d32999ee14bea561e2af2911d7b467da253ec8bba84aac703b9ae6090d690bbede71a4e58ed45a4b1ef513bdf55
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
index d0c6402d4d7d..22b3891f2d6d 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv sparc x86"
 IUSE="gtk +introspection"
 
 RESTRICT="test" # consequence of the -no-mono.patch
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index 86b92a719bb7..bcce8d6c90cb 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -2,5 +2,5 @@ AUX libindicator-12.10.1-no-werror.patch 5307 BLAKE2B 8c4c9a4277968c1598b0d5f208
 AUX libindicator-12.10.1-nonbash.patch 573 BLAKE2B ae6b2806c99d99c83b36056b0ece7335ab673339e8ba275366efed3bc68413563ef4baffed64a0e3113473e8ae6dc0a143ae388e5280abdd7b84be97ee9f2afa SHA512 8a436dc62fb70d857b2bf3489e576e72fe9e06639a6563cf528686b6646adf2dbd5418c0904d986e44f5a3f9bf41e3687ce7cb2ff7895680a0d2bac792c2bb74
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
 EBUILD libindicator-12.10.1-r201.ebuild 1362 BLAKE2B af1856a0dcff13426d85530e178a7b8aa200342107d6dd14cb169664306b656b1fafa7fabda7f3237a78ed04abd2fca6551958bd4c5ed133af96179edd90b089 SHA512 2560bb73a841f80b401d0607e0843eabf2765f0f1e44483ea47dcd93a5dc98baf971b1aaa08e68308591fa0313787712e9d1d77d437880ba6e1730bd87540a78
-EBUILD libindicator-12.10.1-r301.ebuild 1282 BLAKE2B 6efe80de06ed84e367fcff8ec7eeb099dff8a8d57b56b85efc23ce0cbda3d1fa807eec48cc66655734575ee215ef9c7e4991e6b469ccbb4945456426d30d3b98 SHA512 f9f24158408eb05bbac976314f7c2898231076b0685ae88735daa40c70cd661adcc6b933c1dae8a55d37b02008628ded393dba355b44a8a865f170347269a759
+EBUILD libindicator-12.10.1-r301.ebuild 1280 BLAKE2B 0e2e6a95508d30e7eaf650e61bebda4eb3cbbbc123527073a11640a24bd8bbaa2e13bca904739a89ab1cdbb54ac0a2616e9f8cb62c2f46d8612191f2e1a0ba6c SHA512 5468636caf50e69215e75156346aae486e3ddcfa9c7dfe5edede7a916c609dc613100793fa591aadbd029e6f0e11e300af124286d508e06d0a010387f1a49285
 MISC metadata.xml 248 BLAKE2B edcdd1abd2798a2c7fa20cbb2dd76cda916f88cf47f447d4455c52f0f70d3efc68733e8db830d366d72daed401f3dcdd0abeb130e5d897ca0f5ef1720123b7db SHA512 8e2c70684f63199fd8117d04a580d8cf31c6c3c3ea0e52723fbca1ca328a1250f2477408648d712e32f523258be0a851548091c96b12c40b41be064a8853b633
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 5b41cde239d7..d17799864421 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.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://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 2419a431b860..209f0e379b43 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,5 @@
-DIST libinput-1.19.3.tar.xz 655164 BLAKE2B a07d91603a3d4e759aad25ee46b11dbee47eb013a2361f1b70acd616fee0ed9660e6fa8773948d6acf3686179fd7aaf76bf8285f3dc3137a4b1b605ec0e4d6d2 SHA512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298
-DIST libinput-1.20.0.tar.gz 982547 BLAKE2B 6a30ec5473b7271b89a50cb5147900928bc1ac370cb30bb7a9282517f9ced1973e7f83e864a865c840a1f1fe447459c329b8966211cafcd28f8d1285a36de593 SHA512 b92345809f4e18b2335e3c377d1a8edda523462ff23fba6abcc5f8cf01b80fc4c6e4e06886088788c4b04873d37da210876f201bb81203af2f9f614bc659e6eb
 DIST libinput-1.20.1.tar.gz 983069 BLAKE2B 8e63e286c0c4284f4a61129d8b6394e7ca9f2018c6a2781a7fe4b7389120dcaf5c101ccfb4b0b869afc489999e954ce244213b5d206ff546d698068e738ac853 SHA512 91f6d6957b16d76807b376d4f81333ed16218fd37b090417d03a2e551d1f5b2c734d891d267bcdc4314cd698d7830f2f467389a9af58155e4e97a86002c8db78
-EBUILD libinput-1.19.3.ebuild 2260 BLAKE2B 5ff2aed88d53ebaee2c869ac6173fa946cc324ad58a1918105571dcc21e191fb2a94d95326aa74fcc77603ece590807878861ddbab63f38948bb4e186a93983d SHA512 0e1da4863310b22e9fa96c1b353091da77c406788adc282483dd5c376085d27b8b8809a7751276e3e5ca6be38e96df5c8c96ec9530c5b13982e8ccc7340f16db
-EBUILD libinput-1.20.0.ebuild 2283 BLAKE2B 867defe25d1b809da4b6bafcc8a8d5fd6c8b07194fef4492234196a64bb5ead4e55a11022ac7da584908e91fedda9f44f13bec464693ef1e2039ea4dcd94e3c4 SHA512 d77f2cd866cca6b86cbe420650ddff486a84e04d9b35f272184d3353049663d97dfd7bb8ba94a285416dbd2471c37c1a8a346fd88e3a5178039c4b63308a9884
-EBUILD libinput-1.20.1.ebuild 2284 BLAKE2B 84c831b0d0f11e999e5575865bac97a2da5ebfe53bbcdbeeb78497f075f0fc61ea3b61d382c63181c78ebd32f0a80b489403b05f3a73468497fab0df5cbaf610 SHA512 3ba231e3fcb916bfd6e5a6472e905fe89e3ddd04242bcc45c94c04cb3002624d32d045a3361281f852c8656770c0b21a4f4f2c8e2b5b3162f84c1c47fa71ac09
-MISC metadata.xml 449 BLAKE2B 677e5fee3bf4047ba47b90aca7f30b9ce57e947e6b5f6903cbb93c214b084f0d93f6253980090544d4ff4a821263c156e0706ae5499cacbb2e52d629f3a7b253 SHA512 103e8b39ad6b9ffde159095dbc4553d8b695db44e49582518055313c79ff6123bcc424c3980cbbaeabaa455e00a828039f73c1f3424ce038d5a2d63ed3e7849d
+DIST libinput-1.21.0.tar.gz 988650 BLAKE2B 54c63beeff8dee93a52774220b45321d8a94261687b463319fbae9246331b532be7995a5b32c30425b9d0708b2ba69d4b4e83e8dc7ecebe6fb1237b723a266b6 SHA512 510273d68f2d4cfa61564a706b1f334f6bfca0d1c8faf0bb8aa656cf3fbd5e38d79d6fbaa01a20d38bc15777c9afc341e4ed08d35ef367ef3803ce788cbc4a0e
+EBUILD libinput-1.20.1.ebuild 2283 BLAKE2B 754f84445b4463b180195924f578489b47cd1dfeb470c88706221017bb2349ee048946354f3046f080bcec4f43f41d3cb4fc2cf0af588282692ff748e74af14a SHA512 9c28d1dae06394957bc7633627591b29914da2f8247096b19e9d8e8b77499fa3386b8cd034c4195d14f997b4d9756b415322951320954206da51798daeb79eaf
+EBUILD libinput-1.21.0-r1.ebuild 2296 BLAKE2B fe5ca890d1308a7fe64ae6d3ed754bb2f5ca65fe61ebcf2556a1cec491643627ee1224626245803e7e319fb216bc744b87e76c828b3474c7a3ab40d8013f0c0b SHA512 9c82f7d0dd8af35da1e588b319952c520345dcfe9dd95498d72e52e7ad41b1ed661a80a4d5ed66d25f21dce458ad56a2964260dfcb7d11ae128200d6109f25fc
+MISC metadata.xml 341 BLAKE2B e1cb7769e8f3063d1245baab1d245aba45bdb7a999b7e5aa14d8fd5c1c22b536c06ec9ef05fd7d80cbe6ffba5e1098e92ec8e171ca4ed60738f5133756f56298 SHA512 67fccf3af813aff702fb1e0daef3cb76e394f706741ac823beff0148b2da9f922a5ca5747dc44df28c08ec7dd255a09c7b48735fc0f42ed4adcf82cdc623e396
diff --git a/dev-libs/libinput/libinput-1.19.3.ebuild b/dev-libs/libinput/libinput-1.19.3.ebuild
deleted file mode 100644
index eb86ae8388e5..000000000000
--- a/dev-libs/libinput/libinput-1.19.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
-	>=dev-libs/libevdev-1.9.902
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
-	has_version -b "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version -b ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed "s@, '-Werror'@@" -i meson.build || die #744250
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.20.1.ebuild b/dev-libs/libinput/libinput-1.20.1.ebuild
index 6182a2f61425..9b5fb5fbc568 100644
--- a/dev-libs/libinput/libinput-1.20.1.ebuild
+++ b/dev-libs/libinput/libinput-1.20.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libinput/libinput-1.20.0.ebuild b/dev-libs/libinput/libinput-1.21.0-r1.ebuild
index c14415db2dff..acb03afb6c54 100644
--- a/dev-libs/libinput/libinput-1.20.0.ebuild
+++ b/dev-libs/libinput/libinput-1.21.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson python-any-r1 udev
 
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
@@ -32,7 +32,7 @@ BDEPEND="
 "
 #	test? ( dev-util/valgrind )
 RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
 	>=dev-libs/libevdev-1.9.902
 	>=sys-libs/mtdev-1.1
 	virtual/libudev:=
@@ -84,5 +84,9 @@ pkg_postinst() {
 		einfo "libinput measure and libinput replay tools."
 	fi
 
-	udevadm hwdb --update --root="${ROOT}"
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
 }
diff --git a/dev-libs/libinput/metadata.xml b/dev-libs/libinput/metadata.xml
index c313e0866830..5d5a1389f157 100644
--- a/dev-libs/libinput/metadata.xml
+++ b/dev-libs/libinput/metadata.xml
@@ -9,8 +9,4 @@
 	<email>x11@gentoo.org</email>
 	<name>X11</name>
 </maintainer>
-<maintainer type="person">
-	<email>polynomial-c@gentoo.org</email>
-	<name>Lars Wendler</name>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index b9655c6bf770..32227b637ec8 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,4 +1,4 @@
 DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
 DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
-EBUILD libintl-0.21.ebuild 2262 BLAKE2B 4c096f1e4b627f8791d4898dc88296305666c5d58f9d95c9910f29b8f0e9231453556a4e147bad9058ecaa963efa00edefaf426450553fe1c481589e28eb1d9f SHA512 303a646e0737a1ed5af394f344e0d2de8f9af9841db6b30da99e7cb40667f5baab5b28e67be15c5f3ff4672043652a9123df758c73a11e088b75f9868513e4d7
+EBUILD libintl-0.21.ebuild 2306 BLAKE2B 60a9ddab1a16c75d69c68469a519bb15a2da78915584b034e619765f9b8dfd9d566702dff32b9f796860ce69feb58252ed53ee96c44af4740ae5f04d4d36075d SHA512 3e3135769c793b7077c188f1122e15a19cbb1f8d92ab734549dae85e2cb5c52b3457db814674a802f85a9c885aed9fcdc8ee00cb7143bcd3f8d3e09078835be5
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
index 54944c9356a9..c0d55f3fb99d 100644
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ b/dev-libs/libintl/libintl-0.21.ebuild
@@ -38,6 +38,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=(
+		--cache-file="${BUILD_DIR}"/config.cache
+
 		# Emacs support is now in a separate package.
 		--without-emacs
 		--without-lispdir
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 0d4f9846dbb4..cc61f3bf3a59 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,7 +1,4 @@
-AUX libixion-0.16.1-clang.patch 621 BLAKE2B 2ab9add51942858edfa7fb6ee65747a0723c1a7160f4b68a0fec3e6a4712d21c157ed22e06651984cd60f2c2f7028a48dd47686c7df1bcdfabe0a0e3690c5e58 SHA512 1ee44c798dc04cb4e5ae91f37d9cd432e8b84128245232a4bf30797d0a5d19a812d208c4e4b322f65d15a7aafca81effae9519f1599856c510a300cbe08d76a4
-DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
 DIST libixion-0.17.0.tar.xz 499836 BLAKE2B c8c31b07ad14dd49be259686af3e39e6f5d4aeeb8680030ea7bd2697c8baa72123f2659b3087f224f956612dc444c97e6a6d331fd3deff780981bab4d5b6ad25 SHA512 0acdb2eae5250236a94b1a3344ca990058ea8db7b1e741545bcb7160f9e28d21a3c2ec336621fd590df10188a4d5feadfbb3a63f57e9bfd2cc1bffc04009ffad
-EBUILD libixion-0.16.1.ebuild 1252 BLAKE2B 75b64af1f6eea1a0d4dd256cfa579137555e9c0476e485ea70b3ec5dd4c65a39a78080bdce38ac49575219e03c7e37595e0647cd7efff43fa664d7a35d7c7de5 SHA512 c13486e9162c1b0e81ad859f65fee8cba74128ac8a5cbddabea96ae7787f248468fc7d10b797e600c2ea8e10b1a4e6dbdbd4de472c84005801e41f06137b4030
-EBUILD libixion-0.17.0.ebuild 1210 BLAKE2B 27e9e5b70bf6e76177367fbad12eb8dc68e050b814c3817907f1dc47583a16ba064143eeaabddc0de6a92e80c343e0d81e77c80d40ae47340176ae1fc4d810c5 SHA512 ceb3291c9d5b1a7a6da3d2efe081d71aecb905908f592275a51d770bb6dd0353a2ba8ecb705fd47ec637bbade0c9494333afd18a08784d82de2a60a254128cca
+EBUILD libixion-0.17.0.ebuild 1207 BLAKE2B b88a9b28d276d6f2be1d5f97e2cedadf9013722096fc58d31a6e6c59c181877df4f76703bfee6d26dbf6c32f48421f4ce2fb7e47f88334535e4dd900a728dcc9 SHA512 c4c054e05d93058cc3c810e3e055fc4f487efa38057e33620001b98d19893dfe060eef451f7daf047d5bb7bd4aad059a81e4dd6e974347fdb654390a06269242
 EBUILD libixion-9999.ebuild 1211 BLAKE2B 4c7340dc18b7640b81d83c1ac6c3e0f9063c50c84d6d0f000b6889ec44833a165eaf5a1bf5c28b758cbcf51b03254826f20a74990a8ec9385ad00ae069efecbc SHA512 344450f3e309eec3b422792a21478a9714379828abe6a7c8890ed690d5b32147d6ce8227db867570b8cc98dcc2799a538b9089b7484bf663968643d20cc720c5
 MISC metadata.xml 398 BLAKE2B 0c2320063cc47c8a993ed456ac3a68466ce443b910d43739552d0f365dd178ed59ff76b2e23bab38b1962b9ce8cc973c03125096074a8bc33b09c8789ef236a5 SHA512 6599412f7feebc12c72eba06522563ff16d700e953d6ebc54f88544e49ad5e48e265b939a4fcfd788776abfb03110a8a27800dee71f031ae27eb207a8f924451
diff --git a/dev-libs/libixion/files/libixion-0.16.1-clang.patch b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
deleted file mode 100644
index 802d43e71592..000000000000
--- a/dev-libs/libixion/files/libixion-0.16.1-clang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://gitlab.com/ixion/ixion/-/commit/1992b8ab9c7765b8da06b6054bb3c0ab990c62f7
-https://bugs.gentoo.org/793917
-
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Wed, 2 Jun 2021 10:19:01 -0500
-Subject: [PATCH] Fix nullptr_t for clang/musl users
-
---- a/src/libixion/model_context.cpp
-+++ b/src/libixion/model_context.cpp
-@@ -17,7 +17,7 @@
- 
- namespace ixion {
- 
--model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {}
-+model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {}
- model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean)
- {
-     value.boolean = b;
diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
deleted file mode 100644
index 0f397c8828ef..000000000000
--- a/dev-libs/libixion/libixion-0.16.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-single-r1
-
-DESCRIPTION="General purpose formula parser & interpreter"
-HOMEPAGE="https://gitlab.com/ixion/ixion"
-
-if [[ ${PV} == *9999 ]]; then
-	MDDS_SLOT="1/9999"
-	EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
-	inherit git-r3 autotools
-else
-	MDDS_SLOT="1/1.5"
-	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.16" # based on SONAME of libixion.so
-IUSE="debug python +threads"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-util/mdds:${MDDS_SLOT}
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable debug)
-		$(use_enable debug debug-utils)
-		$(use_enable debug log-debug)
-		$(use_enable python)
-		$(use_enable threads)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libixion/libixion-0.17.0.ebuild b/dev-libs/libixion/libixion-0.17.0.ebuild
index b5ba56d21851..b9d1533f4c4a 100644
--- a/dev-libs/libixion/libixion-0.17.0.ebuild
+++ b/dev-libs/libixion/libixion-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_SLOT="1/2.0"
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index b0c849fc2066..25e1ec2597f0 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -5,4 +5,4 @@ DIST libjcat-0.1.9.tar.gz 64884 BLAKE2B 30e7c9f6c5fc971144f27bc495443928b8406a19
 EBUILD libjcat-0.1.10.ebuild 1457 BLAKE2B e07e712e1a37587f34937015bd63086f0e03de2e8cc24f7eca2eee2274fdda4896ae6057a262f6481eff4841089afb7c461c47b32c62e0c20c981b4bf95d4982 SHA512 3a557acb78e3338a4aab6305101391a76c218a060a36c064c92b0ba524cdaf70144e947206dea2e682c84d2875ecd33a7d92493a53682e5ddbbcafe8ba9e8d28
 EBUILD libjcat-0.1.11.ebuild 1470 BLAKE2B ed2a59c2aa731b930a31c19d1f977856d9ede4089df8478151de9dca95d09bea39c770aa85c509813fba8ab7a0ecad6722c5bbe5c89cca833c37e77d217cdbdb SHA512 f9b7f964fc64dcdece80314e44318de7b0fa9e458bc59a9c3580a4c40719b7bbdfaccdb4717054ef8df0f2cdedc63438f592a0d79f4afa991b379800ce91d7ec
 EBUILD libjcat-0.1.9-r1.ebuild 1457 BLAKE2B e07e712e1a37587f34937015bd63086f0e03de2e8cc24f7eca2eee2274fdda4896ae6057a262f6481eff4841089afb7c461c47b32c62e0c20c981b4bf95d4982 SHA512 3a557acb78e3338a4aab6305101391a76c218a060a36c064c92b0ba524cdaf70144e947206dea2e682c84d2875ecd33a7d92493a53682e5ddbbcafe8ba9e8d28
-MISC metadata.xml 937 BLAKE2B 95095d1f33b1ebc992688672e5084d67fcc8fadb33e31b367576f4bc73b4fc2baba435a78a0ceb863ae3a2075dfa3d6b936922bcc3890f367ef67fc7afa16abf SHA512 3fafd34b736ec15cd9f202afd1b64df241699a24d5b938422a95e05ef1acaaf6fffd5e95815f8dccbe414d83b47ea98308d375078f02aefef771b23cf23a7bdf
+MISC metadata.xml 825 BLAKE2B 156d9e84141c87c747a23ee11241fbcc753e992e511ecd1028fb6ec904ecb1c309a1a062b18b8c6f19ab5b23107c65fc5a6c8e7f2422edf807f6e9344f5a19d5 SHA512 29b60a241062bf9d2671a648eb8d36d58f7717a098e71cbebc49f7291173c30c5de8ab1365fdf1af937d7b7ad8c401c587905de3cf2eb1f886598873fb2fde08
diff --git a/dev-libs/libjcat/metadata.xml b/dev-libs/libjcat/metadata.xml
index a1eb8684ea36..aa3846c8eacb 100644
--- a/dev-libs/libjcat/metadata.xml
+++ b/dev-libs/libjcat/metadata.xml
@@ -5,10 +5,6 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<longdescription lang="en">
 		This library allows reading and writing gzip-compressed JSON catalog files,
 		which can be used to store GPG, PKCS-7 and SHA-256 checksums for each file.
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index f4f8277608e6..693138f0fcf8 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -3,5 +3,5 @@ DIST libksba-1.5.1.tar.bz2 659280 BLAKE2B f247a2c9545e3c3ae3bbcf50344ca530ef320d
 DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b
 EBUILD libksba-1.5.0.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
 EBUILD libksba-1.5.1.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
-EBUILD libksba-1.6.0.ebuild 1065 BLAKE2B a8e8a1eee7b90fc0fd12e5a657414a652564336e345c3570ae51ccf5a82bac52a74c00bb2c516eb3d88916ffdc3ae5ec3fcf087761feb02cae4320c038becfd3 SHA512 09efffc5f7a0be3e77f1597f3550367218895a38b3ab29346939e2b3d4e2e8f752269671abbcd2776bf8eee39b75598613a0c92db1bd7c44f163c945e56c99dc
-MISC metadata.xml 253 BLAKE2B 7e48c64087529094ef45b4d0dd6189f87d61cf691a04d5b35b97fe6503a83f2e31f1e69ef42819cc21ee057a51e45fa54311618df7f02a111658e6021c5a0288 SHA512 fa83b2f2ca7d6d9f56d9302d1fd2d3593ae553bc352085e8d51e7aa858bbe22088a00cf6e17b1971ac9683669aa22f37f06f1f81aa7b1aca690f371857879ee8
+EBUILD libksba-1.6.0.ebuild 1057 BLAKE2B e3a7e0a602785a3277e7b1a121d5a25377c867f437d4ff43498bae0aad654a0f7b56ec64895ec6f02d4051beddfc72e17f6ea31e7f0e198325ddb3f86f494007 SHA512 20ca2f2811d4cf0aa53e71d45531dd91d588aebedc25056bb0dcff3c2be653cf1cace7aa39850f7b4b3390cee858a652959796da1ad3d1f0bdc2a72c73132376
+MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.6.0.ebuild b/dev-libs/libksba/libksba-1.6.0.ebuild
index 4ac50963a7b4..59e487368563 100644
--- a/dev-libs/libksba/libksba-1.6.0.ebuild
+++ b/dev-libs/libksba/libksba-1.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libksba/metadata.xml b/dev-libs/libksba/metadata.xml
index 965999a77a71..b0d83aa2e489 100644
--- a/dev-libs/libksba/metadata.xml
+++ b/dev-libs/libksba/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">
-		<name>Lars Wendler</name>
-		<email>polynomial-c@gentoo.org</email>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
 	</maintainer>
-	</pkgmetadata>
+</pkgmetadata>
diff --git a/dev-libs/liblogging/Manifest b/dev-libs/liblogging/Manifest
index 1ae26f323210..71de755d61df 100644
--- a/dev-libs/liblogging/Manifest
+++ b/dev-libs/liblogging/Manifest
@@ -1,4 +1,4 @@
 DIST liblogging-1.0.6.tar.gz 593393 BLAKE2B c2ca93225b7594c2c064f14e83f475cf2f3dbf608e77e103759371e81e0052e49624740c35f29b7bf9cd1872f4f85f286a2c903f503bebb170a5337d0dfe0677 SHA512 09c90a93b2d32afa44be5a800705a64690810a56d21bed1455cb70680b01fecd4efef3881a43f98ebcafa996b6046ed8e5af935eacc12014f330a7fd23674964
 EBUILD liblogging-1.0.6-r1.ebuild 813 BLAKE2B 413560488b19378316217c95088f9cb2e7b1bc94d3bbcc03356516d366660d869b7c6b43c8ab8839b04e551681c83562640a8bec607a1f283b5919bc40de9e8d SHA512 07d5d3cdf811f7b7962daa4edc485c28d6dc69ddeff361e28e9fdaa3cd7d853791f1b911a4f26e2d73532e14199f0ba40312fcbc9a9dbea112fa1df1cd003bf3
 EBUILD liblogging-1.0.6.ebuild 810 BLAKE2B 4015df99b46b43fad2befc7d5ee3b12902f42e11eedfb1ac804951d0947dc2d1fed913c4b618b6c35416f498e226289dffd9f5a8e9c204ec1cb1c715faf67075 SHA512 8c06267b26c322caa53260dffe886aa074d69bfef0509e179a206f9c970001112c9895197b91e96dc8d95d231c1ceb1647c8114753d3a325a716cae12bb6abef
-MISC metadata.xml 794 BLAKE2B 119cd2e59c6c86097104e92c1047934edbbf4161e6e802b5662e9ba151da653e979cf0763bd0f25a019b601c1b8c4ed9d1d01068de6b29bf4ee877c1f735e14e SHA512 00f695d3d447da2dde292da32c37ec38f3f2bc953de84f9697a3d01f866cc4c1421ba845edfd164f5455fc5249115738517662a345f877bb0b0f73f80829ac51
+MISC metadata.xml 682 BLAKE2B 565139039edf76c80ead1408b674406dbdeb05bdb5a8cf800a79e4dc318445ede30d4c93e6e9987e7752add7dbfff2d0210e1ae17050481fea075401de12fed2 SHA512 a1649c3eb172a5e587a86b42117f032a2ee906d6eebaa6a056537cbafd9c4c92cb2d0ed7e134e6f487d1d533aff8ab8a57eb8d26a7f4933afaa6c2b84681b2c9
diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 500b9c96278a..8dd79362d8cb 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ultrabug@gentoo.org</email>
 		<name>Ultrabug</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<use>
 		<flag name="rfc3195">
 			Enables RFC 3195 protocol (aka syslog-reliable) support.
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 285e06d5c102..9b081998515e 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,3 +1,3 @@
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
 EBUILD liblognorm-2.0.6.ebuild 1520 BLAKE2B 7c09269c28b58b3683cd9797da9afe33c4aa386819dffba2170907e6951eb193ddfcea204d880b69ce5e21d6aae247e141544a46cd7a14499e4490c6853a346b SHA512 a2d8cbb5a80101a40d1fc77d2852cf8fbfa3bdb30c0dc6ba296b23101e628f63fc88b82de467a5b6a6c1f26f561c08451990936986ec871ca28cb8c7b90e9c53
-MISC metadata.xml 473 BLAKE2B 260ba01c158cb025f41d5c143b0f372a1010daa08f001e2ff8e8fe356214e055bc49e12bbf1b5b1c16115bfa69a8d3cff5ac180f143394c59499d266cbb0e7ac SHA512 749be35314f3cb9f9508e9ea14ccf4748f94f1f2280ec3568d1f62adca7537a9c8c2922edc6f676b2c34937ab0002b76cd6afc629c95a61926e505decd733475
+MISC metadata.xml 389 BLAKE2B 70d3d2a02b694e0a38c9e8f530c41a2f59e471067702c7edffced0d09ad7f4f15e8545541a29b86ddd4acf6d93d841a49f068134a25242f3cbbde01a3b9303d6 SHA512 26ca562d9885ce147feb94b831b2b70da5d4e04ec554356bc2e5b7293c7eb8edfdb9ed86b57ad02fd93b384053c1f6d038b496aebc68ed7771ec14ab90b34a6c
diff --git a/dev-libs/liblognorm/metadata.xml b/dev-libs/liblognorm/metadata.xml
index 1332094b770c..0a2e9060adfe 100644
--- a/dev-libs/liblognorm/metadata.xml
+++ b/dev-libs/liblognorm/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>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<slots>
 		<subslots>Reflect ABI of liblognorm.so.</subslots>
 	</slots>
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 15ee1255dfd6..f654f2a64278 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 1090 BLAKE2B a6b495c108b55e950d09f6a7c5871c5210e187862b01c0a9ffc54e7f1265acbc3d8c7d387a198fc7b365c3b7c269b5b21dd1da650f297fc53553bd56fa13311d SHA512 5b4c1a90f8fc9b8c8625330a87323e277074158e68571107046daea9fa489be72819bf07ed4e3f8cab354a1f4f6f4155c577543382c52346ad0934f59c622fbc
+EBUILD libltdl-2.4.7.ebuild 1082 BLAKE2B 4f991df80e2e7d6071b62c2b196b38ba11d498c4dedfb0722b714e62b49453848d8c4efa81ebe89108ebfa6f39a0271274f5b09099107b7df29c8ebda8e78ea1 SHA512 6bfa85783dfb6ed8535261a4777c50e86532535a80636fe74b1c48f9bdace2fa24d593cb7cdb855aa25be606decd18b8cc79d85b65f87aa7154aa96d89576934
 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 c752f33fcf64..e27886080551 100644
--- a/dev-libs/libltdl/libltdl-2.4.7.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}/libltdl
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 # libltdl doesn't have a testsuite.
 
diff --git a/dev-libs/libmaa/Manifest b/dev-libs/libmaa/Manifest
index 3c911ecb7cb0..e74d328af828 100644
--- a/dev-libs/libmaa/Manifest
+++ b/dev-libs/libmaa/Manifest
@@ -1,3 +1,5 @@
+AUX libmaa-1.3.2-libtool.patch 1213 BLAKE2B 4c3602dbaf602f586d72faf704a447c46b9f41953945f434e451917b4ed25254f016ee2a408db043fcf84ba0b4ca9e4d80b4ddadb75814f588af4eee378adcfe SHA512 76715ea800a0577bd0defa713d06ff9155f4d58c40f6d7931e7c5f7c973877aca9f831c0e4e98d56e91189c388b85ead34e0e9686a4c1a561373c69290cfafc9
 DIST libmaa-1.3.2.tar.gz 287198 BLAKE2B 62432f7f21e353c68a0e9b8f843a5a5acafba5c0cc8e745b07596d7dcaaf9adf723342474b95895fbe1cf003d87d856892ea52196808937b4befdc50ce6d0155 SHA512 dde91e8bf1c08515ff4662282d16a03b18a1dfb16eb7b95be980ba398ed1e65d8cd88e58d454e03a03f48a5ecca8bf23b4ebaf475a98630a9178318c12a1b176
+EBUILD libmaa-1.3.2-r1.ebuild 709 BLAKE2B 241b51374b2cf34e5befe6964d45ca51cd2c0a9f33d41f9148cc4b1767e7ffc9859eeacf00f39e918753810cb52b39ef294676157dd1b1a0a271e83626d0bfaa SHA512 1276e15f84308796add4671e88233d0a1e12a6fa91843d7d5edc6849946e742e7650fca59ff399da5f0165c1a7250d3ee9b21942aa807e1284b14545bf47a970
 EBUILD libmaa-1.3.2.ebuild 587 BLAKE2B 815e6414023ed8c83ad35e5d9d5c31341a42d21925538887dc36e8c32c4c23eb3a5e34c185315b03030c41374429f27cd32f16a6dc6a3e3292c44c11a679a387 SHA512 6cd823d83dc1af56831eab0f15b90f5b87243aff4cd189f2914304de0d6b45cf1991469b23c15c7a8f73a2c5181e0ca6ecccaed7bed9e741e6666abb8eb6fa1c
 MISC metadata.xml 787 BLAKE2B ea09adf2db0d3ad48fd100b3fdf9a8abb516fc9ce75e3503e5a6e5098f5beaded6195ff2c1dd987e92628657c9aee5d54cc2d71038658eab5150562a87f7ca32 SHA512 670545afb3368a782110664a5d3d463be36d4f1ea5ef09430f612ebbdd65456d35d72cba0023e7316358f555224c3c7024a37c07a276e05a5a67c4c937375060
diff --git a/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch b/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch
new file mode 100644
index 000000000000..ca04f423a016
--- /dev/null
+++ b/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/778464
+
+From: orbea <orbea@riseup.net>
+Date: Fri, 17 Jun 2022 15:59:49 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -27,6 +27,7 @@ VERSION=$(MAA_MAJOR).$(MAA_MINOR).$(MAA_TEENY)
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+ 
++top_builddir=	@top_builddir@
+ srcdir=		@srcdir@
+ VPATH=		@srcdir@
+ prefix=		@prefix@
+--- a/configure.in
++++ b/configure.in
+@@ -28,6 +28,8 @@ AC_INIT
+ AC_CONFIG_SRCDIR([maa.h])
+ AC_CONFIG_HEADER(config.h)
+ 
++LT_INIT
++
+ MAA_MAJOR=1
+ MAA_MINOR=3
+ MAA_TEENY=2
+@@ -38,7 +40,6 @@ echo .
+ AC_CANONICAL_HOST
+ AC_PROG_AWK
+ AC_PROG_CC
+-#AC_PROG_LIBTOOL
+ AC_ISC_POSIX
+ 
+ if test "$CC" = gcc; then
+@@ -57,8 +58,6 @@ AC_CHECK_PROGS(DVIPS,dvips)
+ AC_CHECK_PROGS(REFBIBTEX,refbibtex)
+ AC_CHECK_PROGS(BIBTEX,bibtex)
+ 
+-AC_CHECK_PROG(LIBTOOL,libtool,libtool)
+-
+ echo .
+ echo Checking for header file support
+ 
+@@ -110,7 +109,6 @@ AC_SUBST(MAA_TEENY)
+ AC_SUBST(MAA_MINOR)
+ AC_SUBST(MAA_MAJOR)
+ AC_SUBST(AWK)
+-AC_SUBST(LIBTOOL)
+ 
+ AC_CONFIG_FILES([Makefile doc/Makefile arggram2c])
+ 
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -22,6 +22,7 @@
+ 
+ .SUFFIXES:
+ 
++top_builddir=	@top_builddir@
+ srcdir=		@srcdir@
+ VPATH=		@srcdir@
+ prefix=		@prefix@
diff --git a/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild b/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..f19e9a392a5e
--- /dev/null
+++ b/dev-libs/libmaa/libmaa-1.3.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library with low-level data structures which are helpful for writing compilers"
+HOMEPAGE="http://www.dict.org/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libtool.patch # 778464
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/libmaa.600dpi.ps
+
+	# don't want static or libtool archives, #401935
+	find "${D}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 95ec2ef217e8..e22ec557d5f6 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,5 +1,5 @@
 DIST libmateweather-1.24.1.tar.xz 2223880 BLAKE2B e9d86e66755760937e71b983adbd61a5d71a311b1550e7ed445e94d4f74efc4f5d4cf1af17558035c74a0c56b598cc7f464f4a011a873a2d00a26ad4c37c8209 SHA512 1e653a167b12593171bb3dcfae3a5e57b3f874b220c34ca4ad2e575da7df424ce8a71f88088f53ec53cf9614d40ecda48b088ef6bede680c0ce81dca35ee1156
 DIST libmateweather-1.26.0.tar.xz 2213064 BLAKE2B ae6670f60694627491890e3ff35550937f9b30431e3d6c48780e38c15a13d2a5812129e13c228f6a81004787e078ccc6c7410b75e17112f3afe993e5a7e061bd SHA512 e786071d8c9393abc6d8f0733bd213305ace50698066ba7913ac254d8944e6db94296de5ecf91c0d5a8babd38f0cc35cb3bcee046f1eb0339ec5429a66d062d1
 EBUILD libmateweather-1.24.1.ebuild 859 BLAKE2B 04ea5f4c4fb62fb7e842c7096244527dd65e42f4aac37c783f4f49321a51c5bac1cd434582595ddc934e501c654ca7c07d3c46a3af8643096d4c9c2cbac91745 SHA512 9c74d963ecc88bf7527ae03d36b884be5c00df7a7c1a58120d8d149ad111942f341a9b9a5430c48b3f77e30f9010fcb739d3a1dc9bfd8a913ae4f0814a4961e6
-EBUILD libmateweather-1.26.0.ebuild 867 BLAKE2B e0aeb2849f9b351595aed005234463c1796fa38df6ac36189a977e68ed7cf570012d616674d839ce77106e303c83b893b15d734fe4a6372cfd22512161fc3ec0 SHA512 63f660ce5d895c6332465401727b51bff49998ad2e69e9632cb8b4e1703fc56228ca2a6b899e4ad4f2d551a5c07ad87dfa1f5ff9130c2dfa5194262d011c5136
+EBUILD libmateweather-1.26.0.ebuild 874 BLAKE2B 4dd9fc08652c30fa0c29d7ee9cd22711e4fd51d8e8085db0b2103d7d3b21a6d78296df975b7dea8af519b457bae4d382f9ccbf33f5ddf35a4c765e29bcf377c4 SHA512 add7875085273476706d09bb507dec2d6c560b85ce6dfb9dbf56a564013a05ade4d54fd1adc8b22adb0b1ac1195e996a09a2ca8ab33108589c1d36084282b5d8
 MISC metadata.xml 344 BLAKE2B 22c27ee3ff244e6b566cf5d1be3fb5757880babf1a3c49a0e5227f6680266767773a367a0993282b8346bb561a8f049902a11c27cd940ea89451566e9a673bf3 SHA512 33567703bc6148dcc9ecffda3bf777bbaa319224868a03cedb580805866524f8bbc5027828db9aa3694c9c53f57150a4859ca59b59828a49970f019c53d2b10c
diff --git a/dev-libs/libmateweather/libmateweather-1.26.0.ebuild b/dev-libs/libmateweather/libmateweather-1.26.0.ebuild
index ebd30c0d96b3..fc4f10fbec29 100644
--- a/dev-libs/libmateweather/libmateweather-1.26.0.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.26.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="MATE library to access weather information from online services"
diff --git a/dev-libs/libmemcached-awesome/Manifest b/dev-libs/libmemcached-awesome/Manifest
new file mode 100644
index 000000000000..ddd6139ae851
--- /dev/null
+++ b/dev-libs/libmemcached-awesome/Manifest
@@ -0,0 +1,3 @@
+DIST libmemcached-awesome-1.1.1.tar.gz 527161 BLAKE2B 8eedefc35ef1964efd653523ade11da5233ddbab620e34552f963b6138a19f358adfde57fc5955f4ae28c755df2e39d716cb36fb96eef0c14a54ddce20dd8e39 SHA512 b5de32a3db506fb70f2da2bb029a10129667e1a1b054e0cd68ed4f8f99c5b514c2c3e14cb714dbb83de5a138d6a0b867bfc956f08ba9d2b02f050115ae175af5
+EBUILD libmemcached-awesome-1.1.1.ebuild 1030 BLAKE2B 5feca1cb154c4fb2a12f3929abfe9daaf034788cdff7dae26097e49d34a7fa64315f04d4e07582ae9131aea01c4d263566b26860298f797b23e9d84785db2a4c SHA512 5ec43e661c4c9f174ac75dfe1591d3c5f92f9f961cf8d0adb5c68ff241acfc0ef3b3da426e8521bc34d73a72101e9eb71cc7cb95f344c8150b75df75a4a7409f
+MISC metadata.xml 632 BLAKE2B abbf2b34829dfd68688dfe74c7a14e788558ecbf1e738fddb9296f986925c4c3cb927fd30b2d4a2a38c54082271eaabf19963d1daf4ab1ea9a3a9d16f1f5b558 SHA512 f4095b8e6c92046ae23a793724237522c99734ab80c3dd71f58d9972e728ba27330d169eafc3294df6e2e0f9b57e7c8f70e8b5a51a3c532250965e8ae7b05e0c
diff --git a/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.1.ebuild b/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.1.ebuild
new file mode 100644
index 000000000000..eb599e7d4a24
--- /dev/null
+++ b/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="a C/C++ memcached client library"
+HOMEPAGE="https://github.com/awesomized/libmemcached"
+SRC_URI="https://github.com/awesomized/libmemcached/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/libmemcached-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+libevent sasl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!dev-libs/libmemcached
+	libevent? ( dev-libs/libevent:= )
+	sasl? ( dev-libs/cyrus-sasl:2 )"
+DEPEND="${RDEPEND}
+	test? ( net-misc/memcached )"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_DTRACE=OFF
+		-DENABLE_SASL=$(usex sasl)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# memcached_regression_lp583031: needs network, bug #845123
+		# bin/memaslap: tries to use Portage HOMEDIR, bug #845123
+		-E "(memcached_regression_lp583031|bin/memaslap)"
+	)
+
+	cmake_src_test
+}
diff --git a/dev-libs/libmemcached-awesome/metadata.xml b/dev-libs/libmemcached-awesome/metadata.xml
new file mode 100644
index 000000000000..c65546e91187
--- /dev/null
+++ b/dev-libs/libmemcached-awesome/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">awesomized/libmemcached</remote-id>
+	</upstream>
+	<use>
+		<flag name="libevent">Use the libevent event loop interface.</flag>
+		<flag name="sasl">Use sasl auth for communications.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest
index 9a408d8ce250..a4817f4acc5e 100644
--- a/dev-libs/libmodbus/Manifest
+++ b/dev-libs/libmodbus/Manifest
@@ -1,4 +1,6 @@
 AUX libmodbus-3.1.4-doc.patch 358 BLAKE2B 7f69a497411d308bc02f4881802cbd2b17ef2dc9edd527a6f9ecfa96ed70d3336f79b20c4ab8297062802465fa174f0adcd4d3ac81946eea8c1409a23b067278 SHA512 a73147873d0ddb3338608cb7bd4a44e6e333b46313e9326e7442b6b3c3fd4da97cbf93f8c92e517352d8828cc6ab6eb95a36e7fcaaa62a48774bc8f4a109b6ae
 DIST libmodbus-3.1.6.tar.gz 479565 BLAKE2B d9aecb57a0dd274c54a62f707c90c83f31500dd76aefc38c2615d9ce32df659613511e1b567cc385fd2b05aa473dbfbb65ae248d93bb7df2fbfcd7b16b7c5701 SHA512 2e39aea41b1cfb30239c3d8271c68841d645a44a15019090e2efd16979bde373c76532f992aa6a4587b95c65ed9829705f32e698e445df7c0e1d52d0d1165bce
+DIST libmodbus-3.1.7.tar.gz 490162 BLAKE2B 3ba8353fbf6849597b1affdb8dc318b8dc1e2f66b0c1bc9f5f3c8286d48609be6d85d84269d31510fe292a48010a72e7a678b748f3c03117a6230651fa80fe91 SHA512 e2c00bd06d0b4a16c8edbfd25a95695b782cf459cd69a7cefc1cfa5e4025f23b2896487b48876ccf2f8050e8cdef4a76d322c9752a43cd8dd2c634df9406bada
 EBUILD libmodbus-3.1.6.ebuild 720 BLAKE2B 4593d1070cf87c926f76647e0677806d952bbff61638ea3bf188f51b706abd6a62f9ab8479a5c871d92a84e874754fe3037a25af3619b19a2e971822367292f3 SHA512 22c24af582877496527b2d19f9aad00d10c23462d16a3d91cbc1f8fc60f493b82726f4b20cc13938fe1cb9703968fe09e938d8b00e4ea61cb943b39c7d8df033
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD libmodbus-3.1.7.ebuild 739 BLAKE2B 69b85d18436483a1d1961b708b20b43f3c7ee60c32dc40e2129d477dfe791fdcba429550c95d966f697a1df0359035daef794a82cfa6fcaa0405493232595e6b SHA512 25922e1252da77b04fbcbd15cd04221ed30a5b42286cf049a297b069d865a982c48bd047f1623eba8f5eca982ee97ae842b71a968a95bc6013204f3830277696
+MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/dev-libs/libmodbus/libmodbus-3.1.7.ebuild b/dev-libs/libmodbus/libmodbus-3.1.7.ebuild
new file mode 100644
index 000000000000..2c57eee72ce7
--- /dev/null
+++ b/dev-libs/libmodbus/libmodbus-3.1.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Modbus library which supports RTU communication over a serial line or a TCP link"
+HOMEPAGE="https://libmodbus.org/"
+SRC_URI="https://libmodbus.org/releases/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="static-libs test doc"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable test tests)
+		$(use_enable static-libs static)
+		$(use_with doc documentation)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/libmodbus/metadata.xml b/dev-libs/libmodbus/metadata.xml
index 85e4ed814fa2..c07e13d4a6bd 100644
--- a/dev-libs/libmodbus/metadata.xml
+++ b/dev-libs/libmodbus/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libmpack/Manifest b/dev-libs/libmpack/Manifest
index 0934eb9733b9..5d6458d8b694 100644
--- a/dev-libs/libmpack/Manifest
+++ b/dev-libs/libmpack/Manifest
@@ -1,3 +1,5 @@
+AUX libmpack-1.0.5-libtool.patch 2022 BLAKE2B 1b1104b35a79d1bd3595353ec238fd13ece6a369d10999a5c7b627a7c9a98a24fad880970cda5d324cd95e434ae4f31e044ff6702a307f7811bf0833372afbb9 SHA512 dcb0029018df34aa5530ef6f9f0c8ffec7d33288e8854273db98c823f03663d260837c80846acf5571400dd0f78588f26fe62b20a2f9469c09f22189b0a65fff
 DIST libmpack-1.0.5.tar.gz 32966 BLAKE2B 8ad01de11c740c3efc7b42046b89f7691dd32d228e126485bc49224e54789e7f12a611982c0fd9d2bbe8b06d1ce2df1ceea1b302e139e30d0a8c31f251129166 SHA512 6e30edafcacfb580b410bc6749ed7fe8f18b3be0cb98959339853e77bc3ec0cda6df08a0f1f22768cfc773458a2ea6bcef4f0421eea55cf56c58981d13711a04
 EBUILD libmpack-1.0.5-r2.ebuild 1298 BLAKE2B 105ad8baeabbc915a33cbbc2d2a62aa6e37b422f969533ca38293bf9299ad67d3b29be8ef20190ee692d56357c67d111a7b5ab0d989f74bf13bc7bb69ed8c6ca SHA512 a3395fa0d99cf4913040c0318e28115e8ade54fa44cdc76fcddc173744b054f646d0680fdb3a2f3e2ce46a44526787b5868c02b5552544dd2f8a9aed1c4cd46e
+EBUILD libmpack-1.0.5-r3.ebuild 1338 BLAKE2B b6dea0a251618a778858329c60061e9be4b010bce61971418bd4a7eb04cc0f9c8a4ba8a5c4e74eb9570a2d46df41b85656898dae690fcc4156e55d499df600ef SHA512 4ef6cae229e65c1e77af51a3afc2905285a44710ac90809be617fcc009e17914fd1bb6481a75052d547ef0d08c7d0ea9c60beaaec7c31ede8312243c89fb6062
 MISC metadata.xml 333 BLAKE2B f3e54e3a241a85adad55693f7dd3cc47cc646d1432b4281c264c849fb2a2bfc050aee53f5ae766063335b72c3ca91ed9054bac758d82c969acb61913f7282940 SHA512 aa83f4113099ecf8b749a070014b9d9c09fc1c0d4836f2cf621b2966088cf3ee73e26ab4f365063713db353671ad5937f98ffe4c87762c6e196cd57c8eb595ea
diff --git a/dev-libs/libmpack/files/libmpack-1.0.5-libtool.patch b/dev-libs/libmpack/files/libmpack-1.0.5-libtool.patch
new file mode 100644
index 000000000000..59ebd91fc9e4
--- /dev/null
+++ b/dev-libs/libmpack/files/libmpack-1.0.5-libtool.patch
@@ -0,0 +1,89 @@
+https://bugs.gentoo.org/778899
+
+Author: orbea <orbea@riseup.net>
+Date:   Fri Jun 17 17:29:51 2022 -0700
+
+    configure: Add minimal configure.ac for libtool
+
+diff --git a/Makefile b/Makefile.in
+similarity index 92%
+rename from Makefile
+rename to Makefile.in
+index 76cfd35..2c05a99 100644
+--- a/Makefile
++++ b/Makefile.in
+@@ -4,11 +4,9 @@
+ config ?= debug
+ SYSTEM ?= $(shell uname -s)
+ 
+-ifeq ($(SYSTEM),Darwin)
+-  LIBTOOL ?= glibtool
+-else
+-  LIBTOOL ?= libtool
+-endif
++top_builddir = @top_builddir@
++
++LIBTOOL := @LIBTOOL@
+ 
+ ifneq ($(VERBOSE),1)
+   LIBTOOL += --quiet
+@@ -33,11 +31,11 @@ else
+   XCFLAGS += -std=c99
+ endif
+ 
+-NAME    := mpack
+-MAJOR   := 1
+-MINOR   := 0
+-PATCH   := 3
+-VERSION := $(MAJOR).$(MINOR).$(PATCH)
++NAME    := @PACKAGE_NAME@
++MAJOR   := @MAJOR@
++MINOR   := @MINOR@
++PATCH   := @PATCH@
++VERSION := @PACKAGE_VERSION@
+ 
+ LT_REVISION=0
+ LT_CURRENT=0
+@@ -130,6 +128,11 @@ clean:
+ $(TOBJ): XCFLAGS := $(filter-out $(TEST_FILTER_OUT),$(XCFLAGS)) \
+ 	-std=gnu99 -Wno-conversion -Wno-unused-parameter
+ 
++$(OUTDIR)/.tag:
++	@mkdir -p $(OUTDIR)/$(SRCDIR)
++	@mkdir -p $(OUTDIR)/$(TESTDIR)/deps/tap
++	@touch $@
++
+ $(COVOUT): $(SRC) $(TSRC)
+ 	find $(OUTDIR) -type f -name '*.gcda' -print0 | xargs -0 rm -f
+ 	$(MAKE) CFLAGS='-DNDEBUG -g --coverage' LDFLAGS=--coverage config=$(config) test
+@@ -142,7 +145,7 @@ $(PROFOUT): $(SRC) $(TSRC)
+ 	gprof $(OUTDIR)/run-tests gmon.out > $@
+ 	rm gmon.out
+ 
+-$(OUTDIR)/%.lo: %.c $(AMALG)
++$(OUTDIR)/%.lo: %.c $(AMALG) $(OUTDIR)/.tag
+ 	@echo compile $< =\> $@
+ 	@$(LIBTOOL) --mode=compile --tag=CC $(CC) $(XCFLAGS) $(CFLAGS) -o $@ -c $<
+ 
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..d2f02e7
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,16 @@
++m4_define([MAJOR], [1])
++m4_define([MINOR], [0])
++m4_define([PATCH], [5])
++
++AC_INIT([mpack], [MAJOR.MINOR.PATCH])
++AC_CONFIG_FILES([Makefile])
++
++LT_INIT
++
++AC_SUBST([top_builddir], [$abs_builddir])
++
++AC_SUBST([MAJOR], [MAJOR])
++AC_SUBST([MINOR], [MINOR])
++AC_SUBST([PATCH], [PATCH])
++
++AC_OUTPUT
diff --git a/dev-libs/libmpack/libmpack-1.0.5-r3.ebuild b/dev-libs/libmpack/libmpack-1.0.5-r3.ebuild
new file mode 100644
index 000000000000..ee84302d76e2
--- /dev/null
+++ b/dev-libs/libmpack/libmpack-1.0.5-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Simple implementation of msgpack in C"
+HOMEPAGE="https://github.com/libmpack/libmpack"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libtool.patch # 778899
+)
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-ggdb//g' -i Makefile.in || die
+	sed -e 's/-O3//g' -i .config/release.mk || die
+
+	eautoreconf
+}
+
+src_compile() {
+	local myemakeargs=(
+		"VERBOSE=1"
+		"PREFIX=${EPREFIX}/usr"
+		"CC=$(tc-getCC)"
+		"config=release"
+		"LIBDIR=/usr/$(get_libdir)"
+	)
+
+	emake "${myemakeargs[@]}" lib-bin
+}
+
+src_test() {
+	emake VERBOSE=1 XLDFLAGS="-shared" test
+}
+
+src_install() {
+	local myemakeargs=(
+		"VERBOSE=1"
+		"PREFIX=${EPREFIX}/usr"
+		"DESTDIR=${ED}"
+		"LIBDIR=/usr/$(get_libdir)"
+		"XLDFLAGS=-shared"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local file="libmpack.0.0.0.dylib"
+		install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libnop/Manifest b/dev-libs/libnop/Manifest
new file mode 100644
index 000000000000..8f3d89faac2b
--- /dev/null
+++ b/dev-libs/libnop/Manifest
@@ -0,0 +1,3 @@
+DIST libnop-2021.11.03.tar.gz 124143 BLAKE2B 44b1c4c341d2120ff22511176fbf3c6f64328c97ddddae458e09676baae491e9218ea33a5836c7a6647090d3f06ac1d66529707af5e2684a14b409b3b57f3af1 SHA512 27f62710afb41165db5ef54bb2d09f89ed9c0c0cb401bffe2c52590bb28c67ed6ba68922510cdedd6dc7cc75fc267a02a2f9cbcca4bfa85042792a121e27097e
+EBUILD libnop-2021.11.03.ebuild 647 BLAKE2B 0ffced1edf027d99a3f3806097511ffe5a43b821e1e7f52f8f95a883351c774da63623ada9cafb1e3ba421bb5dbf231894b1c79b3f31bdb371c9f240d5ef2da8 SHA512 9e45eda796bd565a258b7db9763fbfbef422dadf9c023c5f6e2500820ceeec95e614c2b885aa49b611c80edc386f984060fb89adcc26441fea727acd4e9314c0
+MISC metadata.xml 326 BLAKE2B 267fcac4709c61daf177b248011fea40b932ae34ed27e75425c54476fa93f1ddca627a7f090476f514ec24ba97cdd6a31513c74b1098b198b9fdf3ea6213430c SHA512 7831679de5573dc2c3492655679ce8477ada2b482d30a3ac598970c1cfeb3005d6587a7a74b2425565e6f2d1e99e2ee5e17836e4525e3ad043cbe69f91d34cf3
diff --git a/dev-libs/libnop/libnop-2021.11.03.ebuild b/dev-libs/libnop/libnop-2021.11.03.ebuild
new file mode 100644
index 000000000000..93f597785e9e
--- /dev/null
+++ b/dev-libs/libnop/libnop-2021.11.03.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CommitId=35e800d81f28c632956c5a592e3cbe8085ecd430
+DESCRIPTION="C++ Native Object Protocols"
+HOMEPAGE="https://github.com/google/libnop"
+SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+src_compile() {
+	use test && default
+}
+
+src_install() {
+	doheader -r include/nop
+	einstalldocs
+}
+
+src_test() {
+	out/test || die
+}
diff --git a/dev-libs/libnop/metadata.xml b/dev-libs/libnop/metadata.xml
new file mode 100644
index 000000000000..a0bb21b79e82
--- /dev/null
+++ b/dev-libs/libnop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/libnop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 3256541aa564..40f222e7d1f6 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,8 +1,5 @@
-AUX liborcus-0.15.4-gcc11.patch 1874 BLAKE2B b01e145fc9204e1504e34959c0c1c97101eed287e7291734e32e81a1e219a3bbcb6487ad7cc8c248019feccbebc94e03e3b3f7346c38074c9f284a159eb1d55e SHA512 61cd9afe40f6a3da6fc1177627fb17716286d48168d282fc90de3729f46bcd4cf22cb4fa9ed2962b59806d58d0569365f80b633e74225257ff9beb5eab01ad7a
 AUX liborcus-0.17.0-test-fix.patch 1691 BLAKE2B eff681313577d7964eb9c58bf9e2e68951ea6430303b81cefc26ef1e63337188f415b4a5f2b44cbe44111776c99ade992aa40ca6692e126608a9d15bd89fb44b SHA512 fb46233985a69fc9b5991efddf9e855217b4641eb558aa1b5df7bed4d1639e702500b03ce8526cdcee9cd22f139b4efabef18aa36367f840754aee49b3ec9f66
-DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
 DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79
-EBUILD liborcus-0.16.1.ebuild 1477 BLAKE2B af207820355c3f6839538034fd406335d1cf2ac1e426ceb4aac19baadd953e2ffc45ccff7c965779bd21b22aa7e0a5a235ce0505ac7a59dcdf5c55775a146f62 SHA512 cb189f615cf0c5f040f5cefbc832c4ca3322de32015907454d479e9c1e60048f8c1db912a74ef0e2b6e003ba6645936c73b5b4338181fd375328dbabba934117
-EBUILD liborcus-0.17.2.ebuild 1384 BLAKE2B 57aa6f1c137b255ce6e5bd78adc6b8608490059533442254cdbd02f8db6b6204356316cefea0f2ee00cf0c55507efd9fe1cf65f2e7feaf9432a17d9f099d7678 SHA512 0760430d4b71a1caf15bbd3190f9d4973ddc8a9f33eb48ecb513a56f724b32d2e3710ecd9c72982b0ad5f6822301277b5644299b025de8bff2c04ff6c09380a5
+EBUILD liborcus-0.17.2.ebuild 1381 BLAKE2B 4589e29dce3c750ae40bc23705c9e6f7496d706d24df531b117f7e8875add16118c500bd114f5ae9074a8a5ba61c55c30cb1dc7c8de035d6399babe9d3ba325e SHA512 b4daa61baf09769a86a36b61719eee01a2076fba1aa862816438830aec5947e053e74074e66e41ace23533dc04a1d670601e39588426029eb861b41a532de230
 EBUILD liborcus-9999.ebuild 1449 BLAKE2B c993233e271bb4cfc885bcae0bdf8422267e949ccf0bc3f411edaa2a0773c1c8e8980387710c87c3d1605a86a60e8011df471cf04574e74c14a59da9cf82f6ae SHA512 89e0d1acb0be5ab01e179f43f9dae77ce1f3a161f7e28adec10961ceda4201eefb5e1ea9c6bb303f31fdc2efecff381f2a081cb192ec43f938b1d169a01d3b02
 MISC metadata.xml 557 BLAKE2B b8dd01b0df50a1c6dafedc40f4cebbbd7851ee67fd1ac94f4c8107f052db8721ce12b0ae486e42f459e0b5d337525edc0359e9e94b8da1261e3521c11f66ef64 SHA512 2eca4f5fd25121bdb3ecb9470b66c2c5373ab266c53bf7af55b3f46245ad6973f3cd65ff80c6d1c33cb738136cddf22489b61dc1863701225842ca9dfa4e2c9d
diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
deleted file mode 100644
index f1dda1390539..000000000000
--- a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 50506d534230d90de2b0a2af3fb072428c942a4e Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Fri, 8 Jan 2021 07:30:16 +0000
-Subject: [PATCH] Update orcus_xlsx.cpp to build with gcc-11
-
----
- src/liborcus/orcus_xlsx.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp
-index 6df72a32..a59b2b9d 100644
---- a/src/liborcus/orcus_xlsx.cpp
-+++ b/src/liborcus/orcus_xlsx.cpp
-@@ -32,6 +32,7 @@
- 
- #include <cstdlib>
- #include <iostream>
-+#include <limits>
- #include <string>
- #include <cstring>
- #include <sstream>
--- 
-GitLab
-
-From 3bfa1a000e4639fe68781c584356ceea7c6b1a72 Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Fri, 8 Jan 2021 07:32:53 +0000
-Subject: [PATCH] Update xls_xml_context.cpp to build with gcc-11
-
----
- src/liborcus/xls_xml_context.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp
-index 538f5607..ca3dc4d0 100644
---- a/src/liborcus/xls_xml_context.cpp
-+++ b/src/liborcus/xls_xml_context.cpp
-@@ -16,6 +16,7 @@
- #include <mdds/sorted_string_map.hpp>
- 
- #include <iostream>
-+#include <limits>
- 
- using namespace std;
- namespace ss = orcus::spreadsheet;
--- 
-GitLab
-
-From 5e8fb255dc6bc9b7084a05b8dc24f31417542e5e Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Fri, 8 Jan 2021 07:34:17 +0000
-Subject: [PATCH] Update xlsx_revision_context.cpp to build with gcc-11
-
----
- src/liborcus/xlsx_revision_context.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp
-index edfd9eed..0b6ec0af 100644
---- a/src/liborcus/xlsx_revision_context.cpp
-+++ b/src/liborcus/xlsx_revision_context.cpp
-@@ -16,6 +16,7 @@
- #include "orcus/global.hpp"
- 
- #include <iostream>
-+#include <limits>
- 
- using namespace std;
- 
--- 
-GitLab
-
diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild
deleted file mode 100644
index 18b38d862e5e..000000000000
--- a/dev-libs/liborcus/liborcus-0.16.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-
-if [[ ${PV} == *9999* ]]; then
-	MDDS_SLOT="1/9999"
-	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-	inherit git-r3
-else
-	MDDS_SLOT="1/1.5"
-	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.16" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model test tools"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[zlib(+)]
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( dev-libs/libixion:${SLOT} )
-"
-DEPEND="${RDEPEND}
-	dev-util/mdds:${MDDS_SLOT}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.15.4-gcc11.patch" ) # bug 764035
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 713586
-	use test && eapply "${FILESDIR}/${PN}-0.17.0-test-fix.patch"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--disable-werror
-		$(use_enable python)
-		$(use_enable spreadsheet-model)
-		$(use_with tools)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-	use python && python_optimize
-}
diff --git a/dev-libs/liborcus/liborcus-0.17.2.ebuild b/dev-libs/liborcus/liborcus-0.17.2.ebuild
index c46193512eb9..1bf855fc46a8 100644
--- a/dev-libs/liborcus/liborcus-0.17.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.17.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MDDS_SLOT="1/2.0"
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index e05cabfe7c1a..b76fa11bb57c 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -3,4 +3,4 @@ DIST libp11-0.4.11.tar.gz 500433 BLAKE2B 6a12d8bc0551b3ef11857c0e60a33ebae4f8dfa
 EBUILD libp11-0.4.10-r1.ebuild 722 BLAKE2B e14c3b3aeba1c543d44eaf0f20a86aafe71f98708611f19ff0976dcc7f6268f5483de65061cbb9ca95990c3cdd9897505d2a1b444dee0e9dd2894a2824cbab83 SHA512 4e0453e386b440591cf95e47b335a9817c014dfdd4a084eedcd86e2b57443fbd334cf521c8325a473bdb645c03693ac487944f6219bad6915f0f0c13d7d8b35f
 EBUILD libp11-0.4.11-r1.ebuild 729 BLAKE2B 31105e58ea691e4a5e06f9969fbf368d51fec217e41cb8e363da21e59571632a67d559c443ddbd656c9423e770c1af37bfa220816dbfdd212ab0ece666a6f921 SHA512 195dc37de7ac381262f0539baefc0e7e71253025615f33439f0e562b332c9cbf1951198ac0648a6fda4a656b7f5ffac8e5859b6a154e5a7896c53e57af8682aa
 EBUILD libp11-0.4.11-r2.ebuild 714 BLAKE2B 12bc35434d592a22fa756f086fec28cdde42dbb8bb13c021734ecc017483e9d2a8b502e85056e48846ed281be467af3e54db7efa3c2f2544a074d856d5ae85c0 SHA512 b4b5b9e386b8eb2cf34e580c33a1d2ae98ed28605fb1a8a04219142f3cb7a770daea063fd5a03024ecb5997d738f1def2bfa3a075ae006b0c9210274d8130689
-MISC metadata.xml 689 BLAKE2B 15a51be6d21ab88ed85ac0bd5cae06e6d9dacb4722f5474edfc4d378f7295617995e4a35d4bf7a14cc8dc3d062633a3c75fad16f3aaea060474906dd60db8797 SHA512 aaa4e18f2a1dd543087050b86c3506541011c0c75cb472ac2227c07cf2749a38876a5ff95e648dad202019358b5fdd49804f67100ccad7ac10e38004bdffd226
+MISC metadata.xml 605 BLAKE2B faade66b8ad5ae37e4718526c215035961443370bd6834f1fc96ae1ae079e40a5c444d097ef3fbda07ee4717ee9f5c7f1bb305ff9129d42169fb829ddc13ba8b SHA512 9a66128ab43c8d0deb32f62dede966f20fcd785e888b6306355897c1acad36055fd1b2f363af4512febb304a4d6340c05d53a0af5ffa6e2c38593f0b7f2c7ea0
diff --git a/dev-libs/libp11/metadata.xml b/dev-libs/libp11/metadata.xml
index 304b0d92381c..343ed3a9d54e 100644
--- a/dev-libs/libp11/metadata.xml
+++ b/dev-libs/libp11/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">
-		<name>Lars Wendler</name>
-		<email>polynomial-c@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Library implementing a small layer on top of PKCS#11 API to make
 		using PKCS#11 implementations easier.
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index eafff959e454..1f820394dd49 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,5 @@
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
-DIST pcre2-10.39.tar.bz2 1730729 BLAKE2B 9ee01ac2704e9cb7a107d402fa0c32828fc66425b62270f6891667bde5fb00c1e779c9730df3522acbd62d11703343bf48265050c09d3754183de314baf7cddd SHA512 b3d898198f4b5ffc3453d2ba56fe2a7298c01c52e5f67d45f1e046fc0dee62e16a4024fcb65839ac9c367beedb531647affd6f8599fbeb102f19423c150d80d4
 DIST pcre2-10.40.tar.bz2 1765440 BLAKE2B 627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b SHA512 00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8
 DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc30b9288e52753785ddcab37cc3e169d0f117d94e4ad7d7ff897a6ba0a574c9a2e529c3c7e171f5a1bc6f64fe23 SHA512 faa4b47fdac1543cd323651f251b8abb94b31b5966b42d445b8cbb38c441df4742e3c3517c2bc6c0a4464e9fb5feab5d5beda1250a03d56bec2d8383be2f63ab
-EBUILD libpcre2-10.39-r1.ebuild 2496 BLAKE2B 45e155d23a3acf950aebf15fc4b6763adbd11a256a869ed5d0800ea4365747e5bb0bda13db9d818919793389584566fc60070721a1d67910b70a58693afed663 SHA512 828e75bbf8b96ab59710d91a9e618ad09b56e72fd1faa4cbba77e7230928b3dda1ce32f5ce1474a98b07049cc07564fd0fcf55b663a014630e508090247d4a2b
-EBUILD libpcre2-10.40.ebuild 2986 BLAKE2B a2fda4f6ebc11ab4a581ecd5487decfc79305ff9b3ce19f49d55b015b5415e4b6949b40370f8b8ab4c888110c4aea5a493c294280b4fe8fdfe2a1900444b4c45 SHA512 eaaec65fc31d015c1c48c371aff047c7a9567df4ae77280791c5459dfee9279931f808124ef45c6ddc9ce928ad791508221a4f2c544b29d76d82372d640f3232
+EBUILD libpcre2-10.40.ebuild 2978 BLAKE2B 689d60aabd0b0278816571add95ddfe47b914d1bf7d55736ae8d0db8a46d7db788c3c61df5eae827f1eaec54389cb5d6dd0ff6e0bd2941f4a2405cb76b422cc4 SHA512 375fca4b0b11d8aba628e0ce86d87c3f7bb3b99faf63b63364eb9efc6a04910db2f11b216368456aaeb0143f0fbd64ea1e59f8061e12dfd53260172f9f6b169d
 MISC metadata.xml 1087 BLAKE2B 693e7f9a4d9cac7b2aa5f24804826f79135a0475770b8ef5058b09542c3b19d30ddef438029dc0358b997ebc032ab103432b1274723c81882f1b5359455c765a SHA512 74dcb822827b8cc3e86c525ab3e2ee302d39ee00d5b4515f9fd6f4a157ae1522a2edbd08b97c2950d9370878f41eb59e414a145d6beae430dab57ea10df68460
diff --git a/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild
deleted file mode 100644
index 9a9a699cb929..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal usr-ldscript
-
-PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="https://www.pcre.org/"
-MY_P="pcre2-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
-		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-if [[ -n "${PATCH_SET}" ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
-fi
-
-LICENSE="BSD"
-SLOT="0/3" # libpcre2-posix.so version
-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="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	if [[ -d "${WORKDIR}/patches" ]] ; then
-		rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die
-		eapply "${WORKDIR}"/patches
-	fi
-
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-pcre2-8
-		--enable-shared
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
-		$(multilib_native_use_enable libedit pcre2test-libedit)
-		$(multilib_native_use_enable readline pcre2test-libreadline)
-		$(multilib_native_use_enable zlib pcre2grep-libz)
-		$(use_enable jit)
-		$(use_enable jit pcre2grep-jit)
-		$(use_enable pcre16 pcre2-16)
-		$(use_enable pcre32 pcre2-32)
-		$(use_enable static-libs static)
-		$(use_enable unicode)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libpcre2/libpcre2-10.40.ebuild b/dev-libs/libpcre2/libpcre2-10.40.ebuild
index fcebdba2e861..fb332ff04d3b 100644
--- a/dev-libs/libpcre2/libpcre2-10.40.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.40.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index ba75dbf2942f..c19307761ce0 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,7 +1,5 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
 AUX 1.32.0-meson-Fix-disabling-gtk_doc.patch 862 BLAKE2B c03eba757dd14ec5d4812bc9e735dd3d3a8aa25dc2497b286b50f00dbbd282de7ea6616105b6d1ea525e13d374b28ee07b1a8c479257c04642479def27350b7b SHA512 a34c58b573db453a4082b87774290ebd63cdf88f38cd7726469bc50de174dea135c3f126c7c82099a7c41eb599f055b993ca6f3203624f742d5d2935a6d7b872
-DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
 DIST libpeas-1.32.0.tar.xz 193572 BLAKE2B a29be56dd4add53ac11e52e7a9b6f9aaf1634bec0be6efe33d99fbb1a323cdc2f9d81917f160c3d8f4b88068d13a3b6cc732aa147bba1c1e524ed5eb1e238ad9 SHA512 520a5fd8657f75dc0e28a17ccab88a2952d018f81384eaea0fc65779e66b0ebc79b0dc8ce184e49d43406381c75c2028b402c1bb9d650eae2edf35ec8617a897
-EBUILD libpeas-1.30.0.ebuild 1986 BLAKE2B c4e963b3d6103b993a9c1169a876311c462f0202bf86cf8cb6bc9bd33b4db648ae7792f723eb966c16061c89689eeb943d9af4d93a1081c69ee76823b62c0c53 SHA512 82cb94465f47027893c1c9da11562ad4a7be402392d68f3421ce31ed1a9fc916cb24a7b3bab7b74aa8e2a825d6afc901aabe2d6f59bd49b3d9776a3a36bb6df0
-EBUILD libpeas-1.32.0.ebuild 2213 BLAKE2B 9565154e4c57417a5bb7b38a09962eccef5439cfd443843eec250111e25db7faee2f40cc6dc3c6b723da8f120f7c59b257f571bef3ac1ac1ee31110c85199b28 SHA512 455ebe7d9e81461924efe9430becfc5315b0f415c5de0e712e64f4c3308cda0d3b12e57a23afee3a6e246bcba38f7583711e6893213286f5b33a9644c96248f0
+EBUILD libpeas-1.32.0.ebuild 2282 BLAKE2B 4414f88356583577d30eab167627129cccebaac1c1d27805512584c0637291bc8e944e64e4e98092a79e44a6ae7e3e03a17fea21ffe9c353b00f5c0c20725882 SHA512 ea65e367976411794e10f74735e142eba05a5f43f6c71bd322562d8ed374f8bd796c54af71651d5ed256988037d288da862120687b03ca4c7a83336781104d22
 MISC metadata.xml 416 BLAKE2B 9383d1583b61f2218efb3b8c7bf6855e30ab8ee3f4e0829b78f17832af533a6839e713c702e0dbdcdeb24a516badb446b935e0ee1abc112c2342c2f0ce321d81 SHA512 3fb271973b7b510983e84c2d0188688f04a1f6a1a80aabc15dcbdb14276608ed59ee3ea1f77feade9b08785651ea4f85e400d928a267651c40f0e490c175da62
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
deleted file mode 100644
index 3af483ae7446..000000000000
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="glade +gtk gtk-doc lua +python vala"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	gtk-doc? ( gtk )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39:=
-	gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] )
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_cond_dep '
-			>=dev-lua/lgi-0.9.0[${LUA_USEDEP}]
-		')
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.11
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Gentoo-specific lua tweak hack
-	"${FILESDIR}"/1.26.0-lua.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51)
-		$(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit)
-		-Dpython2=false
-		$(meson_use python python3)
-		# introspection was always enabled in autotools; would need readiness by consumers
-		# to USE flag it, but most need it for python plugins anyways
-		-Dintrospection=true
-		$(meson_use vala vapi)
-		$(meson_use gtk widgetry)
-		$(meson_use glade glade_catalog)
-		-Ddemos=false
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libpeas/libpeas-1.32.0.ebuild b/dev-libs/libpeas/libpeas-1.32.0.ebuild
index aa4f25fae10e..6e84aa57f353 100644
--- a/dev-libs/libpeas/libpeas-1.32.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.32.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
 
 DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libpeas https://gitlab.gnome.org/GNOME/libpeas"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		>=dev-util/gi-docgen-2021.7
 		app-text/docbook-xml-dtd:4.3 )
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index a210579a0df1..b43522b32f4b 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,5 +1,3 @@
-DIST libpipeline-1.5.5.tar.gz 956089 BLAKE2B bfa8ed4c96c4dc7cb8360cac201835276dfe39429c993e614d8f396ad9c3175679f5a1ea205a9bf2f8738f8d3066cb50d09a9a5b5fd3d1219ba20adbb40b0e8b SHA512 adb228325c1f11e9f3566f2fc63541a90c88fe24656fc74ed0294d1eb3b80073bf4741fe7c289f53b340702145b11637d37682e3036dce41ec0fe45dcc6d62c5
 DIST libpipeline-1.5.6.tar.gz 976516 BLAKE2B 813009e37ddb9a63da57e11ce71040646449b10140f5dd42cca02d280a3adb2173207af857ebca24777fdc8d30e426c41ad51f356f285decfe007b5829d9730f SHA512 35a627cf2d736df4e7e6b238eddb61e3fbd00e90b56b16135b4e4f5c6b54fbdb35a496705528c8308e14273341dfe0ed14f78c0791474584c8dc2df99bfdc570
-EBUILD libpipeline-1.5.5.ebuild 692 BLAKE2B 22b40ee35b3d5cb46b2f209741786789b049e7b2346d3cb5e41052cd14b21e1bc41fa321f35371f516dce77a48d73739fc352db0a0cfaa3ad4b0edfc335e6004 SHA512 11fed81eb842d65bc15fc868bba23e7f98ed99fac1dc3eaf4bd4d27f034aea8a0cb6c02671c6183d440333e459f41634132f909885f965f2822539c4d91df77f
-EBUILD libpipeline-1.5.6.ebuild 707 BLAKE2B d0284b0137952ed2016e9c4ddda54acf306f22430d8ab44dc116418e5444e95cde85de8e244c1263c476989b384f29d4b5f0247e68c08b7c48ec299b11a624b2 SHA512 b7273086c69ea0ff301e3df137469aa61f40d0ec94b572abcabc82bcba7f81c88641204e998ff53504063c000e5fee37599c2ef737f4b9f8899e1e2300a5367a
+EBUILD libpipeline-1.5.6.ebuild 699 BLAKE2B 7aa4b9290a5c4be03adbbd7c1b34c6724dff38f5d4ef44e9b4cbb624577c62a6ae2d0413495c45cb57626988c31c791fab915a71148643b29a8e75335b97194b SHA512 ee86df12a59357d4aae14d1f70d334df3af6b29e679726dacf8055fbe81471e900bfeaa3530e895e783beeb569e2ff94d75d73598febb6867fcf7d2fa4b745c5
 MISC metadata.xml 343 BLAKE2B 4632f82a8ffc94214282c093d731958c3f41439d1c8448ae6ab36713a3431299fa028bca9f95849e856de529a3220f18467f9454aa0feb894d49e366fee479b2 SHA512 151480a72adb05e78fa0be5e4dd3ccab73dd056135f3264f7916affac51d00af84803040b780805cda665a4d02c47dcdbe1790ea8a555653c7c8f38f6c988f29
diff --git a/dev-libs/libpipeline/libpipeline-1.5.5.ebuild b/dev-libs/libpipeline/libpipeline-1.5.5.ebuild
deleted file mode 100644
index 4e2936431feb..000000000000
--- a/dev-libs/libpipeline/libpipeline-1.5.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A pipeline manipulation library"
-HOMEPAGE="https://libpipeline.nongnu.org/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/check )"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libpipeline/libpipeline-1.5.6.ebuild b/dev-libs/libpipeline/libpipeline-1.5.6.ebuild
index ae38dd130a5a..4e79114025a9 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.6.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libportal/Manifest b/dev-libs/libportal/Manifest
index 6f834842dfa7..398a912dcffe 100644
--- a/dev-libs/libportal/Manifest
+++ b/dev-libs/libportal/Manifest
@@ -1,3 +1,3 @@
 DIST libportal-0.6.tar.xz 63816 BLAKE2B 396659bd1fd00885b49363a3f6fc0ccf5324c87417cfcab48c966ef61ab2fa35d300be84656261fdf4313b77fc13058d7b7c9aadb0591c1ef17b80434f8ec19d SHA512 f5f76a0dd0c66521b745c276e41f298addbbd41dd5fb3df9381ea85c122387878cb0e51ffac1e17f9e82548ab222d2c2fe92ab0d018de8a9ae9b2dfd65e454c4
-EBUILD libportal-0.6.ebuild 1713 BLAKE2B 205da0b2e2567639082f318b9447bec5691ff5c770f37d75fab560e68df2a4000e8ba1c88919153b0342cebdea9d127c7685b7b5053793d755b7e01ca9376015 SHA512 93d266250e425dff837bc0c56a27e464588d8b16e094ee6286983a312f4e632c861b2be9e08b2082e7be9df86d4cb72d1b0ecf10229495e8117a780b28348792
+EBUILD libportal-0.6.ebuild 1722 BLAKE2B 1bc2fa0dfecedebfd369323336ba7668520dc5412ed587e6c85ec4a6a4981136aee3624ce542fa7607d96a310fe3add392865b800836c8e811145edd8ab983e8 SHA512 dc87eddcb8e96f6f135a922d3d57a474bca8853fc2de0ef258b1c1af756de9a0a612dc07e38b1c63a9369e58636cf3b8bbbc07cbe0b2ba0b8778b7fca717f84b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libportal/libportal-0.6.ebuild b/dev-libs/libportal/libportal-0.6.ebuild
index 84fbe4e90c92..ddca0cfe0cd6 100644
--- a/dev-libs/libportal/libportal-0.6.ebuild
+++ b/dev-libs/libportal/libportal-0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/libportal/releases/download/${PV}/${P}.tar.x
 
 LICENSE="LGPL-3"
 SLOT="0/1-1-1-1" # soname of libportal{,-gtk3,-gtk4,-qt5}.so
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk gtk-doc +introspection qt5 test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 77bcc8cec286..0b164fb161c4 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -5,5 +5,5 @@ DIST libpqxx-7.4.1.tar.gz 702581 BLAKE2B 9190b62eaf4cee188e32611acfc938a4111e5ea
 EBUILD libpqxx-7.1.2.ebuild 2024 BLAKE2B 662d4833d5d5edb7052e4fb2f04023d87a725a0f5de6f73ee89cbf03dd851a2ab4559cf978ab1740b066dada6b8a82045f1fb4865fa4a865c3d25baf05c3f854 SHA512 b7057ea86ae93a82f1c817094363524988fddaff362796601b57a195869618cce7e8e8c962785ba1777f1c9f7be2339f40d6d36bbb58daa2e0e757a4d72104d5
 EBUILD libpqxx-7.2.1.ebuild 2025 BLAKE2B 0d4de7f5a85e29a439ed5d0cfe5b272b3167f7c552fe646f8a1fa4ea4d370cd8ecb3d8ba78eb7f00ce54346ee9e56ffda7c48e971a2bfc27e5faa171642f15b7 SHA512 1f428b0fcac2cd2738c679daf0c26b83e06e72bbcd78a6801588340c0de53819aa7ecb57eafe329c67b2f87f024092c4cc391157cb198a71f0c81ca6e89f4fab
 EBUILD libpqxx-7.3.0.ebuild 2029 BLAKE2B 1c83bf036b0c58c3c50f39ac9b689bbe46e3bd3c4ba8000c9b305e1554418c0844ebcd99667900b38755a15ba35a803fad2b02e68e3c43eddc5aae4fea045863 SHA512 300ddb6b6a23bed8f663e5862b704ba3fe8b51cfaee1314112f7af21376d0cbd0fd512932b3054d2c37180eed130594c2f0da0dbb73ac8e990fc611b2e253e1a
-EBUILD libpqxx-7.4.1.ebuild 2029 BLAKE2B 6a3beb1eee4e93d7ca7677a8a7830568c86ec0dcef18e28b69c079669395507d2bc9906da93404bcc8396b73364013abf09386157503729107fdf58d34475883 SHA512 6b7c2fba6e8c059d3f112e625c5ff250230147b71547e82a11acd0f5624e3e267eefbe529d2c049990de20b2c142d8e65868b7f19ab705e19e3b68a22ac47c81
+EBUILD libpqxx-7.4.1.ebuild 2039 BLAKE2B b3d518655f8c2f7c37a3894b3ac94ca9b7d1b5370f331edb53cf08127b68a5f1533fee636cd4638e574d184bc1b508b6f6ce8eec6d04d02cc38cd9cf7fbdb04a SHA512 d8a3a64fab434914a221d7683ca24d13c7cb31f4b3b6f22bba11d8fa357abe061cab61d134e4d830790f6b261aafb1b4faf3be13dd8f2998967ba12c8f839aa2
 MISC metadata.xml 612 BLAKE2B 87ee08bf17de287e29818b4345fcf208fa9f024775be18e9c696265e08cad5ca3da7e9d75c5f1b4320a229f1fc9210f798ffdc97e21093aa0a9ac893ebae8dd7 SHA512 082e69f1ddd4d88c039a4aa7c386f69d3a643d675e442db6c12114167f0fe641649bb7f349cd79251b10fedd60404b31cf923ff12f5a72d6128808e18682ddf4
diff --git a/dev-libs/libpqxx/libpqxx-7.4.1.ebuild b/dev-libs/libpqxx/libpqxx-7.4.1.ebuild
index 991fb39e97c7..b9648d1f4fad 100644
--- a/dev-libs/libpqxx/libpqxx-7.4.1.ebuild
+++ b/dev-libs/libpqxx/libpqxx-7.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -16,8 +16,8 @@ SLOT="0"
 IUSE="doc static-libs"
 
 RDEPEND="dev-db/postgresql:="
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	doc? (
 		app-doc/doxygen
 		app-text/xmlto
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 5c6c50e49e0d..3b82cbaaf945 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,4 +1,3 @@
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
-EBUILD libpwquality-1.4.4-r1.ebuild 2085 BLAKE2B e9bb4c240005b323506617fa22ae98c9b8710a35695d1cf764fba4be41bc4534daa25e651a5b1089f64b60b78512a07378956a3b80ea29e041503a3549cf1834 SHA512 876a65f5b707e480782d2469c4ab1ed029306072d8bc4c78e799c0fefffd8df1fc9aa080a971ea7a692d2c02c76d974809f3e8b879b8d2b2ca9f0bb47d54061a
-EBUILD libpwquality-1.4.4.ebuild 2007 BLAKE2B e535b7ec732f055096b70880bbb86a0f7a1b65072d04d4a7fc5bbc1ba628fdecc65488cc1a7f5f5a60f7988ae6b1dc8e60c83992c927a13faa839d0038c26fa5 SHA512 0666677c35397c9cec0b9cc8ab0c67f1973f98f88f31756626d1cbe28b4124526eaf11041c42ee9f4bd749129fcd822f209b94696747413192f3cb89a4fadd9c
+EBUILD libpwquality-1.4.4-r1.ebuild 2088 BLAKE2B 45114a8a0e6fad03eb18ed2e8f0a7229115ed715a2c5a986e734f2cf26bdacacc4c4b357c72bf1bafdc8c733390d5fdc194bd0892fbbd6b588cff35be546dadf SHA512 eb83fcec8077595910448d3be5580438e7842e395d0066d34f4a708fffb9c766c2fe5baccc00180d0ea885f9d41ad60ae749c526bb41d14a31b6a16d5782d676
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
index f521665adcfd..1da2d9795e4d 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	default
 	# ensure pkgconfig files go in /usr
-	sed -e 's:\(pkgconfigdir *=\).*:\1 '${EPREFIX}/usr/$(get_libdir)'/pkgconfig:' \
+	sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \
 		-i src/Makefile.{am,in} || die "sed failed"
 
 	if use python ; then
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
deleted file mode 100644
index c575c49db905..000000000000
--- a/dev-libs/libpwquality/libpwquality-1.4.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit pam python-r1 usr-ldscript
-
-DESCRIPTION="Library for password quality checking and generating random passwords"
-HOMEPAGE="https://github.com/libpwquality/libpwquality"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="pam python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# ensure pkgconfig files go in /usr
-	sed -e 's:\(pkgconfigdir *=\).*:\1 '${EPREFIX}/usr/$(get_libdir)'/pkgconfig:' \
-		-i src/Makefile.{am,in} || die "sed failed"
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Install library in /lib for pam
-	configuring() {
-		local sitedir
-		econf \
-			--libdir="${EPREFIX}/$(get_libdir)" \
-			$(use_enable pam) \
-			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
-			$(use_enable python python-bindings) \
-			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
-			$(use_enable static-libs static)
-	}
-	if_use_python_python_foreach_impl configuring
-}
-
-src_compile() {
-	if_use_python_python_foreach_impl default
-}
-
-src_test() {
-	if_use_python_python_foreach_impl default
-}
-
-src_install() {
-	if_use_python_python_foreach_impl default
-	if use static-libs; then
-		# Do not install static libs in /lib
-		mkdir -p "${ED}/usr/$(get_libdir)"
-		mv "${ED}/$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
-		gen_usr_ldscript libpwquality.so
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-if_use_python_python_foreach_impl() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 427e0b666bbd..70c3c4184eed 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,7 @@
 DIST libqtxdg-3.7.1.tar.xz 74832 BLAKE2B 92b0f47412e04fa3100f1045a0ceb69ee7787634ab02883958156b96e756aecae1e916fa9963ef072e1d78f337102b2bfb7a42a1dcd9481fd158dde73e57fcef SHA512 764fb953c5c5564a8f5e189f3fa867b82e1da215e0734d2fb995bb29ba163936a38cf68c6c812ff3c183b7ab4fce59d1189c68885b65f103accb5446e71682e7
 DIST libqtxdg-3.8.0.tar.xz 76044 BLAKE2B c49f1317c55ea09c4fe9aaea3e96851c4e5dcbc797e97a8db58dd34b35151e18c654327b71566b5578319dd7a01862627a52a02ce3840951e15fe01b57666dcc SHA512 e9e8d163fe1a60a2d03787ec3feef6ff6e89dfea4df7c0c7b3a72784992baf49ffeb352894d3cb8747ec0cd49576562f7dae3abbde932d13374f51bc77f14ea1
+DIST libqtxdg-3.9.1.tar.xz 71604 BLAKE2B 73db84890afa5b7177447a01ae2eb92db4bf13c6e3377a0ac7bdda192b15f8cd068db2875c13ba37d7d27a2c28e48d435801625b11ec8f7eb602fa02b5eca841 SHA512 1b05a10649229a34e3b653c37abefbb02c8b456d77aaabed0e47668818ee29730ea049d96bc5c71c9ad83d1c9c87888195bf228dc9817fd27053f0286752978c
 EBUILD libqtxdg-3.7.1.ebuild 1118 BLAKE2B c248274bcbcf8b5dcba932fa50c625795aa35f22cc5be314e1ec39f713ad257bf5caa55f04011ef07f7587c9a14fe13c1b2863c85b86448511532757b17094f8 SHA512 6d2722f2bc7a32820106164fdf4cd7dc8ea8734aa54f126b54c459d9299722229246682c1bfa5ae6ed8adbc65e3e408889b948cde153bf1631e0bc94ddb128a2
 EBUILD libqtxdg-3.8.0.ebuild 1169 BLAKE2B dff2e3805870839fcc595143e4e63bacbd1696dedbb0d7558ce02733f4628037b623f3c4df013d2e91ef14e585099c43e5eaa9e69ffdb57506b9ebaef3ac09ad SHA512 f5aec3e2c9c36261a2eec1a81b05018f5696b0c81d226dac213103fbb2d34787db99b46d067969ad5703507181955d1ef36dda5ce808e425fe8c504906daddbd
+EBUILD libqtxdg-3.9.1.ebuild 1196 BLAKE2B f8710cd39a91f42df36e762b913c08b85cedd919e4bd9f5b2b7856772d1d3d4fe81f85232b190a54b28b8b42e86d20767d4a93d612b5cfb6d3ffd4d1b22e1f27 SHA512 145f4d8ca85bf38438c6e4b04da956746ce6035873a3b9a79dff14f3b2af6f880186e1e415630f9055e633af9411db72b371cc32aa293843d7d89d0e10266c8d
 MISC metadata.xml 423 BLAKE2B 6205fdbb66e8286d35f33cd497befee8128750eecf8ca674c578937ae1fdd34f4036e91c7719e9333c78a4a5a6fdd3082b7ffc6fcfb839f2d7cb9218ba92a837 SHA512 0097795563b8aba727267461be9ff727fc738c1efa182ba9c8d9e15c7d334efc41fae1c402b09315ad41c8af179f9ad1dfa1d0b055cfd072b2e013227c36edc4
diff --git a/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild
new file mode 100644
index 000000000000..68967f171547
--- /dev/null
+++ b/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature virtualx
+
+DESCRIPTION="Qt Implementation of XDG Standards"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/lxqt-build-tools-0.11.0
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdbus-5.15:5
+	>=dev-qt/qtgui-5.15:5=
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtxml-5.15:5
+	x11-misc/xdg-utils
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qttest-5.15:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# Tests don't work with C
+	LC_ALL=en_US.utf8 virtx cmake_src_test
+}
+
+pkg_postinst() {
+	! has_version lxqt-base/lxqt-meta && optfeature "features that require a terminal emulator" x11-terms/xterm
+}
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index 7b8a39e26461..5ca18fb48ce7 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -3,4 +3,4 @@ DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf55
 DIST libratbag-0.16.tar.gz 253080 BLAKE2B ede56838c822519b4fe4c6846f5d6d237104fc06f96fb17aa62b4c712965f00827973ebe732ee5ac9a16f101baf0b63eb445fbb97746df3b8ed24d6e085b34e1 SHA512 b3f2fee39ec85c0e08d257753241fb0e553de53eb7409a3b95f93a0fac3989a9411c53c915e72bef19bcfc5682fe9cdafaeb1f41f2718ab02766859f565415e3
 EBUILD libratbag-0.15.ebuild 2107 BLAKE2B 43fc8590fc94903bff93459e34ba9e182eec2186609d730908aed5fc6257667f5e72471962047c12c39bcb2fa4e635dc484f708645812a77cf934ba42d82d966 SHA512 fb893059bc1ba1fc8ada517d0983c09c6149e184228bf3854b7973306385f43a92f0adf9f95524d91048f8568b99e3d70ecb7375c60bfc049d457f7b8a7ed14a
 EBUILD libratbag-0.16.ebuild 2107 BLAKE2B 43fc8590fc94903bff93459e34ba9e182eec2186609d730908aed5fc6257667f5e72471962047c12c39bcb2fa4e635dc484f708645812a77cf934ba42d82d966 SHA512 fb893059bc1ba1fc8ada517d0983c09c6149e184228bf3854b7973306385f43a92f0adf9f95524d91048f8568b99e3d70ecb7375c60bfc049d457f7b8a7ed14a
-MISC metadata.xml 624 BLAKE2B 99e4140b689d5246ff0e169ab9acb651277154b24b1d6b57954f1639475a167d7e7e6dbed979c546968be8abdeeb81dce7f209bd3fcdee7c22d3751fb47da8d3 SHA512 ec37fe4ead6930aa2624ab6df088736e642c1d146e118b1e03e4160a2fa174d759a11dd5294097b6fb3143a1160b8cb3a9e4dc8a97dc1d11cb79c7dc926b1ccd
+MISC metadata.xml 490 BLAKE2B 1acac7162603488b92a2a99c2bf9ee12971b79d62b48ebea2bc6fdbb5e45f351002cb932cd6a8222fcd23acdffa77d4cd708b71459a5f557f668a9687da66efa SHA512 e55ba297fed6952b379b92bf14adfe02fd4a90a7f305d70126fb28ff12c63e64ff2781f378c279bd17392bf917d31f4ed2b3679b308ecf0e713e42eccbc9d1a0
diff --git a/dev-libs/libratbag/metadata.xml b/dev-libs/libratbag/metadata.xml
index 1829a7338338..1c15b5e3eafc 100644
--- a/dev-libs/libratbag/metadata.xml
+++ b/dev-libs/libratbag/metadata.xml
@@ -9,10 +9,6 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <maintainer type="person" proxied="proxy">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">libratbag/libratbag</remote-id>
   </upstream>
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 5a10dc473615..3921d5aecafc 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -15,5 +15,5 @@ EBUILD librdkafka-1.6.0.ebuild 1776 BLAKE2B c3746449ea7790f23fb5f5da1c5cc58a054a
 EBUILD librdkafka-1.6.1.ebuild 1958 BLAKE2B 246694451625e1ca35789379fbb921d58dbccd6deec96ac1ce535dcf53aefec352b2d945a3f85dfbb8cb99da44f3bafb7401c500cf990ee7a32cbdd98edf9b63 SHA512 58c9f3868b6efd6a6b7d2b3f16763756cdbe6021b8210be63a8bdfee5ab363c6532384e1d9dd13f0a75da81f92c137f54309908f5f1fa0c33c5285ad8f495a65
 EBUILD librdkafka-1.7.0.ebuild 1970 BLAKE2B bfb9c54558d90e036a4af70a4701a79304710a99e2f06593c7eb2b8ffdfbcba7e878d6362a076007d60209bc2d0f83a428debbaa4d1808eb4a09436a0f7459a7 SHA512 4ec351f6c1322f46415cbf5104c8ef5119ba4e3da569694c84d5bb60f7a1001eb94aae4e3f7385901b0516a87b1d886bc7f727fdf2bb0386ccbde45ab3b9a9fa
 EBUILD librdkafka-1.8.0.ebuild 1970 BLAKE2B bfb9c54558d90e036a4af70a4701a79304710a99e2f06593c7eb2b8ffdfbcba7e878d6362a076007d60209bc2d0f83a428debbaa4d1808eb4a09436a0f7459a7 SHA512 4ec351f6c1322f46415cbf5104c8ef5119ba4e3da569694c84d5bb60f7a1001eb94aae4e3f7385901b0516a87b1d886bc7f727fdf2bb0386ccbde45ab3b9a9fa
-EBUILD librdkafka-1.8.2.ebuild 2275 BLAKE2B 1a713234cb5a264c6c3e4d23f527654649781ac222f5106f7fd9d8070ae0d7957f2e06c91861baef33e2ca05482806d0dcae469c47ed8cbc6717925d47ad725b SHA512 c63a7183ccebd92b062feb3c5db83c4c28cb63f73bfde568bf054eb60e8eb07c1254e439de8f0e19db7bdfda5d06f16b8f31a9d00557afeaee7226b229a2cae5
-MISC metadata.xml 534 BLAKE2B d3e3af9e4ab26a60635a1087d028404543e0979737c2655d56e6eef4ecbcc30b7c7aebea211f665d8f6da8eae438b48718180020df3a0d9b2bcc52bfe0d79251 SHA512 73f64558c9e488098922fe76f41805116e83a64f70982b4fb6c11489a3e6a223cee95199cb2c3aee88a612279941850911050ce5cfe6c167aa02e7ad2a56fcaa
+EBUILD librdkafka-1.8.2.ebuild 2271 BLAKE2B 20a0d4dbf08c72637c489573af2e31859b7d22a8f4448a38ed98952439e4bb3a5902d6340e1aa042c256548240f5bc1732bd091b0cf153d151cb5e5bc6e3a79a SHA512 757aadaba96027e7d31cf9e42aa26a0ac34fa620fc44a2a3aaa7894320fae7d3e5966a0d8b6e407d8a7621b7d38f4406c00466bf81b5b97334b63b87432c0da8
+MISC metadata.xml 450 BLAKE2B 4d06e12bfb0600ab60b4b353f9ee6c2f37a8477f2c26c3a45e1644825a40afd4200006e262a0e434047d0bf0b37e23a41100cce27540bd6bf0bcd361260e7b85 SHA512 4a9cb90dd238c3232c08905874b8e798937edb1838f73a375dc7315efe337cde0504e04b5835932480857706519066e35cc154e0959a104282e3c9aa3b81ecd5
diff --git a/dev-libs/librdkafka/librdkafka-1.8.2.ebuild b/dev-libs/librdkafka/librdkafka-1.8.2.ebuild
index 08a217cf453b..6c805afc1211 100644
--- a/dev-libs/librdkafka/librdkafka-1.8.2.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librdkafka/metadata.xml b/dev-libs/librdkafka/metadata.xml
index 179d5698aff0..147ef55459fa 100644
--- a/dev-libs/librdkafka/metadata.xml
+++ b/dev-libs/librdkafka/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>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/edenhill/librdkafka/issues</bugs-to>
 		<remote-id type="github">edenhill/librdkafka</remote-id>
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 19b1bf1556ca..17ee3fc54782 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,3 +1,3 @@
 DIST librelp-1.10.0.tar.gz 543414 BLAKE2B 3c7bace3c7892755c943dc4fc9bee7962e6891f5200ac184555da5f552d19d65f5604c745653d06a87210152af9b57f7234636e59257dd29dc83b5dc566c9680 SHA512 a38840231902bec034edb497166deded7577c989e4f735e406c8488384972925de1ca6132b3080472f7919d2439559c8774c02a49c356e90ad791dfbba2a4865
 EBUILD librelp-1.10.0.ebuild 1342 BLAKE2B 7a4d15dcd71510c42efa8af97dcf62563c457c112a5ac85b4ff065a81b9c8127e74f1cc663ca9b65ee42f9ee3931767ebc9ccb5613b7f30cac5d9f3cfdcbb457 SHA512 a04f73305e103a15d33cb27000e7e099da28c929be93d5707577aa8f019a8da9409b7947c15bb01a45c6cb759ba730f5cf7164d6accc713649e926e36df63999
-MISC metadata.xml 349 BLAKE2B cb7f91498a7403b91fd3a4c2445ca7eea6056798a8c354a775a3fbaf69a501f4caa2f59543b750de8066d70e95ff6134f211ad4462277661470c9989e975b048 SHA512 80bc3528c4feab6c610c5843169cbbd4e2aff9b8a1bea3c07a6284ba60336c6d36ff34efa7eee6d851b63283fedb42cd96cb504861de40b738d465141de42be2
+MISC metadata.xml 265 BLAKE2B cf265e8518b92ad42867e1f3ca408b8322012281c007b55885d9b530efbd8b5be78c80c6e666975ca445af9340e666e3ecd204636cc6e63c3c6ead8eb13a9ad6 SHA512 6f369b519e83fb49fcb942e69f468d3d0dcbb55e67c9ecf065d6abf88fe1676921761d8297ac55a928110c42b35bf81cb1c9edc5c41d84e45b2c123e8df8a814
diff --git a/dev-libs/librelp/metadata.xml b/dev-libs/librelp/metadata.xml
index ad309c9b6260..f0df933ee186 100644
--- a/dev-libs/librelp/metadata.xml
+++ b/dev-libs/librelp/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>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gnutls">Use GnuTLS</flag>
 		<flag name="openssl">Use OpenSSL</flag>
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index e23873501896..ad77331f9dae 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,3 +1,5 @@
 DIST libretls-3.5.1.tar.gz 425343 BLAKE2B e303ce141a218c58655f01aacb11e61fdb96d9b3a5943b211a35f02d869fa99efe7bfbf719ad14a1983c7f418d8c1daf3013c01ffa3e0bdd58cfce84ed41ec63 SHA512 ea566f0eda3f5ecb413f070db0ff9633b0c9403919eb2724712eac1c47fd32745b6da8e974a0226c8f95b7e24e5824780b377ae63651fbd0fa34ff0e6df4792a
+DIST libretls-3.5.2.tar.gz 425404 BLAKE2B b975326c0bd9c2f4adb511f3a6ad4fc8cd9afccd24a3def0c82bf68473b73b93cd83b8b6b3ffb29fc5ba378a9d4fd902dda933f552a02fec374cd56e1690956e SHA512 62eed971cbacb4a50e5ebdad1ea1d57dd3b4f7520634393faf1fc141ef63b6e7d50acbe49747c956fca6b9f2dec8a79ab724df6e08a77858a1624b5a6e3cbe57
 EBUILD libretls-3.5.1.ebuild 663 BLAKE2B 9f7271d760697ab4258229045278b1dc3808e08ece9888b58ab91ee88a60a635c58b3241c0e8d1a56df51c6dc3da5a20cb28cc77e5439fb58f87bf65dbcc0a02 SHA512 e1656101af64ae4c6e2772eb92f8b57539a248a7ac614e40bb1785dd6593349050335bf379adbf3dc4da7f8f9fa3f005b88d7d39a49e7ff6d93c1e2f11420775
+EBUILD libretls-3.5.2.ebuild 678 BLAKE2B ab6512ba551a687b2a3a9b5f4de2952277280de7d49c314190f1b48ea981482f9969a26afbede75759567f960e22952b2a74581238f829840decf6a09b41f1f0 SHA512 b397c630879aec21cef032fc807bfab6eca9affb3df7cbb9953c1a12cb53899df61e33b165f134c5c471d84d55be19929b8e2dbd4aff4addf8820d3ccfb855e4
 MISC metadata.xml 361 BLAKE2B 9f05ddd1ac3e1a634962c9c800c3bdf60554488c61dff9b215866b24e0b2472d7c0873f0fd6bacec2abbab0e79faca728a4b22e34633c3dde64995b05b86db61 SHA512 c7b186da31da21b4ad5c5662325cb2757e3ee8d7cfd84d75a49b07aebd4dc882cb9b0e16ffce99a8ae2409a53dd750dfb5ec6eff0f9da9f4afee013f102ef688
diff --git a/dev-libs/libretls/libretls-3.5.2.ebuild b/dev-libs/libretls/libretls-3.5.2.ebuild
new file mode 100644
index 000000000000..fff1485fbfe4
--- /dev/null
+++ b/dev-libs/libretls/libretls-3.5.2.ebuild
@@ -0,0 +1,36 @@
+# 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/librevenge/Manifest b/dev-libs/librevenge/Manifest
index bcb76161d912..b89fdb90f671 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,4 +1,4 @@
 DIST librevenge-0.0.4.tar.xz 421604 BLAKE2B 414674e4313f3062dac20a1ad7f1cf1c0a1681bb486f4edef109558fa70aaf8ee407fec8dfa93014db8c8746804e0a2bfec9636d75066b93d84e9bcbdc3f4dc4 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712
-EBUILD librevenge-0.0.4-r1.ebuild 1139 BLAKE2B 1f2d3b23e9843491c29bd7d43994b2cd5a95662932e833639d2044a6ce870e39329ac88d1540b5c140724dddb16cd522bc0a884690cce1d5cad5b579a8b9a855 SHA512 21bb7cff8c7097da0e165fbd018c9435d85ea8fd7614332c6aca5a9c0d4a886cf02ee759affc253816575181bdbcd784d9f7b972146a535939a30eba601724b2
-EBUILD librevenge-9999.ebuild 1134 BLAKE2B 1c20710c1f34cbf12ae52dc58472772339130103a0fd9b94552bdab40a20ca915d4b46ccccc9c0d83b2808a2487f95d454b44a111fcfab7dbed038d0ece122e3 SHA512 5c6a541aba411553f27def5201dd1e718e28066c367b4d4505ad237f8e03f96b7b33e72d7652f54f8c67b38a91f52aff28b38c16c0ca81fd2dd76070ecc5e2fa
+EBUILD librevenge-0.0.4-r2.ebuild 1113 BLAKE2B beac3c2d736ed716e8313d19a16fa0f9f16b9a865298dc861aed0e5759153ba780d0b79fb980b758712f8f53fa05049b5091dfb198157a289362803ecd461e90 SHA512 a364d7f7ef746a6b6d9698c306927a499f614380cee3eb682c8b3d1e6b4e173c5f4e6d1ab7b5746338c9535da293de935550f6d3e18c668a2b8c531bc9d50126
+EBUILD librevenge-9999.ebuild 1118 BLAKE2B 5f6fcf32966de6e3b510cac2e59c6b910556695114c381dde63b23b8cf38401e4537ea56cc8ff7314b82ec3002d6e4bca5f16f642b2e857932cd1635c6d29560 SHA512 eace218e5959b643722b233f333e164e346a960e803778eb197b3a8f63880aae58ce37ef92348ca494ab8430c84a14fb824b1bb9369649a6bdb0f1a0cece8533
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild b/dev-libs/librevenge/librevenge-0.0.4-r2.ebuild
index 14145f8a95a9..8859233f807d 100644
--- a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4-r2.ebuild
@@ -1,52 +1,47 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic multilib-minimal
+inherit multilib-minimal
 
-DESCRIPTION="A helper library for REVerse ENGineered formats filters"
-HOMEPAGE="https://sf.net/p/libwpd/librevenge"
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/librevenge"
+	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/librevenge"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
 	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
+DESCRIPTION="Helper library for REVerse ENGineered formats filters"
+HOMEPAGE="https://sf.net/p/libwpd/librevenge"
+
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
+RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
-"
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
-	[[ ${PV} = *9999 ]] && eautoreconf
-
-	# bug 651264
-	append-cxxflags -std=c++11
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
 		$(use_enable test tests)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/librevenge/librevenge-9999.ebuild b/dev-libs/librevenge/librevenge-9999.ebuild
index eff06c57664d..1507cf6e091a 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit flag-o-matic multilib-minimal
+inherit multilib-minimal
 
-if [[ ${PV} == *9999* ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/librevenge"
 	inherit git-r3 autotools
 else
@@ -19,19 +19,17 @@ HOMEPAGE="https://sf.net/p/libwpd/librevenge"
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
 IUSE="doc test"
-
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
-"
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )"
 BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999* ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 multilib_src_configure() {
@@ -45,5 +43,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 8b0129239dde..a2ed26704192 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,4 +1,4 @@
 DIST libsass-3.6.5.tar.gz 342426 BLAKE2B 8c6bb37da3f832dd462408a7ef4f80384e468295fc420b3d915899e65fb89a9d0b4c1cf0653b7288fedbf6a66daa2943c2911ad2c310f77a06deb84bec1d3abf SHA512 98cc7e12fdf74cd9e92d8d4a62b821956d3ad186fcee9a8d77b677a621342aa161b73d9adad4c1849678a3bac890443120cc8febe1b7429aab374321d635b8f7
-EBUILD libsass-3.6.5.ebuild 1138 BLAKE2B 98b741a1ad419fcd47c1617390807feb1a2c7cd101077dc4076c0c67b352a521fdbe9315b3065cb6c553f2f292e2a8dae4e576ff4473aae8429e31c641954359 SHA512 fc19a86e75832483538160db58adb193d85281cd2f0178c9de013a057fbe68107e230e59e27ab727aaf91c0aa36521af6947f2e97a8e315e9b34bdd173b38d6b
+EBUILD libsass-3.6.5.ebuild 1144 BLAKE2B 3919f3ec0fa423e2c5df4e20ed76651e6da8902b1b4694242cd3f5df639429d266d5260d5935685be49f1c539ef0b3fbb3e4843f075384418a06ec2a94eb5c1a SHA512 6528c53873f17ca161585e9de9362958c2caa5c1c0748201ad941b729585c7fbd8769cfe6496c5c8c5ff716b9fa98ee92d0b5138f8449913e7594c3926b65577
 EBUILD libsass-9999.ebuild 1129 BLAKE2B 74ce5b5d25d821a1d6dead5db25a4d5f834dd30b2f9da2e2ee8526a3842b2934b6ec5b8c5b5abdbbf4d97b846eee6aa513588f597011025ea77357667c91f2d8 SHA512 620076a106661dfcd9d332c628732eb9bafbd1db59b7619a0edc312cf7aa9f91417b6def62c12934e1f7201c8527ec52df4549b5c9c873682653df40f8483250
 MISC metadata.xml 647 BLAKE2B 2043328e18efbefdfaded61e1fd2269d8b83910a2440cfba2c692fd343889087bd861ad70b2f8f96651b9e0af28cae3bb0668177478203b2ebabab3f8764c8ec SHA512 98de3665f1c27ae03a73212a3ee947597dde27846a2f44db6ef19d362566887d999d42daf505e8a938352005e5d7a3b77f0d661e4f2170f2ec225c43442a47ff
diff --git a/dev-libs/libsass/libsass-3.6.5.ebuild b/dev-libs/libsass/libsass-3.6.5.ebuild
index d1807595adcc..c1a6d0479eb3 100644
--- a/dev-libs/libsass/libsass-3.6.5.ebuild
+++ b/dev-libs/libsass/libsass-3.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libserialport/Manifest b/dev-libs/libserialport/Manifest
index 4b7c64007ad8..be38df0ddeaa 100644
--- a/dev-libs/libserialport/Manifest
+++ b/dev-libs/libserialport/Manifest
@@ -1,5 +1,5 @@
 AUX libserialport-0.1.1-kernel-termiox.patch 1216 BLAKE2B bbb629086c2e21caf683df74d63abd4c706ac05a4906d8322d369ca491ad2421416ca6abb579ca8c2eff7f862557338ab9bd31bf0954d8b564b2c06c1fad4810 SHA512 12b99310a2072e9a3a5df61cc2b2121e9b7823caebd88d22a344a885ff777ad955787303b6148e0b803a605877136f357ce211dcfeeae4938538d146f679d992
 DIST libserialport-0.1.1.tar.gz 405251 BLAKE2B bc52d7b5303c123a28becde1e77451a921c2b6d5284ccfaca298d0535a793297d30e297109382a7266263530ac9a0e0b598ce8d1602e0700b43bda227f29a6b3 SHA512 7d379d1099173841e6d4df04c8c12dc6a4ebdfa0323ef35da6f3dea20db55d4f6ad81c1f6679f5aac7fe83270176428a817daa8627c336505335a07e06350a85
-EBUILD libserialport-0.1.1-r1.ebuild 890 BLAKE2B 1d840dca265152832df93f750feb326cff15f4764a03a83cecdc3c91e40a82c90f0edf2e1a60644075cd032e958faa25b0ec99a0fbc193e5fb5ef5d2c23f2e37 SHA512 713b656a8480512914a98feed7a079cb41ba74922bf4ba0eb5292daa10145f7f62e96c4222f60131982117aab0cce682eb5e302118b3682a1767d33bc907f035
+EBUILD libserialport-0.1.1-r1.ebuild 902 BLAKE2B 5738bf9dce95e13c05e0e147c53f67ea82bdfd561dc65d93c8117d73ab78233c413522cd29172d23fef19993b989b1daaa509f0af8adf175c1e7157ff90ce635 SHA512 20a1d7c7c6549c3943b8fbbe404b9290b7b558b84f44105fb6ed2a6c85dbaa914135a8f3eda7e127b406e931c680afbe8e93df9ae07e4169552841478869e8ce
 EBUILD libserialport-9999.ebuild 694 BLAKE2B 9671aab0c1051e374eee35100e207bf27b013e55bcc6085594d4532d474b6455b3c4bf0c575daff46d0e76aa649c9685bc254a971760f71c534b3c2aaec9c997 SHA512 32f60eaa716ea29efc044c78793a4ac34fd1dc2d2943325abb964315d5721151abefd53123028ac5d19b91fe5e4445208a160e8f5ea14681077ff9052563844d
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
index d842c152ec46..729736138444 100644
--- a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
+++ b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Cross platform serial port access library"
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 44c066d0f990..bc943810a85c 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,5 +1,5 @@
 DIST libsigc++-2.10.7.tar.xz 4791304 BLAKE2B f3e41a753097d55d2e6f47407033139733dc813d84ffa8ba97ca94dbb2f1abc714a541fd90347c1477736eb9be109dd25d5ffc9998430b7d0fe9c627a9b2cfde SHA512 075f120f7261eac020a92956a4b2d8bfa380a63bf4e78d057d93b035dcb0590df1ee1e2d3af59edf97e3c30cc01359d259d24e4fc69bdb99952d4c9c02eb6015
 DIST libsigc++-3.2.0.tar.xz 785900 BLAKE2B 6c128a0c426814bde26b092c20f9eca1029712f5130a12088bf7cae10c56105334a12df0b26fe1234ed4c262cac576312d2e72abb926b6422e6fc111ccee8734 SHA512 91315cecc79a1ad6ea165b66a13a5afd4e5bc101842f9d4c58811ea78536c07fc8821c51aa5110a032ed71c09f85790b3a02f2ad7fe8cc3aed6e03b2bafcd70c
-EBUILD libsigc++-2.10.7.ebuild 1206 BLAKE2B eb92a7ae54679ea39eeb0114afac7f6443332a735661df1175090ea9e691e27aefe204f208cad01cda9137fa5c080ef8b2d022e2cb90e64b39d3f28293670d2b SHA512 125251432e93d3968ad618a08a942e55fc732e67ffc033c18925560e522000d866dfe50596b160360d8b67d56ea1fb9a037589037d48b12f25b3b39867c175ac
+EBUILD libsigc++-2.10.7.ebuild 1213 BLAKE2B e0bb2a0f737bb41e742e09fdd39d68943b463ba4f2497fad5539bafceb2566f58ac6f0bc9cfa8efc286cd2bf51af4ad9a2869efce94fdd36ca8bba00aa066bf3 SHA512 91eac76aabf01a57d3360e74afdd0607f8de717038b1b5fa94894487ca3f3526a8623525acdd96c5b83636dc9488b07ba76933118c1194b3c80e223f76fc1fcd
 EBUILD libsigc++-3.2.0.ebuild 1170 BLAKE2B eaabe9589f049166f9880729d19489b250965e92ced6a483b02d3f5b18bec78892448f22e65c31fe0f723a6717efb1913edf7cb7527679c1578356cdd1adc139 SHA512 a380f5c67d2749756a23a4a1bc6b4c7f699205fec27ae59b5d5429bb14d725b493405772fbf73b6eceb386cca21bbe4db4651561e4825d1118fe4a7543bd2f46
 MISC metadata.xml 331 BLAKE2B ffda3a57ba88aa23bef07566cf4ccd6837d06642903eddc775a2ac8888b13dda42978a2e8e5b49a669242b542163ffea51545dedf8a6977404b9d4d9788369fc SHA512 6d18ed50013370a09b8d6b8ebf109b89e69b0bca3f91104db725d6f4cdf13b961863841863bd1a2fe7f645c71c6351ca0874bfd7173008d3b07e4bd6991849c1
diff --git a/dev-libs/libsigc++/libsigc++-2.10.7.ebuild b/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
index 4d85a4141eaa..628e4bd5f2db 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 63763fd0375f..24dba043f5f9 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -4,5 +4,5 @@ DIST libsigsegv-2.13.tar.gz 460736 BLAKE2B 2202ef92e96b2b46d7496a69427159b06b041
 DIST libsigsegv-2.14.tar.gz 464658 BLAKE2B 1b6d93dc5414c686de458cc62412c95ebf8932aac3aa463bb76da67e1b25779880d760b229d9a2c6ee0a2a22c2d3c7a81a364e8731fe5a4f1f639a0f68d6ea57 SHA512 423dade56636fe38356f0976e1288178cb1c7c059615e9f70ad693a1e4194feba47a583b0804717e95a866da271b1ea5f80083c54a121577983dd23e5aa9f056
 EBUILD libsigsegv-2.12-r1.ebuild 759 BLAKE2B 0f1e96575db99253cb02f48d14a9f07918094b8a25db274b33e1ff07d5d35b50df5658f17426db1934f2aaa8ef6dd03ca03531d6f0c843b9ed46ed5da5c02ce2 SHA512 e7941e5ac2866276883a8fae1bd4191197ca52acf1aaaa242850dff627b80ed3487ce597e14e3e1eb626eb036bbf3898beac4f8900b256c9e8fc39fb8bf0baf3
 EBUILD libsigsegv-2.13.ebuild 798 BLAKE2B 1d741a5574e7621c817172d195109d3fded6cc77f3edcc153b7d40a818f320aa44f8522b785d77d253f4702fa2fefaac81de72fbe1a232288b46cba8b955a7f9 SHA512 2fa8ae6f43db15a08826019295dc13af6b42a8fa11054dbd7f1cb4991c24eb905e4998de366133090de6d26ea7921d2db71e197ed725445dcd086d442bd4bbc0
-EBUILD libsigsegv-2.14.ebuild 725 BLAKE2B f54442dd9e48405cd3e2d2d683a9bcf82dbf6e34795d96b70a9eadf1ece64df40f913c15e945df23dae90ba2f130ee9f1818b59a02a76fac66f822e6d3aacb73 SHA512 93a099684e8cf9cd64610c3d651e32aaa220e3507c282cb37d8f48c1e96c5a67a3cd29e2161935069a4a8a5f3833f8a8726ad57315f795366357aa84cb3e13e5
+EBUILD libsigsegv-2.14.ebuild 1014 BLAKE2B 9a59c41e2fa08cbbc2a52c377ba237452b01574756cfdbde4813e5c727d2d08a722676d909f3dc822ce33ccfe035c3fcac4920992b94c4d227a2a683d8e478ae SHA512 7ba5b17f59ed994157ab05d84b971dd4405490e421cbf8b7d2db611ea8736a72cd4abb88ec374b86eb660aaecaf604b71cc5acfaba6ce6caaa18d739aca907bb
 MISC metadata.xml 812 BLAKE2B e8fc8b173c996466766862116cd4ece9d4d66ad3a87f7766c24d4501af2038ace288a4c49e6c302cd9404f123abf66dc4279ebf9e1d32a5c5634883c5cd67ac4 SHA512 f758cb653cc4f60c1f503426d853de42baa89156973aa0b07dcbaf9999bf91c9c774f3905d15f3db8f9d7ec810e3f9f0981acbe6ec8a8e13b635c030ddd0381f
diff --git a/dev-libs/libsigsegv/libsigsegv-2.14.ebuild b/dev-libs/libsigsegv/libsigsegv-2.14.ebuild
index f9110af28dc4..e86eb0345c67 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.14.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Library for handling page faults in user mode"
 HOMEPAGE="https://www.gnu.org/software/libsigsegv/"
@@ -20,6 +20,13 @@ src_prepare() {
 
 src_configure() {
 	econf --enable-shared --disable-static
+
+	if tc-is-cross-compiler && [[ ${CHOST} == sparc64* ]] ; then
+		# Tries to use fault-linux-sparc-old.h otherwise which is
+		# for non-POSIX systems.
+		# bug #833469
+		sed -i -e "s:fault-linux-sparc-old.h:fault-linux-sparc.h:" config.status config.h.in config.h || die
+	fi
 }
 
 src_install() {
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index ab50ab81d9ef..59ab6009b2d3 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,5 +1,3 @@
-DIST libstrophe-0.10.0.tar.xz 357896 BLAKE2B b457c1556b7bd8012fd0b0badb962c0002ca38884e246911b25c8e01fa785a08c316a18c84e8f9e124ebeed636c586097a2dacf56c7c94062ac262e44f9473d0 SHA512 cffd71f3c83f53a4f0681916249842cc17e11fc28afa940e29a786ee02c5294a11115c115b12d200e185a62520623c68e1d4514ab374423e13e26b9438d80ea8
-DIST libstrophe-0.11.0.tar.xz 370740 BLAKE2B 19f240383e81ea2733505b8361ba061ba69b09227eddfb958aa3027d7c3aca2f1739977e003b980ecf5501fde5ffa2bdb0a0618aff70637b11f94dbd70fce3a4 SHA512 3fd3fc395d1c86787cccf9dfb54805a56d650687db17ee28107f4fd610aa250c40cd6052d5c8c48110d69a8bceddb913570efca24874733d3e9a016dd90df65c
-EBUILD libstrophe-0.10.0.ebuild 1075 BLAKE2B 3ba6a3d507a6a998c600ff123f048fdfa79437e61a066dcf230d17e02249de3bd2fc48c3658da22a61e17612935b4234f4454210a2e906deaf3fb1e1b8e37a15 SHA512 096b4f57042534578644aeb8ded64e52a9b5222090769ea3bca1fd2f8640973ef46f3ae2261d1711ed43d1083b60f9f5716dc1300e856bc859013459c0b7ae85
-EBUILD libstrophe-0.11.0.ebuild 1170 BLAKE2B 3da8cf1e5e704aff564ced499db59b235bfafd06d56ba12aa5b7dff674cc36abf4f6d6762738bce0736aa870ad504a89d1fa2dee1123124d0a2fca33a5ff6583 SHA512 30fe9329a8b1ed51446a1d786144e46b5867bc6970c2627ecc85f3b3e6e9ad625f3d317e64fbef21f39eb63e5670f012f81508cb0510e053c0404ba36589a426
+DIST libstrophe-0.12.0.tar.xz 397120 BLAKE2B 6ac32e317e14a8641b1d092026772264682b7b0980158757a82036f3db2643a6429e5553d9173b578111d5b8b503e9a98a4e140f98f8ac03866758624a1cec67 SHA512 dd0fc54840bb5626859f91c7bbe5204ea89332856392a5a33c50cf7f66c8aaa7b0d7c24bd737e8473d63f2c9d7683a75dcb9465a19634d14e54c9f8f20580884
+EBUILD libstrophe-0.12.0.ebuild 1251 BLAKE2B 98d7083591a20d015b84e5b27a8f338a8ac0c4e10f2fee56f4da13f84f40c965c69851473abf0b3341f4004254ff4fa2c1c539086ef098d12e364a11e623a4ad SHA512 cbbdcfc9e5fe30ba3374e85460d206c754278552b1bb50eb087d60a3541b0043ff77ef8751828c995afdef804bc339ff71b97ffa0b87314a5138ccb3df074571
 MISC metadata.xml 711 BLAKE2B 0fc95d72ff0d9dbf1765e8b2ddf7182d6543cecdd275798e79ad8bdf8bc494234f6fcd8acc76c6d3e87f6f4159d4b0ea0e70706932628173b1b75bed6c788701 SHA512 d8eb8fcbadee45ff2d411d766e3fba2afb18b2516eb4172ff2b072ef9b5469d7a92c32a4b70e989fd0b56eeaaad39d5f187748f7aedc6dca32493b1f2d0ca817
diff --git a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
deleted file mode 100644
index bf0d452cd737..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
-HOMEPAGE="http://strophe.im/libstrophe/"
-SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
-LICENSE="|| ( MIT GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc expat"
-
-RDEPEND="
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-src_configure() {
-	# shellcheck disable=SC2207
-	local myeconf=(
-		--enable-tls
-		$(use_with !expat libxml2)
-	)
-	econf "${myeconf[@]}"
-}
-src_compile() {
-	default
-	if use doc; then
-		doxygen || die
-		HTML_DOCS=( docs/html/* )
-	fi
-}
-
-src_install() {
-	default
-	use doc && dodoc -r examples
-	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
-}
-
-# Explicit src_test is there to document that the test suite is integrated and
-# is expected to pass. Please do not remove.
-src_test() {
-	emake check
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.11.0.ebuild b/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
index 66203627f86d..fb98239a890e 100644
--- a/dev-libs/libstrophe/libstrophe-0.11.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.0.ebuild
@@ -6,8 +6,9 @@ DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
 HOMEPAGE="http://strophe.im/libstrophe/"
 SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="|| ( MIT GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
+# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
+SLOT="0/0.1"
+KEYWORDS="amd64"
 IUSE="doc expat gnutls"
 
 RDEPEND="
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 09e40f0f433d..e49b5317dfb5 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,5 +1,3 @@
-DIST libtasn1-4.17.0.tar.gz 1906654 BLAKE2B a76798bdb8e68f2ca2337fa2648ff42adb7a9a51f27efefee5b9856e56ac09672237bd9a5b2afe808298e462eda31f2e8d3601c35ac00b84935f307ad981b2b1 SHA512 9cbd920196d1e4c8f5aa613259cded2510d40edb583ce20cc2702e2dee9bf32bee85a159c74600ffbebc2af2787e28ed0fe0adf15fc46839283747f4fe166d3d
 DIST libtasn1-4.18.0.tar.gz 1724441 BLAKE2B b5f93a7575dde46741b6fc97183105efbc934e44041735241ba40ecd578c94637741df193dfab0d97e0348e2dde34b8b89a33ed616afa0bf64db6dbddebf1786 SHA512 4f2f4afc7561fda7a1f1c6c525c3c3b08228a1a4aa8c3d3d5e02e993d8f83ccee1dd0f1b201cec0fbfc97043d4b1d7a95ffd34d65422a38b85b931ac7a015831
-EBUILD libtasn1-4.17.0.ebuild 1215 BLAKE2B 601fac3afabc551f721cb9e810868a25ae481a353afa824300bfd86616b0fecca923e5cdd652cedf31a61ec409409a90b36d129a135bea274c4d4f072f06620f SHA512 0ee69325271d2f133754034615e2c73a9d73dce9e9b8de4990509d5f0cd90283af187c56933d70ec5f0090ef4cf777bae56901870469aad4262d8bdc69c89fe3
-EBUILD libtasn1-4.18.0.ebuild 1121 BLAKE2B bac70f4d5eaf0a3d72b16e7fcd3420425734117bd5b1b6f4ad75b4250df037901caf151889dc35f42a732e0ab33f6a9842729c4fff0987271efd4fe87bd7dcc6 SHA512 59c22353c2c018c6c8b82f4ac26828a4a07564afb093eb43a1aacbf5bf8661327c574af4b6a9d5a2fdfd6fd7e6ada9e23fd8df49ca79fe41cc152f5d2087bd80
+EBUILD libtasn1-4.18.0.ebuild 1113 BLAKE2B 83e73a23a6064c774991415e29f817a9ab18b3a5b47061713e548dfad5946a172fd66b8dc89d18ee888ddb26dcd69cb85b88d83c8b316aed2538c90b43398086 SHA512 acc065488e1cd09cc670a3bfde018f2aacdbb787483a52755555212a4a5250c262fe545d815735e149e34f9579172035107f2226583e3774df6dce94329ef90e
 MISC metadata.xml 446 BLAKE2B 1d60c0db5d09d0b9c5f3bbead71748684f665e68e0b29b0e4023a80fbff349d4c4f5dac21e59fd222dc46e436a4336b5bbb410136dfc34d1fac44aa9a9bdb6da SHA512 1d486b356548451e21c494d267e433216e01d16673dbf1090beddb69cc6a6d13d279b11d9ec7884174a5c2109222b6dc5eebf86ee7899df4280274f7b98a0a60
diff --git a/dev-libs/libtasn1/libtasn1-4.17.0.ebuild b/dev-libs/libtasn1/libtasn1-4.17.0.ebuild
deleted file mode 100644
index 208c031ba4e9..000000000000
--- a/dev-libs/libtasn1/libtasn1-4.17.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal libtool
-
-DESCRIPTION="ASN.1 library"
-HOMEPAGE="https://www.gnu.org/software/libtasn1/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test valgrind"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="sys-apps/help2man
-	virtual/yacc
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-DOCS=(
-	AUTHORS
-	ChangeLog
-	NEWS
-	README.md
-	THANKS
-)
-
-pkg_setup() {
-	if use doc; then
-		DOCS+=( doc/libtasn1.pdf )
-		HTML_DOCS=( doc/reference/html/. )
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared library
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable valgrind valgrind-tests)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libtasn1/libtasn1-4.18.0.ebuild b/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
index 968d58d3850b..7138eb6e7263 100644
--- a/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test valgrind"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index 7bd8e2496c6b..1c9860b2df32 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,5 +1,3 @@
-DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
-EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e
 EBUILD libtermkey-0.22.ebuild 991 BLAKE2B 603a7b0bc41525bd0b8e3b2ebd374e3b96b5f844224934903e8c9cad292bc5cb0e6f7ce8bf919318f03b054d43ca87cca46c778992335124561b2e9722606a75 SHA512 25432f5e2da375485e155dfddcffba3daa269bb6179535e59c9d6da309691b091ac17b70705ac61f8c0122b24d913ded2ae1c6ac8512e2a45eb3830a09eff11d
 MISC metadata.xml 358 BLAKE2B 555dc6dc5edb485ded5e2fec2eef70426c2e693853954c5feb8d39914b1cc88aed79dae13df257df86193701e9f842fad8e4686941d3a143a261e289ebc0960c SHA512 1a9faab554e113b8c3c83ad7a6e24fa71ed7ea3838a11677465cc824c7181d512d58443b5ea2fbd52492345e62db5895e3f17a47dc7e413842b02cdad85c5411
diff --git a/dev-libs/libtermkey/libtermkey-0.20.ebuild b/dev-libs/libtermkey/libtermkey-0.20.ebuild
deleted file mode 100644
index 6dd0ea0eb31e..000000000000
--- a/dev-libs/libtermkey/libtermkey-0.20.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Library for easy processing of keyboard entry from terminal-based programs"
-HOMEPAGE="http://www.leonerd.org.uk/code/libtermkey/"
-SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="demos static-libs"
-
-RDEPEND="dev-libs/unibilium:="
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig
-	demos? ( dev-libs/glib:2 )"
-
-src_prepare() {
-	default
-
-	if ! use demos; then
-		sed -e '/^all:/s:$(DEMOS)::' -i Makefile || die
-	fi
-}
-
-src_compile() {
-	append-flags -fPIC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
-	rm "${ED}"/usr/$(get_libdir)/${PN}.la || die
-}
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index fd5ef40ab8c2..67a9ff4b03f5 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,5 +1,3 @@
-DIST libthreadar-1.3.5.tar.gz 443192 BLAKE2B d8e06c7b58636b51bd2ffd50f51a8a024780e4955693a28085296ccffeef8ad2866ac12e53b3c78b37a650c4b1c54b5fa8dcbacd1002577cdd7b30eccee2ef69 SHA512 c4c34036a7882d1ecdbc025e0d927b6712fb067aaeee8bae5bc740a5259c5f49d651a8ad6323ddf6cdf13fd2e5e7c396f9c134ef3447b3743ae8e64abd646850
 DIST libthreadar-1.4.0.tar.gz 445672 BLAKE2B ce4165bfa507f27ea071dab067e1cda61e0812fd106ab80f0ef04a53ac68ce866a3d7c5ce6a26d6e9fc2c2085de7b8636492711a15a7103cc16b773d0a87aebe SHA512 3665817cf6327d4d24792d8cc2bd0a458bda1651b471e3440c1f63c22f397cfb4c8d81482f937e13f67f5ff1414662b1f69d9c311362a0a7a9249e8bc0236751
-EBUILD libthreadar-1.3.5.ebuild 487 BLAKE2B 82d3fabecec2c763e21f2296315270c01d554b47540afc6780cc47e336e2716a9d3495aa7aaf91a5adad33147a03465ea6930c4deb1cdee6f7222fbb6dc01afb SHA512 15584e850b6870de765c9598f175fb346ab55301c51e1d7fb3d92bd744e86ac3fe0bf26beb66f9a6b0a7b192692a6bff0fa795cf20167b84009279c3ca1bada9
 EBUILD libthreadar-1.4.0.ebuild 754 BLAKE2B 1783298741e77cd8b3b3b27d06db8c62ad8c5a9451b73afda94b0d56f855ab6e0acaacd38149f57d7efb94999f6d79a5011aba004d8fc86e14ec7e39741cb163 SHA512 8f1a76a4fb868a4125b2b4a3f7110c3f470d6b40e0b2a1bd9462fba2faa84b45944f88a7572194dc86518f042fe3c302748b97669e80bedb90ddfb147198d8ef
 MISC metadata.xml 890 BLAKE2B aaf5d415466806037fcc87f048d8ebecc04d3c04613e828a3783e194f265bd25938d98e1f83d778c0e970e458115654faa87826af0e1af58f02a5cc1660df08c SHA512 7bf58461d45c6c9e00e3987aa7d66202cab8382fc84e775c17c59158404bdd5d179975d0afdf383ed654e34105820fcf2a83436716eea11c3f808a746d7291dd
diff --git a/dev-libs/libthreadar/libthreadar-1.3.5.ebuild b/dev-libs/libthreadar/libthreadar-1.3.5.ebuild
deleted file mode 100644
index 36a691d5afa0..000000000000
--- a/dev-libs/libthreadar/libthreadar-1.3.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Threading library used by dar archiver"
-HOMEPAGE="https://sourceforge.net/projects/libthreadar/"
-SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index b70565c43da2..de3a9a3760b4 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,5 +1,5 @@
 AUX libtomcrypt-1.18.2-slibtool.patch 4038 BLAKE2B 5fe1dadfc6afbc8f85f104299ff7b45706df3df5698f3375c83f4f573ea662a61158602e03b4c89da57969896181865f1f6b29ae6695ad71a3ab19adf4c559d8 SHA512 9486ae1abfe429d1dbe54185bb8b1fb1dc0550ae1089a000baf7afa4b6aa5011a4f1ad1b404b87a90fdae078125fcfd809298a46962a3cbba44d233231a834f7
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
 EBUILD libtomcrypt-1.18.2-r3.ebuild 3201 BLAKE2B b83c6bfb36a8bf22d704dc6f474283c49a29d59234df4c2c62ba16a8752cef6fc03199941600f6576e72f8e5c55846cbe048a05790acf35e2ff65c41000c38ee SHA512 63a526071754eab16b3609457018a389712e80d6e13ef0c5d8a1fbdeddc32f8110b7ca4ac6b966b60801112987669cd7f972f07d8a3274ef0e662229a5ed03dd
-EBUILD libtomcrypt-1.18.2-r4.ebuild 3207 BLAKE2B e7c12724683f6105afbf625bcc9592f0d31904f041b616f99a9764b1b33cc7404b0503ae8be4876d0aa6160a8c8b3587b2cedcaa3ef0d355e1856f9441dc4274 SHA512 cf7bc60b405f31a3dc09de2706b70c56bf3ff34b425f9cdedf9d3dacc4fda96c73ed247f7ed12fc6d07e7ed91b95857af5bc12bedf836d4b1788fb07e26b4b62
+EBUILD libtomcrypt-1.18.2-r4.ebuild 3199 BLAKE2B 4e30db89cb1579650fc6d4998169bcd019d6d2708518e639bc5cf6e984345c1fbc8c4184b5fe57372cd12536f70a7b00df6fb855bb4b322aa239e3fab38813ba SHA512 d8da9cadde97af3d0d9ef3dfca484ccd0e3447a7d8e7243aa125f1f86c77af9e806ec5c262d7eed5a645c3ba4a3478e5a2770e1e5dec309d0d21ccdb476a6f48
 MISC metadata.xml 644 BLAKE2B 112aa0ed4b144bc52466f2e247814612bca0ddae22539aa4262826f5bba0c7daac8810939fff61cb3330bc6f921a606a81dae06db9200d22d722a3b6586c17e5 SHA512 2e2fcc358f5f2d0f3ae6566e1af4a5eb4dc40b8eede752bc408d0d77177c6d0540ef5c7b4ed6ca0ebd9822b3260fca3e367b59c1c52d8e7133cd0f92e2b1c957
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
index 11fd6e17f57b..8fa4c04203ff 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
@@ -17,7 +17,7 @@ LICENSE="|| ( WTFPL-2 public-domain )"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
 SLOT="0/1"
-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="+gmp +libtommath tomsfastmath"
 
 # Enforce at least one math provider
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 36416fda65dd..8624c2adeab1 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,4 +1,4 @@
 AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f00ec37215b3f10a0ff9df521a866147b2a6844d86c3b372e450f701e6e2ae3e587443765c39848076536861342e5b42d63 SHA512 e0d55045bcb667278dc1ae1c509b7be466f23421683f8b0b7c830d724f83b1923b09a61f2a8e649e08150d1d313f0456cfc5f5a1b5fe3bf168565e443595dd12
 DIST libtpms-0.9.4.tar.gz 1264030 BLAKE2B 56731b913145afcd49fae13f0fcbe4fc147edf206a44849cef45ed34a7644f0894bb6ab5dcb72d620eb1ab121bf4e821fe7893557508af394585171133d659e2 SHA512 ae3e2613bc31d98c10def546c70d0c25bd1246af5090268afa0411502bfd0e454967046ebcd9025350976817441e595fa4e21562f800285db98331e4c2743505
-EBUILD libtpms-0.9.4.ebuild 1304 BLAKE2B a59602976b1c6564c1a75dd97418dc35c9537e4adc997e8a6ac63ec833a9d8d4e154425d9ea82311cbadade514a26a60e8c5b7ae2008f434c1b9ee0568c239b8 SHA512 59fe0fa80df39422df62858552384ae88613a7d037ec1ac9de3687d80959903a3d422c11fd6f6ac196eab9d75573003ca9f2adca59d28f1034e8d7a619b43d31
+EBUILD libtpms-0.9.4.ebuild 1299 BLAKE2B 6c78609afdc5385a842da2f415ef918475baab3da737cb2e43c72cf5d2aaa382dd84b4157e4b52aa7fa5f44de6db48b37f680897baabb006d923589d4ca39552 SHA512 f54857978f2f4d021055406f2f2f480f3df97ca57cf29b1967389107079cbe37551ac8717c03fdbf38cb4aa64b5567a87f27bd2ed46edd0243d076c06689f3b1
 MISC metadata.xml 536 BLAKE2B 75236814e21cb3e98feaa2646ccf680973a71e168d5ccd95cdd12f06214a1b18454cb40b1825df9335e3c4881b7d8d3cffdf03c48dcedd99da4a0dd50d81fe1b SHA512 3abebe84fc62f5082d22e0a3d146a22e7e799d0b1d0f3cfa282aac408ca8c0b8f396f7b081c92aec290037bb7405e672ce7f6f4f8da5b1966a0b4eda8005d721
diff --git a/dev-libs/libtpms/libtpms-0.9.4.ebuild b/dev-libs/libtpms/libtpms-0.9.4.ebuild
index fc15af9bf0f4..3b5f046772a9 100644
--- a/dev-libs/libtpms/libtpms-0.9.4.ebuild
+++ b/dev-libs/libtpms/libtpms-0.9.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libtraceevent/Manifest b/dev-libs/libtraceevent/Manifest
new file mode 100644
index 000000000000..b6f296c7589c
--- /dev/null
+++ b/dev-libs/libtraceevent/Manifest
@@ -0,0 +1,3 @@
+DIST libtraceevent-1.5.2.tar.gz 135283 BLAKE2B e4202fc3c9b09d20bed375bc1833a4f49b63cf484e63ecf3cc5f1f3950a1de7607464e6c2ae194085e78978e5f480a7ae392a4cde739c3a244367eaf1000f70d SHA512 3804a84d2a4771335ba14a7383f977d641e6437f055837c2faece811b8ef931cfa9d38082bef48d96092aeae8cdcb543222a3042b2c11c41749dddbbb4813d94
+EBUILD libtraceevent-1.5.2-r1.ebuild 1125 BLAKE2B 42c9fedbd65793c8e3eedb541bfa9a3f392b109ba0b92cdccae9b1efabed11f45a8d5ed5c822009d1a5e3f5dc236581910e636e6c2e805db065038a0e8bb11a4 SHA512 f54b75e36b022a9124e5bddd9fccee8884d6b715ea252d3802ef899f28c620dd81dfa37a017aa7187f78a5d08f4352b220fdb3efd912491a644800e5f20549b5
+MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/dev-libs/libtraceevent/libtraceevent-1.5.2-r1.ebuild b/dev-libs/libtraceevent/libtraceevent-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..2f16154945fe
--- /dev/null
+++ b/dev-libs/libtraceevent/libtraceevent-1.5.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux kernel trace event library"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	!<dev-util/trace-cmd-3.0
+"
+BDEPEND="
+	doc? ( app-text/xmlto app-text/asciidoc )
+"
+
+src_configure() {
+	EMAKE_FLAGS=(
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}"
+	use doc && emake doc
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
+	# can't prevent installation of the static lib with parameters
+	rm "${ED}/usr/$(get_libdir)/libtraceevent.a" || die
+	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc
+}
diff --git a/dev-libs/libtraceevent/metadata.xml b/dev-libs/libtraceevent/metadata.xml
new file mode 100644
index 000000000000..7c1651eba3e0
--- /dev/null
+++ b/dev-libs/libtraceevent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
new file mode 100644
index 000000000000..fdcc83c87c6f
--- /dev/null
+++ b/dev-libs/libtracefs/Manifest
@@ -0,0 +1,3 @@
+DIST libtracefs-1.3.1.tar.gz 175453 BLAKE2B d9801c9f50513a8b2d2de57f768aec69c3e47b4c41ba1e887b28465d3a0a6bf10e5d2c60f81615615176bdb65e10ef7e2b7dee5cbb214705cc69e55bb923231c SHA512 1d8423ff1033a4ab601dd8e9fa4a801c27425234505070733641c8c9a4dd382cc6563d3fde89958f18e0bc95e2cbbdf65e69a2935fe208d5de9fd3ac26374ec1
+EBUILD libtracefs-1.3.1.ebuild 1163 BLAKE2B 83039d72b15e31e05acabdaa25040fc1c59921e40911771c6dfaf5c8ab4535f744f552926c703f861caf5eb423b9e23602f0367b6a36809c504b0bf0fc3da21e SHA512 177de36870ffa7413808927e27a1ebb5e6c23f84df0dd2a5e8482926577881b0055dea628b19f3ba3713b2abf90788ee47da12166a3655b24bae7e1ac6b0c79a
+MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
new file mode 100644
index 000000000000..72cb28be45e4
--- /dev/null
+++ b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux kernel trace file system library"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+RDEPEND="
+	>=dev-libs/libtraceevent-1.3.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/xmlto app-text/asciidoc )
+"
+
+src_configure() {
+	EMAKE_FLAGS=(
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}"
+	use doc && emake doc
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
+	# can't prevent installation of the static lib with parameters
+	rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die
+	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc
+}
diff --git a/dev-libs/libtracefs/metadata.xml b/dev-libs/libtracefs/metadata.xml
new file mode 100644
index 000000000000..7c1651eba3e0
--- /dev/null
+++ b/dev-libs/libtracefs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 5474c9feb858..bf615589ff0e 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,9 +1,3 @@
-AUX libusb-1.0.24-multi_device_config_parsing.patch 2340 BLAKE2B 28e8f3916843599e3b2f03228d2366de29a9332fc0a147e32c61f8944bb0f77fe1b57b3f323f161bafd00f5ef8434c33afeb5c89ad4a0d658b54daf2ba5dc541 SHA512 78af84f9dc33589f89e6f97d5aa81ec11208dc65c3bd8b8c947837d0f70d68e5313ce3a68853d4d6cc8af4cc2f237b5c95ac2db563f0013652f88479dbcfdd68
-AUX libusb-1.0.25-fix-O3-warning.patch 1156 BLAKE2B 8bb4a8fd0edf73036439511c78c69ea9a022e01a1f1c6faa7963624faa1e59848ad91b0163d9c3b601eb31ec0251bcbb79e7e0ca64c7a35d66b8abe4b39ab98a SHA512 0547d439f9bf30b47df97227f03e9504a3b53b9a859505ebe17443380b923770812e684f76161cf1f3425af25502dbf8393c312ee7f3a6206f5a808b9bff2cdb
-DIST libusb-1.0.24.tar.bz2 606593 BLAKE2B f6188b5af1225cf8b6d1486b6efcf48e837ee4f2e3592adab3ae6aae0a74a67aa54f40f0dd547f951a194d40954f2ee33acf741d2eee0b8449ce64f2edcf1018 SHA512 5aea36a530aaa15c6dd656d0ed3ce204522c9946d8d39ffbb290dab4a98cda388a2598da4995123d1032324056090bd429e702459626d3e8d7daeebc4e7ff3dc
-DIST libusb-1.0.25.tar.bz2 609127 BLAKE2B 3aecfbf9fc068fdfb8e612918bb895988f8400dc2c3ffd96a81792ab844d632f0c098947200512ddc37cfa9003956f8454c1d0362973a5d646a225f81cc2923b SHA512 f1e6e5577d4bd1ff136927dc66c615014a06ac332ddd797b1d1ad5f7b68e2405e66068dcb210e2f0ae3e31681603ef72efbd88bf7fbe0eb41ce700fdc3f92f9d
 DIST libusb-1.0.26.tar.bz2 620534 BLAKE2B 0cc397ecf4de0066abbff9b286a9e4fcd48658698d5e0d6b736abf56b48c1b55a05f15fff7be53fd33f767621e0c25d87275a47e05a4bcb44c4b8ac9221cd081 SHA512 fcdb85c98f21639668693c2fd522814d440972d65883984c4ae53d0555bdbdb7e8c7a32199cd4b01113556a1eb5be7841b750cc73c9f6bda79bfe1af80914e71
-EBUILD libusb-1.0.24-r2.ebuild 1772 BLAKE2B 8ce1e44dc5838e83968a70c5a165468eb39bdccf1f818a8604fc0efacd8d1f0dbbeb222f65d3e4416ae988c7b327acfc46b060ba02bd580c418b897ec8f1b87b SHA512 0e851aac8a4012a6d89acb2f797ebc462f00c0c6b1dd9f1a673ade1a056ea802d2dc6204e83d20b606b0366f9562d7be0f5960240945e5acbe911232fbcda2c6
-EBUILD libusb-1.0.25.ebuild 1742 BLAKE2B 4b8b8529f03c7027d20549ffb8ff4b3380fe295ca6a915f9fe5ebea8faca1a3a865a3b7453650dea22a2c24faf0e28f892288cc1f6ff6c54edf0e9fcfa6a1be8 SHA512 8f6b87c28fc05e17be1877087e0fbf4bb5e6faec1f0c49b1c31dde56259b4159da6b802ab3ad86ffbcc69ea334b4c2af9667ef722f127211cea16d1d9e4aa249
-EBUILD libusb-1.0.26.ebuild 1695 BLAKE2B c2c6349651ed98682b8da2abf235fe6d7cf39f334246c77d7abc55b1f077b2a48ca1539cd8e3a687399da2947b5cc393cbb9ef72fe7451980abfb8162a97e5fb SHA512 84162738422fa2d6889e69861cfa4d6a64852660d6300c430f4b2777db52225135cf8f72495b134b826154d2f513cdfec4505b559d0beaf240fb14e5a0036871
+EBUILD libusb-1.0.26.ebuild 1687 BLAKE2B 87bb2999ce468e553d4e6e40027ece6eaf61313ab395e1448736b4dac2183df05dc2ae79cedba5540df5eee2c60d94995d03dca4c73772607c42d33680779911 SHA512 125e80cc6bb77c05c8b0b56d36c30c81d366173e1da3bd684c9035e2d2a068ccf1c144f09e998b8cc08f887ad65b132a79c3c61b8ee90ba96c53de8523ef0fda
 MISC metadata.xml 336 BLAKE2B 8598a5e3d01ee5d7efb7ef2d48fcde99c13ee9e5915d3fe4fb2b16689482dfb31ea23d27d75e638aa7e429f725b876e834f3319eccc188f4af6704d3fed14c4f SHA512 8bfb8a1c4a2185393c1cc00b6ba17a9e04276e7708ab5c590209eb7c522212c8b45981dd935ef15421f5865ac7861c5dadfbc7d8f53ab4a42b3f0315696b3713
diff --git a/dev-libs/libusb/files/libusb-1.0.24-multi_device_config_parsing.patch b/dev-libs/libusb/files/libusb-1.0.24-multi_device_config_parsing.patch
deleted file mode 100644
index 739d41c404a7..000000000000
--- a/dev-libs/libusb/files/libusb-1.0.24-multi_device_config_parsing.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f6d2cb561402c3b6d3627c0eb89e009b503d9067 Mon Sep 17 00:00:00 2001
-From: Chris Dickens <christopher.a.dickens@gmail.com>
-Date: Sun, 13 Dec 2020 15:49:19 -0800
-Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for
- multi-configuration devices
-
-Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device
-initialization") introduced a regression for devices with multiple
-configurations. The logic that verifies the reported length of the
-configuration descriptors failed to count the length of the
-configuration descriptor itself and would truncate the actual length by
-9 bytes, leading to a parsing error for subsequent descriptors.
-
-Closes #825
-
-Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
----
- libusb/os/linux_usbfs.c | 12 ++++++++----
- libusb/version_nano.h   |  2 +-
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
-index fb2ed53a..4d2dc8d6 100644
---- a/libusb/os/linux_usbfs.c
-+++ b/libusb/os/linux_usbfs.c
-@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx,
- 	uint8_t *buffer, size_t len)
- {
- 	struct usbi_descriptor_header *header;
--	int offset = 0;
-+	int offset;
-+
-+	/* Start seeking past the config descriptor */
-+	offset = LIBUSB_DT_CONFIG_SIZE;
-+	buffer += LIBUSB_DT_CONFIG_SIZE;
-+	len -= LIBUSB_DT_CONFIG_SIZE;
- 
- 	while (len > 0) {
- 		if (len < 2) {
-@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
- 		}
- 
- 		if (priv->sysfs_dir) {
--			 /*
-+			/*
- 			 * In sysfs wTotalLength is ignored, instead the kernel returns a
- 			 * config descriptor with verified bLength fields, with descriptors
- 			 * with an invalid bLength removed.
-@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
- 			int offset;
- 
- 			if (num_configs > 1 && idx < num_configs - 1) {
--				offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE,
--							     remaining - LIBUSB_DT_CONFIG_SIZE);
-+				offset = seek_to_next_config(ctx, buffer, remaining);
- 				if (offset < 0)
- 					return offset;
- 				sysfs_config_len = (uint16_t)offset;
-diff --git a/libusb/version_nano.h b/libusb/version_nano.h
-index 61a0a700..578b0979 100644
---- a/libusb/version_nano.h
-+++ b/libusb/version_nano.h
-@@ -1 +1 @@
--#define LIBUSB_NANO 11584
-+#define LIBUSB_NANO 11586
diff --git a/dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch b/dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch
deleted file mode 100644
index 7270b057d172..000000000000
--- a/dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/libusb/libusb/pull/1062
-https://github.com/libusb/libusb/issues/1063
-https://bugs.gentoo.org/832732
-
-From 8bb81fe72286cdcb782c7af4f0d7ef715b2e137c Mon Sep 17 00:00:00 2001
-From: Yegor Yefremov <yegorslists@googlemail.com>
-Date: Sun, 6 Feb 2022 07:12:14 +0100
-Subject: [PATCH] linux_usbfs: fix maybe-uninitialized error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Initialize active_config to an invalid value to avoid the following
-compilation error:
-
-os/linux_usbfs.c: In function ‘op_get_configuration’:
-os/linux_usbfs.c:1452:12: error: ‘active_config’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
- 1452 |  *config = (uint8_t)active_config;
-
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---- a/libusb/os/linux_usbfs.c
-+++ b/libusb/os/linux_usbfs.c
-@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle,
- 	uint8_t *config)
- {
- 	struct linux_device_priv *priv = usbi_get_device_priv(handle->dev);
--	int active_config;
-+	int active_config = -1; /* to please compiler */
- 	int r;
- 
- 	if (priv->sysfs_dir) {
-
diff --git a/dev-libs/libusb/libusb-1.0.24-r2.ebuild b/dev-libs/libusb/libusb-1.0.24-r2.ebuild
deleted file mode 100644
index c13d355add9e..000000000000
--- a/dev-libs/libusb/libusb-1.0.24-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="Userspace access to USB devices"
-HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc examples static-libs test udev"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="static-libs? ( !udev )"
-
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	!udev? ( virtual/os-headers )"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-multi_device_config_parsing.patch" #759814
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable debug debug-log)
-		$(use_enable test tests-build)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		use doc && emake -C doc
-	fi
-}
-
-multilib_src_test() {
-	emake check
-
-	# noinst_PROGRAMS from tests/Makefile.am
-	if [[ -e /dev/bus/usb ]]; then
-		tests/stress || die
-	else
-		# https://bugs.gentoo.org/824266
-		ewarn "/dev/bus/usb does not exist, skipping stress test"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		gen_usr_ldscript -a usb-1.0
-
-		use doc && dodoc -r doc/api-1.0
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h}
-	fi
-}
diff --git a/dev-libs/libusb/libusb-1.0.25.ebuild b/dev-libs/libusb/libusb-1.0.25.ebuild
deleted file mode 100644
index 71c8364d0b70..000000000000
--- a/dev-libs/libusb/libusb-1.0.25.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="Userspace access to USB devices"
-HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc examples static-libs test udev"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="static-libs? ( !udev )"
-
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	!udev? ( virtual/os-headers )"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-O3-warning.patch
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable debug debug-log)
-		$(use_enable test tests-build)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		use doc && emake -C doc
-	fi
-}
-
-multilib_src_test() {
-	emake check
-
-	# noinst_PROGRAMS from tests/Makefile.am
-	if [[ -e /dev/bus/usb ]]; then
-		tests/stress || die
-	else
-		# bug #824266
-		ewarn "/dev/bus/usb does not exist, skipping stress test"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		gen_usr_ldscript -a usb-1.0
-
-		use doc && dodoc -r doc/api-1.0
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h}
-	fi
-}
diff --git a/dev-libs/libusb/libusb-1.0.26.ebuild b/dev-libs/libusb/libusb-1.0.26.ebuild
index 62e5552d1cf3..7fdc7c660181 100644
--- a/dev-libs/libusb/libusb-1.0.26.ebuild
+++ b/dev-libs/libusb/libusb-1.0.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="static-libs? ( !udev )"
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index cf0b9b5ef55a..0d9a1c76704a 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,7 +1,5 @@
 AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db261f8ae7c4979fc3965d32d7d8acd6c6edad4a4e9afc449e36df0f7544ecd1823bceba17ba456f21b221c78341243 SHA512 23be80dedc692cae3dc67d66834c937a890f781a9f73c68ebc3181130a5f33f981f822ef026464f77aa134701505054cbf76cf852429d0b3194d6a48773a0b8d
-DIST libuv-1.43.0.tar.gz 1295972 BLAKE2B 82cf4a0eff25aaf941eaa1b04030af1d21b758c0a99ba9cd3a13753879dcbea4f167d94b8e67de4d5674e02f84f9902198faa3159fc7e8f51d52391e842f46b8 SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3
 DIST libuv-1.44.1.tar.gz 1301786 BLAKE2B 34418fbf8ddffe368b4df8f8b668888ec9f3e369c0d8794efa993ace5c37a3359a020d7868b9287b31abece6d0d3cf839ca412e959a4ee970650755f37247c29 SHA512 050b5f91540d126bef0a35681f8dd347296d3be32671b1c785494e78f5367b4ab064ece3f594523e09b08bcac284377d5fb123ba441fb570d25c5146aa484c8e
-EBUILD libuv-1.43.0.ebuild 1358 BLAKE2B fc897f62f27b258f4e88c69596d3c2141e01039156e6cd78cf4f1cca9b699d8304fcc8a30e3ff5270a9506d619a3ed10e56d6e40ae2b1c92d2665888213dad6a SHA512 6210053cb2667450a8b191677a6de94f7b5efc61ea7cd9fc0188984e18adb40d14bf232b77049117471deb29cb2973aa8f83006fe4d8c4bf8514a526eab94d2d
-EBUILD libuv-1.44.1.ebuild 1365 BLAKE2B 1ad06e6763bb46f2b3016acc135b308f94aa29dcd0d4879b6ce3280149ba036da9839ff9d579748c2bd127c94e7771ea562743d87f16fe7f36f254fa9197f393 SHA512 ea6b8f040d0c928a116d0b1c6c17e140b75789a47762f43dcb2f2ba389331b54448fc0560f276fc67bf7370c303f7f45d744e6b4cb3be12a0ef14033133d2119
-EBUILD libuv-9999.ebuild 1373 BLAKE2B a4fa4e88d0031b73a00987c6152489d8938dafc9371dde0a8e112aae256c7ad10e4eefb4989c18e0e70b5f7b48a20a63362325b3358b78c8baf583456139d86f SHA512 866bf4b77b09783c6277d08b53881007f46e11d4986e1a751c15bb71657113c4f86b3979066e70742d263b3dad10924de8d5b4f50293c90a0a40907aa4dfcd51
+EBUILD libuv-1.44.1.ebuild 1371 BLAKE2B 01fac1a7a2a09f274b628371ba1aadbc4077a17787eba8f63b92a40f462c0446a70ab5fd829d5bef53df73a78287c31f88c06414210476e84cedce5584624099 SHA512 22b1f916f13eebd76de097934033b5b2a46f9e5fa7a886a15a0fdbde0584e19b132d6c5959ca4fb914de02574a638b834cba9c382a0f6743be312afd27ae4148
+EBUILD libuv-9999.ebuild 1379 BLAKE2B b5d2680ac99a490d6e36d481402b271fe838d4773da9ec52b09f67b62901961648f0cf5388bb720c8df2b9bfb97d3e9d9180f6b1ef38d9db37386fab9c106f09 SHA512 6a4095f50c89fdcb80a1167d0623af7b2c329ca01392fcff49272c609abeac9c278d1a649f0069a59549d0f065caffd899577ff7e4f77c910256f0deb432a2b7
 MISC metadata.xml 1426 BLAKE2B 79a040706bd2e88560fdf7cdd75226c51384f1b27f8f86798f3a694d1d4b02ce309edef4f1921f73e498533e37deff9051ebdaa6ae565defabe9d4546aa33bd4 SHA512 a6fa2c3217de06d7d324b37b00e0cb19e8d0b192cd10736d32f5d459c701c14a6aa296d7d4d292f7c56120953423df0068f3f71495941295c97e86c283b084d3
diff --git a/dev-libs/libuv/libuv-1.43.0.ebuild b/dev-libs/libuv/libuv-1.43.0.ebuild
deleted file mode 100644
index f257414de42a..000000000000
--- a/dev-libs/libuv/libuv-1.43.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Cross-platform asychronous I/O"
-HOMEPAGE="https://github.com/libuv/libuv"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/libuv/libuv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/1"
-
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
-		eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch
-	fi
-
-	# upstream fails to ship a configure script
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		cc_cv_cflags__g=no
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libuv/libuv-1.44.1.ebuild b/dev-libs/libuv/libuv-1.44.1.ebuild
index b50c3ecd3eac..b71cb1bbda54 100644
--- a/dev-libs/libuv/libuv-1.44.1.ebuild
+++ b/dev-libs/libuv/libuv-1.44.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libuv/libuv-9999.ebuild b/dev-libs/libuv/libuv-9999.ebuild
index 027c9800d212..a20b1b4e4dc1 100644
--- a/dev-libs/libuv/libuv-9999.ebuild
+++ b/dev-libs/libuv/libuv-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 8d022ee152f7..c6d00e464650 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,5 +1,5 @@
 AUX libvoikko-4.3-disable-wall-werror.patch 1227 BLAKE2B 6c943d0a77465c176109d790e650044227a82b386d43494e0ea19426fa985d732cfd3e3a9ef309c2de38da6693f813c3f87eef58c72ab809ee8f8d6e70396ebf SHA512 40c95ba1c78e854ef97bcecc3b98f16089d5f26c70051a8022a782338c704428cac0f08e87b7b4db495d78245cf191ed0a00406963da77d515c56f1a1fad5d5a
 DIST libvoikko-4.3.1.tar.gz 658079 BLAKE2B 4f52789b5d62991333ba9b979259a631ef2989bc70358b398a4281d56765046209657fd3e41afd47ee7ba1dbafeeb4a34ffd007e55037bca9958fb813e4b7202 SHA512 6677fac7c0cba1289dda23b0c0a4bbe44480ce747189d40634ac57811728c1942a795efd50270e933373fabab9c54e82a8f9fde06d936442820e3f8019574f08
 DIST libvoikko-4.3.1.tar.gz.asc 833 BLAKE2B 4a69ae75da1973e383ab21cb557352be1344dc6e34fef13e28616fbd9e0003b93ef5e3488f1e776eb476a750980281463ee144edc5849ec7e3159badc160ceb7 SHA512 04a5e8899679e1503ec0d378903b8ff17e8065aa105ba61559b584eb4cde2a5a9b622fd39bd0126bb87915c7dcbac8495e874c3cdabf25232b1ae41491275ba0
-EBUILD libvoikko-4.3.1.ebuild 1251 BLAKE2B a508aa47e0fb1e33dc78e4e410b15929249f15e98ed1b051485d8b858e9c51478cc77f094e5de925aef16d77956ae1e0a436e8d4b75c25ce5ae6cf49b75a1af8 SHA512 89145d053a946a97bc6143a0db7c4a0fa685a94a15a312df94970485f75a5e15faffffc183c577fe92ab8b047b4817477c78cfe3b716f4d1aa0d3175bc241ad1
+EBUILD libvoikko-4.3.1.ebuild 1251 BLAKE2B 5728de034562481b21018f638682beaeaf564a60297b64c8f7c41a0e34de91468d09ddf4ada3fe9f072432de8b1da13c3df3a41c9762b58af396e8cb4b898d7c SHA512 35495539b9eb8d528a4efa94b97ed11e156f961701ea4133c6bd61d547f579a47a1d0e04fcf0ded57ba9daedcfe779248c82e88a55a1315130b70c2ddd04440c
 MISC metadata.xml 420 BLAKE2B 50da044696bd5ea088e340526e669db93321664f40298db2ada11ff15bcdd5a4cea5f7398ea65e8cea86ea484b86c8eb11751c05ad16957c4cd3baba521f274b SHA512 546cc02a57222c8b172130d127eaf0a24869be6138a6834f34e761f40a29636c1acf8697a377208cecf5f3183f186ec267ceddec69bc1fb3229acae48ac22a87
diff --git a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
index 97d1bc96ddeb..e4791f9de050 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-r1 verify-sig
 
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 2fe9ab257a16..d8d33caac211 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,13 +1,5 @@
-DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa357869f815658c3c13e04808841e5e1e847732046e212153d4e4d49bbddcd5c661cdb7f7f962e6fd0a305a534bbca074a4ca6 SHA512 9f55c9a00807e46c1c6157fc372d3cad575f2574ac8b3abc82acd26ef6425166ac18ee1b7d77a9dfc617b14bc9eb7dc3a364cef5c0bf6c4951dc755d9c6c5ce0
-DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877f6312573d54c8cf3b34e38996886f1100ddae12e34ced1c8eace1a307238024fb91b2a96e6b9e2e85d30a5073 SHA512 beb21ae2bcc5f5e7dbc8cb645e004ce923f2b77f756b48a9ec835dbe1c99afa8cdbce12c5f982b5ca880b5b1ea113570d48733a1d043a7b16ae271f5718a6757
-DIST libvterm-0.1.2.tar.gz 69050 BLAKE2B bd547e14ef2b2b7c733a88ccd975db5ccc936ad5df49221cc6877be223e48da41fd8e5cf40dbc8750a95d6efaa6e5b97d337d4a013ec534a4bbfd68279325bc0 SHA512 5d6a17b98d4dda9d0529c3686cadc1f788e48667fa133100bfb0cdc92a6b08d0ea2f1a6058f58941e1408788c4f1d5a86941ec2457e31c6582f5ddd13bcdf7c4
-DIST libvterm-0.1.3.tar.gz 69115 BLAKE2B befdb173a75652a42f3ba72682cc5c411ee170f2cfe46a22f133ca2b414f40f3af97331a4aaa34ca2a36f39b2ef92b63f2730bd872db8181512fd18f95921034 SHA512 de68b36c589638cc727fdd8153af66cc9288d32567bca1213e3769418a7b98afff68565dfd34f73f74625c39e66b60da7e658e9afa9bef4efa2072ff91d872e5
 DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
 DIST libvterm-0.2.tar.gz 79712 BLAKE2B db17d15550a595652368edd7ee0ccab2a69effa79677a23d6ee94731fc05d685df0de843d2e953cd59d2077922e72834d7ab09eaf5260aed869d9511cfd224a7 SHA512 bc99ae4fbdc165ced92c10fb0168ae6da2ed702208064616fefcd42aba71c57b7d42a08bc5b0e7e1ebda8cc4b5682d16059bdd2edfb12fbd8ac97527e854b14c
-EBUILD libvterm-0.0_pre20181126.ebuild 819 BLAKE2B 407c20beaada04be4a5ccf381780f9c4f3003a621f6fef0a300a261e58380a1771ab5448c4cdcfa2492dac558b18a083c5ec10bbb8a27b2ab948d08c72951249 SHA512 929568c1d1c5c56c43c39fb502cc1d08691dae6a6da69c6673baee415d8f17e6f0e7a0296d09d51ccac227d1accae9d147aef24762c665b516cdd154a552be07
-EBUILD libvterm-0.1.1.ebuild 877 BLAKE2B d7ccb94b2b5302528a32d1c5eb9cfd93b55a201059f117e5c07911a5f734e05d3b7a62c4694aec0b1e519c820e550ee65a41a28ae57f96454589477d031595af SHA512 f1a89cd21460683084fe86dfb511897ad60a45eae00f5d5f90b5053876f047fcbc4b8d1e81d1278e0486bf1e856f69c43a0673d5bd94e21b6197d5ebfeb5d85d
-EBUILD libvterm-0.1.2.ebuild 856 BLAKE2B f0280c1a73cab89dc1b306df9f2e690bb7ae4a524af4d1b5ba4bc1dfa12c07b4a777bf08214ce5fc27725e334fbd0dcf1a5d8baaf3e7ab808816caaa18620e7f SHA512 2de243264c74a0cb432b49615aa4400eb64833c502237c8eec95706625ca0b2130a5201a4f97c94b50d93d187ad9d79803e09a796a37100ffc31729249b98fcf
-EBUILD libvterm-0.1.3.ebuild 881 BLAKE2B e47aa30b6d333e556fd2970d15081166bc64b318f0a8e51089209e85e11f7d0c63acdd93c79e9d6164a6dfc9160d8853a284f92f4d758f72e97a6c118d254760 SHA512 591a3ebe5ddfa0f73d575abe1b78ad59205df61d6f4c507ac91c74279bc8a351fa06dd4c6f6d8cd76228176084546b15827d05cab80cda05eea312c70ff94312
 EBUILD libvterm-0.1.4.ebuild 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.0_pre20181126.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
deleted file mode 100644
index 75e2b16d3eb5..000000000000
--- a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
-S="${WORKDIR}"/libvterm-0.0
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig"
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_compile() {
-	tc-export CC
-	append-cflags -fPIC
-
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libvterm/libvterm-0.1.1.ebuild b/dev-libs/libvterm/libvterm-0.1.1.ebuild
deleted file mode 100644
index 64440bd5eae4..000000000000
--- a/dev-libs/libvterm/libvterm-0.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://launchpad.net/${PN}/trunk/v$(ver_cut 1-2)/+download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-BDEPEND="
-	dev-lang/perl
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_compile() {
-	tc-export CC
-	append-cflags -fPIC
-
-	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		VERBOSE=1 \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
-}
diff --git a/dev-libs/libvterm/libvterm-0.1.2.ebuild b/dev-libs/libvterm/libvterm-0.1.2.ebuild
deleted file mode 100644
index d4ac11e08b8e..000000000000
--- a/dev-libs/libvterm/libvterm-0.1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-BDEPEND="
-	dev-lang/perl
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_compile() {
-	tc-export CC
-	append-cflags -fPIC
-
-	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		VERBOSE=1 \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
-}
diff --git a/dev-libs/libvterm/libvterm-0.1.3.ebuild b/dev-libs/libvterm/libvterm-0.1.3.ebuild
deleted file mode 100644
index 47bea98026fe..000000000000
--- a/dev-libs/libvterm/libvterm-0.1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
-
-BDEPEND="
-	dev-lang/perl
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_compile() {
-	tc-export CC
-
-	append-cflags -fPIC
-	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		VERBOSE=1 \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
-}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 72e435ea05e4..3fea84a91539 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,5 @@
-DIST libwacom-1.11.tar.bz2 519285 BLAKE2B fb26190d752316b5d25659d2ae76681bfff1803463360aa138eab91ed7d7ef2d04dfb6bdd4f8c2effc45a495ef3afc312a817d4fd41cd8167172cafd9f5cee9f SHA512 24e8183502dd2b928d53b3d26d8479210e855c94c225649d63ac33062a30615654ff0ab8666a25503fb3253125539cd845ca467fb228a01c608dc3adbbec73b5
 DIST libwacom-1.12.tar.bz2 543819 BLAKE2B fdbfba23d7b1e047757b0c0ff698a484cadc91c199459e1da49bfd5a5406aeb62d2ca43856f7d8363c3f36c7c05f4d3160e8fb576c3d18f085144dec259d49c5 SHA512 4e0084eda01e78f52336f3f1f1ea3ea86cb9c5fdd6d6c0316662405ebe2a328d6837f8db855e58f5fa95a640a5d456a081a7de339a372bf851bc0d5c69530379
-EBUILD libwacom-1.11.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
-EBUILD libwacom-1.12.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
+DIST libwacom-2.3.0.tar.xz 107872 BLAKE2B 5589067eabb0b0d5384015a0200950146d1c028ce8cd870b845de8ec22ca1710645755253952e49f9c1db585a945c6ea8da37318b900f16602a1a7081512ecd9 SHA512 ccbeddc55cc67d8102aa4536616f3c379877ba9154a72d7ad92941854c79b727a21efacf4282b9a8730ff181d094749bf84a9fe5850de6246d91a17e5029d888
+EBUILD libwacom-1.12.ebuild 1394 BLAKE2B 19152e1d6fb3cb580c2763dfd16812eae387eeeaa69b77524a321468c6244b6fa00a1012cd5b6f0f72dcb00ba2ddc6c8fcc3806b1631caf061a0c1865c428679 SHA512 5869d7cb13e8162410558c9d6f6af31c141be5d5469e125e9a451e8785bfce21cda27e6edd7b4b053491d4536adc618ecbc86d042f9c49d05bfb17f5cc0ad436
+EBUILD libwacom-2.3.0.ebuild 1501 BLAKE2B 5c575736f3559516261d5dde4d4134a1ce07c383dc1c271733a806507e5b7222d0b19f99bf72c5c87f8a15649149e3a8e1a8f905acb4640f398dfe83b9c7fb9d SHA512 ac6ff77254301395a4c3c75b8a74c99cb9a0bdb39c63a61c02a113e957a6e7e67f003ba185421412fa7d5d0a5b7285f312fb9a515764be754ad97ecb8ff3f07f
 MISC metadata.xml 309 BLAKE2B 707d30ff0df4fef9c458c658c8d8ae763cc48ded42b7acba94098236fb56bfa486e8be61974113c6234c1831d08939c0c94d65d17abd2bc7a5e092fdcdef2888 SHA512 49b894496ae441153607ef14034c0df9ce6c9582e788cd55afd414a2f8189f1828da1b056142d258f7edb38e8a6ec023994b1d00734010b65ad7b50c2a108837
diff --git a/dev-libs/libwacom/libwacom-1.12.ebuild b/dev-libs/libwacom/libwacom-1.12.ebuild
index acfda32d8405..ee050d97c7ce 100644
--- a/dev-libs/libwacom/libwacom-1.12.ebuild
+++ b/dev-libs/libwacom/libwacom-1.12.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
@@ -56,3 +56,7 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/dev-libs/libwacom/libwacom-1.11.ebuild b/dev-libs/libwacom/libwacom-2.3.0.ebuild
index acfda32d8405..450f5ceeff32 100644
--- a/dev-libs/libwacom/libwacom-1.11.ebuild
+++ b/dev-libs/libwacom/libwacom-2.3.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1 toolchain-funcs udev
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-any-r1 udev
 
 DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
 HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
+SLOT="0/9" # libwacom SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -41,13 +41,18 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
-
 	if use test; then
 		python-any-r1_pkg_setup
 	fi
 }
 
+src_prepare() {
+	default
+
+	# Don't call systemd daemon-reload in the test suite
+	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature doc documentation)
@@ -56,3 +61,11 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index 894b863a3d0a..5372a1a27715 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,4 +1,4 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
 DIST libxls-1.6.2.tar.gz 443736 BLAKE2B 46f875613caa423dcb3acac0c38a68c7274993b25cc9be891266b8cf59e8eb0f17580e399305cf927854e090f34fa34f57f7fcbdceb75dffaf04c3362fa63095 SHA512 55e5cb33ec63484063d0893eee7352b89f993363762cd5ef42b5f918b09d1eafcf933fba076255267d9413c963481eb07c7054a2495d2d529db2e1d626353d22
-EBUILD libxls-1.6.2.ebuild 636 BLAKE2B f074728dad2854ba9c91618e05799d4614942c94c75f84dc7aba30614e52d1593337fabc31272cbbbbbda6b81a33c4a282a7e842a5d7c34175ff6cf64bf2c7cb SHA512 9cd01561afc1a257356676a801f0d0e390c7dd2da11ff8a74debf56efc8d0a179d8613555a776b8aebfe7b21336fc63a06bb4cea53534ecb05a394cfa9360bfd
+EBUILD libxls-1.6.2.ebuild 594 BLAKE2B 4d3e9079928a66e7e52d9487e522d3f24aa1197de7c5a9e236010db82bce5279ad98edd50fbe3512a9863fe5f8dcd1b9682c7e7bec999e34017e3d0feb73d0af SHA512 ce1d6a2f8f55f1df600c8a1365e23b42f8b7e0ea0b5320dfcf43a7372422405d2e873b027dff52e06d930a83027042de9454343a0012220fa24582c93122e45b
 MISC metadata.xml 304 BLAKE2B b1b6c500fe0d22b04f956c8adeeefaf3fa1a9776f485c8285b6c4774d6e8c32868c7f056b10ab743dd3a003fd833ce6df05e31b64ba7f496cd5061a9c9ad4f35 SHA512 5ee99e9cc9769d406b48e2f44895d1066bd02df0547df172fd08edfe8d614f56f97829645ede881f7dc65fbb03fb9cabd22e42b526222d21cdaa7db532ba7231
diff --git a/dev-libs/libxls/libxls-1.6.2.ebuild b/dev-libs/libxls/libxls-1.6.2.ebuild
index 5db6df61122e..2127c6427b32 100644
--- a/dev-libs/libxls/libxls-1.6.2.ebuild
+++ b/dev-libs/libxls/libxls-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-RESTRICT="test" # test driver is missing
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.0-asprintf.patch
 )
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index fdbe9697c865..ca57cd14d5f4 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,13 +1,8 @@
-AUX libxml2-2.9.13-testapi-missing-xml.patch 749 BLAKE2B cfa1ea7d99eb0fb4925008d6562fb174092ab303bfd4925847e3cfe51c3edddc3fe20117d272d52b3d3fa865cde47f69578e976cf2d0e746e41edda1c5bb84c8 SHA512 40ac186658fd5eeb68d899c92dc8073210c24e770eef00e803d666b38f7c495bc9144da63d851d0059b8dfa92bdf3782f8039d892eb11901efe661b960c3d3f5
-AUX libxml2-2.9.8-out-of-tree-test.patch 1109 BLAKE2B deba11c303cb82b7c804361311a48b7a55b1fc6a5d3fb81aefe87f0b9816aabbb870c2c26b0e9e1e82b6d92330396ef1d700c9e761863028568ceccd379dc736 SHA512 f78952b61ad22731ec2e5866695388ea0ba051153990db4227f5b2e9d7fca35d0482bcb1732b5026d91ff3b8f885de513ca5f249ed359069c9b27fe81701d68c
-DIST libxml2-2.9.12-r5-patchset.tar.bz2 7231 BLAKE2B d9d0d56ebccbfe234a8af04cc5343c1a02d84fbd998c2373fd48be59cf92807a9417db650a6bb6ba309e101994c4ae2b28edda7bf635c7728eb8b8047d0d3391 SHA512 b2db0fe4595c1559d9f8dc836ee6eee469191f6c490fc95d25d9fa99a544e80858894cc35b6e4a6624a38d0309800540badc929e86ef29950c1107caa4656a14
-DIST libxml2-2.9.13.tar.xz 3243336 BLAKE2B 845a8283cf1ff9fd9f7926cfe0042c042a9de5ed184520d8057f7b33312687d5ff28abdf30dd2674795d78dc80326203a907f9e22cd261805309403ecdd585f5 SHA512 fc51980cb9222bd3b5242f73d28b55fa15a80e68e52e1c45274f1eda11500ed385853209edb3b2a1f06b9de0be304c159a9bd898c7d84b0899eacb00723d98b5
 DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428
 DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.13-r1.ebuild 6865 BLAKE2B bcddef93bc37db888a57086bf828f9693565a55894faf05fb833bf3343b08c7bd304dfdd7ecca36fdd321ab9873a07ae2c15db9af2b1e2b2ab6743a320d0d9b9 SHA512 77d0cf94670d31561b13d15370a4f03c107506e53148a4321bab28269d939c604e3d99f738c5f192c8a0d82a571de8dca1bc40828a63f6e09c5e9952dd2893f2
-EBUILD libxml2-2.9.14-r1.ebuild 5034 BLAKE2B 52b3409a6d97bcad84784201c0a834ee612eea977f28b6daf1d4443dc3b041633bc03648d8314be0b43918b7175a2d387e5b19c942379b5e483867b7b5e15614 SHA512 433ce2647c79befbf23bd8fe7f67c8abb26500953024a270f5f49a7439cc20406f413492ed3bc94956f178516700d0bd1b06a396b6dcf1dada3036fc0e47baca
-EBUILD libxml2-9999.ebuild 5136 BLAKE2B f936cd1ab8042fe354daf003e2e20e8d30f24e42e2853a846afe8522e3d6321dd910416c9e1f1fd0815aa100ec718210cdb6f42df02fde385e3ed947a28769e8 SHA512 21210ed2ff26f54a503c0fa822f695026f118e8039812cabb60ed75ee04f0b0c463487189720de4809d0de09e3207d9c59f758b9db18ed86f86d03e5dbeb3a0a
+EBUILD libxml2-2.9.14-r1.ebuild 5029 BLAKE2B 74875e62eede1a5dcacecbd383cc33cf95ef21f49998b88ee88166ddf659f1241840a44412118a3a2a59af6d1438c74e10beadf709ee8da8b826ca1d60e553f1 SHA512 61eac30dfcafe2daf7aa36c85d2c6803e9f44514138d087954ccd626a390056e8018c578880506f171bd4d6865ae22bcf492d5f01acd87ab77d992636cbd9827
+EBUILD libxml2-9999.ebuild 5076 BLAKE2B bd642aea861bd1b6245953514ad245fb47917d5b21a68c52d2962d28fcd4e58e9552e12a0f1f7abb039d51f80bd8d8969b08a8b2015acd136ab6d1a609b62ae9 SHA512 de9253d2f149d3e80e3af1be1a0ca412b49a3146bc63746c7dc1680c0bc3829c8999657126d976bc64f59202cf6f146d7356999e832d05bf759f61a277808383
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/files/libxml2-2.9.13-testapi-missing-xml.patch b/dev-libs/libxml2/files/libxml2-2.9.13-testapi-missing-xml.patch
deleted file mode 100644
index fa8e3d392d18..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.13-testapi-missing-xml.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From b31e07dbf40c3998dd466829e818f5870296272d Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 22 Apr 2022 20:14:05 -0400
-Subject: [PATCH] testapi: remove leading slash from "/missing.xml"
-
-Fixes an error when running tests in a sandbox on Gentoo Linux.
-
-Bug: https://bugs.gentoo.org/839804
---- a/testapi.c
-+++ b/testapi.c
-@@ -442,7 +442,7 @@ static void des_eaten_name(int no ATTRIBUTE_UNUSED, xmlChar *val ATTRIBUTE_UNUSE
- #define gen_nb_fileoutput 6
- 
- static const char *gen_fileoutput(int no, int nr ATTRIBUTE_UNUSED) {
--    if (no == 0) return("/missing.xml");
-+    if (no == 0) return("missing.xml");
-     if (no == 1) return("<foo/>");
-     if (no == 2) return(REMOTE2GOOD);
-     if (no == 3) return(REMOTE1GOOD);
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch
deleted file mode 100644
index 468214d0bd8b..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14
-
-From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 3 Jan 2019 05:44:03 -0500
-Subject: [PATCH] fix reader5.py test when building out of tree
-
-When building out of tree, the relative path this test uses doesn't
-work.  Resolve the path relative to the test script itself instead.
-
-Url: https://bugs.gentoo.org/565576
---- a/python/tests/reader5.py
-+++ b/python/tests/reader5.py
-@@ -4,6 +4,7 @@
- # this extract the Dragon bibliography entries from the XML specification
- #
- import libxml2
-+import os
- import sys
- 
- # Memory debug specific
-@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman.
- <emph>Compilers:  Principles, Techniques, and Tools</emph>.
- Reading:  Addison-Wesley, 1986, rpt. corr. 1988.</bibl>"""
- 
--f = open('../../test/valid/REC-xml-19980210.xml', 'rb')
-+basedir = os.path.dirname(os.path.realpath(__file__))
-+f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb')
- input = libxml2.inputBuffer(f)
- reader = input.newTextReader("REC")
- res=""
diff --git a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
deleted file mode 100644
index 5102622cfb0d..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Note: Please bump in sync with dev-libs/libxslt
-
-PATCHSET_VERSION="2.9.12-r5-patchset"
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-inherit autotools flag-o-matic prefix python-r1 multilib-minimal
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20130923.tar.gz"
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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"
-IUSE="debug examples icu lzma +python readline static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
-
-PATCHES=(
-	## Gentoo
-	# Patches needed for prefix support
-	"${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	"${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	"${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	# bug #745162
-	"${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
-
-	# Don't bother copying Python's libraries (bug #798942)
-	"${WORKDIR}"/${PN}-2.9.12-dont-copy-python-ldflags.patch
-
-	# https://bugs.gentoo.org/839804
-	"${FILESDIR}"/libxml2-2.9.13-testapi-missing-xml.patch
-)
-
-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
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Avoid final linking arguments for python modules
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-		# gcc-apple doesn't grok -Wno-array-bounds
-		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-	#elibtoolize
-	# Needed for https://gitlab.gnome.org/GNOME/libxml2/-/issues/338 too in 2.9.13
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# Notes:
-	# 1) USE zlib support breaks gnome2
-	#    (libgnomeprint for instance fails to compile with
-	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-	#
-	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
-	#    switch (enabling the libxml2 debug module). See bug #100898.
-	#
-	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--enable-ipv6 \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		# Ensure python build dirs exist
-		mkdir -p "${BUILD_DIR}" || die
-
-		# Odd build system, also see bug #582130
-		run_in_build_dir libxml2_configure \
-			"--with-python=${EPYTHON}" \
-			"--with-python-install-dir=$(python_get_sitedir)"
-	}
-
-	# Build python bindings separately
-	libxml2_configure --without-python
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-
-	emake "$@"
-
-	popd > /dev/null || die
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python ; then
-		local native_builddir="${BUILD_DIR}"
-
-		python_foreach_impl libxml2_py_emake \
-				top_builddir="${native_builddir}" \
-				all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-
-	emake check
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl libxml2_py_emake test
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
-		install
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	rm -rf "${ED}"/usr/share/doc/${P}
-
-	einstalldocs
-
-	if ! use examples ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ -n "${ROOT}" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# Need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# We don't want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e "${CATALOG}" ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild
index 5a2c61cefdfd..28e55087cabf 100644
--- a/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 # Note: Please bump in sync with dev-libs/libxslt
 
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{8..11} )
+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"
@@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit gnome.org libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
index 847a7c331d40..d651157658dc 100644
--- a/dev-libs/libxml2/libxml2-9999.ebuild
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 # Note: Please bump in sync with dev-libs/libxslt
 
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
 inherit flag-o-matic python-r1 multilib-minimal
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
@@ -58,10 +58,6 @@ MULTILIB_CHOST_TOOLS=(
 
 DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-)
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index ebca7625be6b..5b2f3f29de1a 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.7.tar.gz 121055 BLAKE2B 5dda4695041af85a3fbb6c5ed9888ed822df1ddc6c281a89629598c82c022a8c55fdebbb4e49c553ed99d38c97843855569a3fcc5c2531b698b024e4b68638f6 SHA512 398d49e190aedd5c1f0eab2a8b6ddf5fc1cd866d575459c049e55399fc8fb54512783cc024b8f3016fbf19232502ba86781eea5b937871a3aed25b5ed28a5edd
 DIST libxmlb-0.3.8.tar.gz 121068 BLAKE2B fed6eccf0746952e3063030aa63447f2e5d29199c13166ed129c012be3e954d3fbc3109aa5397b4e9622c197222961984fb6cd3c0cec14c74f9fe80611639747 SHA512 a5302d570b5d6e5fae4be2536a11b93986cb22e7095da81e1982754cb6460464a1a9020a3e5b98566aa92d8570aa30a6fec190ae03a946e17b99f48621f476ff
+DIST libxmlb-0.3.9.tar.gz 121878 BLAKE2B 4c61482f05535b84efb1bf466db8d89f58dddde9cb9d87eb22fe04343f89dc4efc882ff3d9f73131e8fc8c8c107a72fcc2765e5c1b3e290c52593666b7073b9d SHA512 ff2b6567d97801b58ddb87be71246065c2b9d666494059c2f7cc2535508d4754969f8411bd3a28a49664be2c21aeb95c75b999a06ee8448bf1fd962dd36ac47b
 EBUILD libxmlb-0.1.15-r1.ebuild 1207 BLAKE2B 1ea024b9a69ee5da1d849c1f5ad7f13fd78621498591faa5de9ff48a6889c428018ab880472950ec5ea9fa10c70e2388e7661cee6f7a81942926330008d0b93f SHA512 332919207fd280d33be7e4087b356745b065b8af8be7be3149c40cd741173eaa1d92b3928f6704471c021f61aaf0d13424d6204f60e1733f145dbc92c6985c66
-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
+EBUILD libxmlb-0.3.8.ebuild 1202 BLAKE2B 8cfb0d42ce4cfa28982bcc12f959c69864a26484b7ac7e906fa45ae8c9d32822609679c2d1090ef7b2849cd58c8a49d6cd7fac5dc061daeac75289c3c0b60044 SHA512 5958b8e2a133f1cbc7e9bfa9fba93b95c57568a3b22f4e949452980148a2fd3026b1c91cbbb4557b0fdc049d7a9823caddb9df896a7531de1065b567dc344805
+EBUILD libxmlb-0.3.9.ebuild 1204 BLAKE2B 7f650422fea3e1d88e1ecf474f09d8c38ff89ee957d6a8e05e5196f5f903e4a6af64ace26b47120cb8386b75d9374311ff120a0fe54e92734cbd335da56b9e9a SHA512 9b60a17ad5a2e31fd2ff3c8b234ac3baf80679addee8e689e9121ea14f5d13c3809afd3fb1899fd547e0290beada174251fe0429c627163c007880d7b3f9a8f7
+MISC metadata.xml 335 BLAKE2B b2c13e004d67e02b14849bd101cba074fc8c45756939297ddd34ea1c4e7cf03a061d4eb4444c527683103ad72355de205ab041246157bb1e81157140eacc75ae SHA512 7390c0e4330423ebbd65d4697cc0966d7ec25e4360d8a4b6e0ec803ab4694a57e35cd062195aaab987a463930678f075909ca43823ea092dd6b750985ba42644
diff --git a/dev-libs/libxmlb/libxmlb-0.3.8.ebuild b/dev-libs/libxmlb/libxmlb-0.3.8.ebuild
index 86105c7d3ce4..c0bd64e75ac5 100644
--- a/dev-libs/libxmlb/libxmlb-0.3.8.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # libxmlb.so version
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="doc introspection stemmer test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libxmlb/libxmlb-0.3.7.ebuild b/dev-libs/libxmlb/libxmlb-0.3.9.ebuild
index 86105c7d3ce4..86105c7d3ce4 100644
--- a/dev-libs/libxmlb/libxmlb-0.3.7.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.9.ebuild
diff --git a/dev-libs/libxmlb/metadata.xml b/dev-libs/libxmlb/metadata.xml
index b7c01e26d68b..d08e3289c60a 100644
--- a/dev-libs/libxmlb/metadata.xml
+++ b/dev-libs/libxmlb/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>whissi@gentoo.org</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="stemmer">Enable language stemming support</flag>
   </use>
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index d74ea3d9050e..fa05e3eab189 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,4 +1,4 @@
 DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96
 EBUILD libxslt-1.1.35.ebuild 1913 BLAKE2B 6c68990defa39e6d04fc70b4a2f4f3d1e1e27a109f04fefa85c0973aa8f9bd4680311fb25c8878cd65b29afc51bb7f4c7cc8a294b17f8a0f7a1cb77307ccc184 SHA512 9975052b66a9d23e5e0ce4c5df5647a4a43ebf9509dfae2cb90968fead499b2e7f83e0e74eb7ef51b969c0c0b7c89d97a1d1e62aa32b2b1eab6c724806498d01
-EBUILD libxslt-9999.ebuild 2767 BLAKE2B 9b63a6f15a6665dad0784b31e8176f22ea62fbc1ba526d574ada1c820062b1c7401c2615a3e82cd4b0cb06a398065784d157035f2394da885a441331aa121da1 SHA512 6b533d3654524e791b1cd34edf6acac25a6681b9afbf6f46f5c54a3186531e086be02d9cce54a6467d748d9f857ebbcabdfe734fb7f64cc1ffd3f0628c6a329d
+EBUILD libxslt-9999.ebuild 2767 BLAKE2B a4360b67aa78e3573be93cc592e0d97da859840c18ba25dcdf277a1d06a4aa30f0b087d08f4200b14c59a11bbea3f87d421f12998be17209a62e12bc5f7db03d SHA512 03e7ecf6b5bbe7c05270fe907581370a51e880330a36325c95b75d0b40d0fdd1c2c5f199f65dabd6194027a3d2900a0dab90d9c2a66952a9397c566202ef94ef
 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b
diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild
index 9ae87bff0559..bd5015b66924 100644
--- a/dev-libs/libxslt/libxslt-9999.ebuild
+++ b/dev-libs/libxslt/libxslt-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # Note: Please bump this in sync with dev-libs/libxml2.
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit libtool python-r1 multilib-minimal
 
 DESCRIPTION="XSLT libraries and tools"
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index c8aa9c6b5eeb..c54b3b4f74a3 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,3 +1,5 @@
 DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
-EBUILD libzip-1.8.0-r1.ebuild 2437 BLAKE2B 45d8062185a433a80f329d3459cd23a4dbfa719190f92daab4861c6fb506404410368abf75fa8edef0d12719dcf88a5559097bbba2d25ae20ec124ea929fd17d SHA512 74f2a2d40c44cb947d12a5c51935e5371941b4cd0ca97a2fc8d5333b9718825a94132ecb7eddaf049aa4bace6d0d04855637ebc3c3b18ec23c27208352eddb1d
+DIST libzip-1.9.0.tar.xz 763704 BLAKE2B 204952e96ddcff0d799cd7f4ce4be868aad6f6555999673eba9bd85382ab26546f6423034fa68461009d095d4a2513b490b2b144aca0caa8c0be0980b35ba124 SHA512 dd0c7046f5b1faf00690774572982e870edaa1819563f9ebf7caf823c9c5718623576a7135a64c9acfed9cefac5601cf944b7aa0b623986f5c85743f3014b349
+EBUILD libzip-1.8.0-r1.ebuild 2444 BLAKE2B adc40f870375d1c3bd5753018108985f34b4e2eebd20b8205c6368086bc9dd0a289b7f3c6484969740712b9ef315d18abb0fbe628256b72ffb8c6f3c789abc1c SHA512 467c9a3a7f17c018384b10e679364ecaf9c41762f155d1da0c3438a2cdcd210426726ea7662a532f44c058bb0958a9b0371c1b6ac776b205949448f9ca3fe4c2
+EBUILD libzip-1.9.0.ebuild 2452 BLAKE2B 0e9a40f854339b7a206ebbea483835524f59b2a37d829f17195fba8e2238ee39035ec24fb4b1eb928f905f58ef45e873b8c36f76296e7aa7736fd5ad0379f281 SHA512 97123443fc12a1b521202b907b7cf877913b81dc3cbe49a960a975b966391e82ef0a149df58320af269692e3caa09033acc4a06c84a85d4ca4789f0794213848
 MISC metadata.xml 510 BLAKE2B cd0e88d175985805badcbe4b6aa771fd65ab9e8e86a3d37e18531e61ef9fac92ba191ba4a3806c37743a51541b1f353f5bf58b7195898de74eb2c389623a6994 SHA512 e073a6f074e9d5dc8abffada8338c608915527ab3c76f693cd261c6a99aef73e18c0e0088d508d62032619f779f1c6d9445cdd0273aeb61e41b9e3b449762337
diff --git a/dev-libs/libzip/libzip-1.8.0-r1.ebuild b/dev-libs/libzip/libzip-1.8.0-r1.ebuild
index 63d0cba908af..2da9c9ac1ee2 100644
--- a/dev-libs/libzip/libzip-1.8.0-r1.ebuild
+++ b/dev-libs/libzip/libzip-1.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/dev-libs/libzip/libzip-1.9.0.ebuild b/dev-libs/libzip/libzip-1.9.0.ebuild
new file mode 100644
index 000000000000..0a706c57e930
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.9.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild flag-o-matic
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
+REQUIRED_USE="test? ( tools )"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2:= )
+	lzma? ( app-arch/xz-utils )
+	ssl? (
+		gnutls? (
+			dev-libs/nettle:0=
+			>=net-libs/gnutls-3.6.5:=
+		)
+		!gnutls? (
+			mbedtls? ( net-libs/mbedtls:= )
+			!mbedtls? ( dev-libs/openssl:0= )
+		)
+	)
+	zstd? ( app-arch/zstd )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Upstream doesn't support building dynamic & static
+	# simultaneously: https://github.com/nih-at/libzip/issues/76
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	append-lfs-flags
+	myconfigure() {
+		local mycmakeargs=(
+			-DBUILD_EXAMPLES=OFF # nothing is installed
+			-DENABLE_COMMONCRYPTO=OFF # not in tree
+			-DENABLE_BZIP2=$(usex bzip2)
+			-DENABLE_LZMA=$(usex lzma)
+			-DENABLE_ZSTD=$(usex zstd)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=(
+				-DBUILD_DOC=OFF
+				-DBUILD_EXAMPLES=OFF
+				-DBUILD_SHARED_LIBS=OFF
+				-DBUILD_TOOLS=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_DOC=ON
+				-DBUILD_REGRESS=$(usex test)
+				-DBUILD_TOOLS=$(usex tools)
+			)
+		fi
+
+		if use ssl; then
+			if use gnutls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=$(usex gnutls)
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=OFF
+				)
+			elif use mbedtls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=$(usex mbedtls)
+					-DENABLE_OPENSSL=OFF
+				)
+			else
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=ON
+				)
+			fi
+		else
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=OFF
+				-DENABLE_MBEDTLS=OFF
+				-DENABLE_OPENSSL=OFF
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	run_tests() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	}
+
+	multibuild_foreach_variant run_tests
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 96f68b962dac..f86241892cad 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,4 +1,6 @@
 AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec121a6b29b6a779e885cae825678679e521b2f4eb2bec6b6b6c8f1c5f311337c7b2e205a5cb1966538741e72b7e7cb37 SHA512 03dd3164c7626d70019851189fd35d7ecfcbc112b594dafc0c3390f0d533b67611838cd9207a486139f4e4c8ac78f81da87d0c00a0238ad417c90942bcaa2c6b
 DIST link-grammar-5.10.4.tar.gz 4593602 BLAKE2B 0515aed27ae8df85ceddb9685ce90db2b6e7671235b9b445b6728b1ac417d6d43b3705566066ff9735fc98c32746342c224f2399bb0f2573784f20b5f998e7be SHA512 a215694f76e15286c478884ea8a13b32976d06ea45d10897dc1b303f256a2c0af94c9f90da26b314ce5e03009b494ab526c729b66f2b1ed46ff3e8b02cb6fd08
+DIST link-grammar-5.10.5.tar.gz 4637765 BLAKE2B d280a06492462725c9c62352b6bf4fb0a11a09b2b3049e41d9a078fa2ad37c8ef0f0e99e05039e355e81d127c168024068319a4fcf64caa840c00c165ed22f11 SHA512 09774f7ce01bc7ec9912162297c9b7be176e655b70981a147d53245c015f62581e7f45c005d0590d1a65e870e3c2ac4288517012fd9caa9887e4fd86d8e6aa05
 EBUILD link-grammar-5.10.4.ebuild 2921 BLAKE2B a8f4961b5360995d58b9d52d15357717a038f417ecd61941007bd5aadb324f2bcee9b33d53a161ffa682c3bef7ea68f9813fb1c52abf2e3602f025a10f61959e SHA512 6fa2c1ab5d2140c425b3f68f59760dc61eed86dda635616a591bfb3860a2a0a57d41a1c3f0c688cd02a8e3401c7ae865505116c927f4a8da856b0bb475ca9bb6
+EBUILD link-grammar-5.10.5.ebuild 2923 BLAKE2B 8559d949ea26e420c97628d02f9f9ce5b467cc9339fdd59ab60c406af6807177ec2cb4f046d039d8e2d3fdb124320a7e6b53b121caef5524b7c0f719c97a5bb6 SHA512 635ebd792e697ac282ab9451c8e95dfe2e46064aa7f5919c5ee62927c347c77a1dc6739d2f09be266dbb39307aa7e955461250e215581e999ad3a8e40a971951
 MISC metadata.xml 1069 BLAKE2B e657e7727730c54d4aee903c585378978a2adf7a3a6851e6995445afe64e966e48bc4bfab6e930449c288b3ffca3436b9fbe67e88f9e790739ff0c8a079a79e2 SHA512 ba898591c96b8d05601389837891f6cda7eece200c10e014e86e0189aeeb5a0d0c04327d348ce2d77fa3d72dbbe3eec5b96953ff6903bd9670f305886f869229
diff --git a/dev-libs/link-grammar/link-grammar-5.10.5.ebuild b/dev-libs/link-grammar/link-grammar-5.10.5.ebuild
new file mode 100644
index 000000000000..9cd72d301f29
--- /dev/null
+++ b/dev-libs/link-grammar/link-grammar-5.10.5.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-r1 out-of-source
+
+DESCRIPTION="A Syntactic English parser"
+HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
+SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="aspell +hunspell python" # pcre
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# XXX: sqlite is automagic
+# Does not build with >=sci-mathematics/minisat-2, bug #593662
+# add pcre support: pcre? ( dev-libs/libpcre )
+RDEPEND="
+	dev-db/sqlite:3
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )
+	python? ( ${PYTHON_DEPS} )
+	!sci-mathematics/minisat"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig:0
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lld.patch )
+
+pkg_setup() {
+	if use aspell && use hunspell; then
+		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
+		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
+		ewarn "you want aspell support."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+my_src_configure() {
+	local myconf=(
+		--disable-maintainer-mode
+		--disable-editline
+		# java is hopelessly broken, invokes maven at build time (bug #806157)
+		--disable-java-bindings
+		--disable-perl-bindings
+		--disable-static
+		--enable-sat-solver=bundled
+		$(use_enable aspell)
+		$(use_enable hunspell)
+		$(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
+		# $(use_enable pcre regex-tokenizer)
+		# $(use_with pcre)
+	)
+
+	econf \
+		--disable-python-bindings \
+		"${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf \
+				--enable-python-bindings \
+				"${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+my_src_compile() {
+	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+	default
+
+	if use python; then
+		python_compile() {
+			emake -C bindings/python \
+				VPATH="${S}:${MAIN_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
+		}
+		python_foreach_impl run_in_build_dir python_compile
+	fi
+}
+
+my_src_install() {
+	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+	default
+
+	if use python; then
+		python_install() {
+			emake -C bindings/python \
+				VPATH="${S}:${MAIN_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/linux-syscall-support/Manifest b/dev-libs/linux-syscall-support/Manifest
new file mode 100644
index 000000000000..6f9e5d6a2c39
--- /dev/null
+++ b/dev-libs/linux-syscall-support/Manifest
@@ -0,0 +1,4 @@
+AUX linux-syscall-support-2021.05.03-test.patch 217 BLAKE2B 5a3a358d29893798320bb28c229339df3c3bcd8efd6237f2a9be708cb13ac745af90d53facd7f11055e689915f0a596afd81dd5a79562e1d995251670e13d051 SHA512 931583cbb4d0ac9e2b8ee53f4f523e6ad7f6cba66a6dc2b81209d2c389e75611d3740e17e598b619d85919d289e46f55f1abd4638d7c72fd9399b4275600bc95
+DIST linux-syscall-support-2021.05.03.tar.gz 38423 BLAKE2B 06f78a3fb17150dc711564d981361d23ff4cdaa4629a35ba8b0e65a97eb9fd8dc5fe36f169e77b928bee64ce78107ff78f32f4ea6a0fc4850e2a0f77bb56254c SHA512 a321055e091264050483695fd2d6f6915606ee1ee641c3c95d8e0a7096692ebaeccee51ddf9312f63ca338ffaeb2b4b51e70b42e1867416629c6aba6e7a44665
+EBUILD linux-syscall-support-2021.05.03.ebuild 657 BLAKE2B 3182c8d6a4ed7f0e4a7cd8b028c642cd1fccbc6288cb058eaacadbf2b8b1a0f7f67cd39c5705589ddbcdadcf0099e96c52838df59fb5f8dd7ec581599fb64342 SHA512 008e9ef58ad795a2cd99eb7c57c28e77663b4ee40f81880d4c309bbd14fb349513820b717b93fb1474791cee900b951f76801bf9644650e8ebfb2d04068c6e0a
+MISC metadata.xml 340 BLAKE2B dc3c65cbbc055af1dc3b3f2a08a87d12a683ad835174d6a4291d60d6b5358dfbd44800285ce5725e1284d976791bb7a66b1a9030b00c401d82d14bc4562383d4 SHA512 4c2a5ae98134536fdcc1a0ac39692e06c2a530a69e20d2e424d8c6e3610b2e675479420d292beba71d2a8ab4b4022b904734a0208fec09c978ec3647f1b10e25
diff --git a/dev-libs/linux-syscall-support/files/linux-syscall-support-2021.05.03-test.patch b/dev-libs/linux-syscall-support/files/linux-syscall-support-2021.05.03-test.patch
new file mode 100644
index 000000000000..1090d06de363
--- /dev/null
+++ b/dev-libs/linux-syscall-support/files/linux-syscall-support-2021.05.03-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/Makefile	2022-06-02 15:18:22.086379688 +0200
++++ b/tests/Makefile	2022-06-02 15:18:39.975129783 +0200
+@@ -40,7 +40,6 @@
+ LDFLAGS += -static
+ 
+ TESTS = \
+-	fallocate \
+ 	getrandom \
+ 	lstat \
+ 	sigaction \
diff --git a/dev-libs/linux-syscall-support/linux-syscall-support-2021.05.03.ebuild b/dev-libs/linux-syscall-support/linux-syscall-support-2021.05.03.ebuild
new file mode 100644
index 000000000000..3b17f483ad04
--- /dev/null
+++ b/dev-libs/linux-syscall-support/linux-syscall-support-2021.05.03.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CommitId=242f0729ac827a50ac7338e45c9f373eb73e4ca9
+
+DESCRIPTION="Linux Syscall Support"
+HOMEPAGE="https://github.com/mikey/linux-syscall-support/"
+SRC_URI="https://github.com/mikey/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND=""
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
+
+src_prepare() {
+	default
+	mkdir lss || die
+	cp linux_syscall_support.h lss/ || die
+}
+
+src_test() {
+	emake -C tests
+}
+
+src_install() {
+	doheader -r lss
+}
diff --git a/dev-libs/linux-syscall-support/metadata.xml b/dev-libs/linux-syscall-support/metadata.xml
new file mode 100644
index 000000000000..95707aea74ee
--- /dev/null
+++ b/dev-libs/linux-syscall-support/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mikey/linux-syscall-support</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index 7ba6de960af1..b450437ca6c6 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -4,6 +4,8 @@ AUX 1.0-gcc43.patch 1166 BLAKE2B 2669ceaed022d24e5090a6b96e856ab9612c5818b216949
 AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2087f56ced626f4f3ddf47c000714b85ba558af1680ae3ab29f5aca8799185e25bed7a7c563d6950f1f3159e58f60eba8 SHA512 22abe490efd1a6b500265744abb2f58345fd9f6df881f1d932d7a95e6076397009c0bbd190eb803c0a4800035c0e435493164393674d19c611825235cb59fcc5
 AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe
 AUX log4cpp-1.1-glibc-2.31.patch 647 BLAKE2B 80d59c50d322531258f79a8a90385e1565ac0c5658071682dd13ee22b0fba22f1f4b799c4c08a59f07a57eeea2cafa7ffa76902951870854a1dafbf7805abdf2 SHA512 b27fe0c8218dd48c5b72ffc0ba0eb103c610b665777e643929b18b52e23ddf9f6e87bb4c9798f077aaedfcbe1d9ca44342499b15b4c209e5097e7b07269f0fcf
+AUX log4cpp-1.1.3-fix-version.patch 314 BLAKE2B 27dabdf67a2c3a53ff1f10b1c4b2b1796e144213b2ba545ffd800d21bcae22e8248cf53da73d951a3e712b45e2fcac97f4c5d131bf260ca9680699df8ba527ae SHA512 1ecba987f5295d507babff49f3d0d37d7e998ac2014ee430a981f7c64c35f1d10f2a3810bcfd7e8ca037a0fdadac61972ff93bf37cf6f543d7cedc6b836edb49
 DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
+EBUILD log4cpp-1.1.3-r1.ebuild 1499 BLAKE2B 9669f7c3ef7437c1cd14066db6b14c179609fee8fa12ba5e078380b3f8d8c14d8f84cd46cd1d8843d2734e36633af1278f75c87c37f7dfaa10c8a579c88e7f67 SHA512 aeb1cd193f5289cfb9745861732a91400e205af7fb8658c03441f56d4728c1fe631beb7652906c76aeb29667862071eeec9a8845095b678883fc59f502976726
 EBUILD log4cpp-1.1.3.ebuild 1264 BLAKE2B 914800599aeb18dd35d0c6b9246b7d69df9f742f85d444cfa887ede2f562a6f7c5abaa4daa20c635931963ddb66bce62f640bfb5533eda359f756d32e0c936c0 SHA512 0c4dc5a1a772d5f051ee4b7de5eac4afba20d24c4eadf7b75c6c0c8e322ebd9f58a0708ab35873c0f97d9979750a9c3792762895321575d6ba25a38ce3b038d2
 MISC metadata.xml 245 BLAKE2B fc64c325a442c85782c437edf7e7835b640d7d42d6161da3d4e803c0e81c7e1df99baa33c812e6da007a7286084aa97678109e21c72f684a4b7ab5903f1d281a SHA512 8ae4a6eeb33b2013ef7200430fbd5e9e24c72b8c1f02a7b36d7c62a122c5a10a184e4b86645f1e5ad3ee0b384fd786b2d7d063cdd1befb911f6d4bad7506862a
diff --git a/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-version.patch b/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-version.patch
new file mode 100644
index 000000000000..9676bacfc9dd
--- /dev/null
+++ b/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-version.patch
@@ -0,0 +1,9 @@
+https://src.fedoraproject.org/rpms/log4cpp/raw/rawhide/f/log4cpp-version-1.1.3.patch
+--- a/configure.in
++++ b/configure.in
+@@ -1,4 +1,4 @@
+-AC_INIT(log4cpp, 1.1)
++AC_INIT(log4cpp, 1.1.3)
+ 
+ # autoconf 2.50 or higher to rebuild aclocal.m4, because the
+ # AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro.
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..e84b5498cc10
--- /dev/null
+++ b/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
+HOMEPAGE="http://log4cpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~s390 ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/1.0-doc_install_path.patch
+	"${FILESDIR}"/1.0-gcc43.patch
+	"${FILESDIR}"/1.0-asneeded.patch
+	"${FILESDIR}"/${PN}-1.1-cmath-fix.patch
+	"${FILESDIR}"/${PN}-1.1-automake-1.13.patch
+	"${FILESDIR}"/${PN}-1.1-glibc-2.31.patch
+	"${FILESDIR}"/${PN}-1.1.3-fix-version.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/log4cpp-config
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Build tests conditionally
+	if ! use test; then
+		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Bashisms call configure tests to malfunction / config.h to be misgenerated
+	# which then causes a build failure later on in the package (w/ GCC 12,
+	# anyway).
+	CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf \
+		--without-idsa \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 8944f6b9ef19..ad23c8ca841e 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,8 +1,7 @@
-AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
+AUX marisa-0.2.6-loong_word_size.patch 565 BLAKE2B db3c245c896d265545a1b99202c60448b332384b3fd1edcc0c21fd517b3cb5e450ad8b6ed88308ac3c0c635ccf4e0abfdf4cb06dd4f76087ac38c54eea854f66 SHA512 16964170d1637c2ecb5fdd8cc93b890a72e80bde9991b5f52c979312bccc6b532416e1704047b8d8269698363c6622f825fbbc771844a7ece854af6c34dc6338
 AUX marisa-0.2.6-riscv_word_size.patch 486 BLAKE2B fef98bb16375bb482bfc5a219ecb61f9401e2bd560962f99e82c1725207c95a52c3ee9699d1fdc95bdfd972e15d6ca63e6c2e5c67938a385c592423205be8c08 SHA512 7da1120c5db4d8c902fd0bd16aa86f95cff09e8d81aa8d4140353eefbd2e3d7a100a9f38909193a5fd2333a652ce8b65198b0664792fe390790dd87883f6a7fa
-DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
+AUX marisa-0.2.6-sparc64_word_size.patch 783 BLAKE2B 339bbaecd8686e1af2f6bbcb9709020f2af0d13f9bef4fc49ffd2deb3096ab2ea556c0a32a8ae5b74555bf171c553a43c6bebb4ec05e9696d857c512525550d4 SHA512 d894d7a55cc9a617711a19c8be25a60eea9f808906be7f8ccca4d5cc970e9b5cb2b3e88fc111037e18f831e4c6a7b96c134eea5a2417edc89a402ef96e100689
 DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
-EBUILD marisa-0.2.5.ebuild 2234 BLAKE2B 02ba56d816fab0c09264a98d4648060075504507028ff7e16da14c56b3863b5b9df3805ef1181d7330bf0bab94e182374444440e4c5f59e4bbd755b9c2c63a5d SHA512 a86361ab9bfe31aae2130a1e72498ca2096294442a27b2da8c81e68ab4f9e9a1c32d972f1f2b259ac5c3f4b141a473a0802fd6c70c0742695d51f73b4245430c
-EBUILD marisa-0.2.6.ebuild 2871 BLAKE2B 122e2fdbee0555fef41df4f69d07b70806da84aa1eecd930e2c70e5bca88080882db67c1e2380368425c333ec5a7ce5d27488cc2771ce1d9d116d8d4e0b425ae SHA512 3fbef4416cd17626d1a77c0013012ad42cb1ad9f1ad92cba89a1d41bc5b177b78cf1bb4919c52d8d9ef083f9b8f85438794d125f453de84870153618eb123c4c
+EBUILD marisa-0.2.6.ebuild 2977 BLAKE2B fa21be068a686178008773bf7b86e366b129405588f841866d76354030b6ebf42724925eb9fd41a1dd86fe466e463be88fa787943129cd1ccce4c6ba18fdd07e SHA512 45840c1c0681830c3d020cc3db041acb406262c38999bf5f0b0612ec901637a8542196c1f828305fa3e43ac0acaa51c4227df24c5f24dd1f69eae062ab4000e1
 EBUILD marisa-9999.ebuild 2764 BLAKE2B d4c3df20f134dac32608de57e70c7a372cf21b6a153ae959eb764bbfe66880be164ea597b55a28d95a90d4e3f349c79c684c0340d01271549d5f8c75eee52e06 SHA512 71b497e8e551d5dee341a06c369fff566c7bdeb3cdd0fec282c7c2585be0e669575325374b00179f8a40267506675608c65810aaa7077025f209da438be20448
 MISC metadata.xml 466 BLAKE2B 52091b0a7fff43b807097f38ccc624057f7cc8becbbb8c4efd2a461d62fbf0bd1498497683ca3ed6b7730768d0fc94d461c983ab1deef8ac156ac3f1bd86c0e7 SHA512 b5914b5a81efb935857a7088421fe765d89a8101cd2a38568c8a9903957fa92482ec7882d4ce4e9555c467e14e2a1fca74b3966d71c541a42cbb0c2880331b12
diff --git a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch b/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch
deleted file mode 100644
index dba677221a19..000000000000
--- a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-https://github.com/s-yata/marisa-trie/commit/d93f1b67f3aaa2d56bf20089c0ce9ef216da6cb7
-
---- /configure.ac
-+++ /configure.ac
-@@ -13,6 +13,56 @@
- 
- AC_CONFIG_MACRO_DIR([m4])
- 
-+# Macros for SSE availability check.
-+AC_DEFUN([MARISA_ENABLE_SSE2],
-+          [AC_EGREP_CPP([yes], [
-+#ifdef __SSE2__
-+yes
-+#endif
-+          ], [enable_sse2="yes"], [enable_sse2="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE3],
-+          [AC_EGREP_CPP([yes], [
-+#ifdef __SSE3__
-+yes
-+#endif
-+          ], [enable_sse3="yes"], [enable_sse3="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSSE3],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSSE3__
-+yes
-+#endif
-+         ], [enable_ssse3="yes"], [enable_ssse3="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4_1],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSE4_1__
-+yes
-+#endif
-+         ], [enable_sse4_1="yes"], [enable_sse4_1="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4_2],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSE4_2__
-+yes
-+#endif
-+         ], [enable_sse4_2="yes"], [enable_sse4_2="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4],
-+         [AC_EGREP_CPP([yes], [
-+#if defined(__POPCNT__) && defined(__SSE4_2__)
-+yes
-+#endif
-+         ], [enable_sse4="yes"], [enable_sse4="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4A],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSE4A__
-+yes
-+#endif
-+         ], [enable_sse4a="yes"], [enable_sse4a="no"])])
-+AC_DEFUN([MARISA_ENABLE_POPCNT],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __POPCNT__
-+yes
-+#endif
-+         ], [enable_popcnt="yes"], [enable_popcnt="no"])])
-+
- # Checks for SSE availability.
- AC_MSG_CHECKING([whether to use SSE2])
- AC_ARG_ENABLE([sse2],
-@@ -20,9 +70,7 @@
-                               [use SSE2 [default=no]])],
-               [],
-               [enable_sse2="no"])
--AS_IF([test "x${enable_sse2}" != "xno"], [
--  enable_sse2="yes"
--])
-+AS_IF([test "x${enable_sse2}" != "xno"], [MARISA_ENABLE_SSE2])
- AC_MSG_RESULT([${enable_sse2}])
- 
- AC_MSG_CHECKING([whether to use SSE3])
-@@ -31,9 +79,7 @@
-                               [use SSE3 [default=no]])],
-               [],
-               [enable_sse3="no"])
--AS_IF([test "x${enable_sse3}" != "xno"], [
--  enable_sse3="yes"
--])
-+AS_IF([test "x${enable_sse3}" != "xno"], [MARISA_ENABLE_SSE3])
- AC_MSG_RESULT([${enable_sse3}])
- 
- AC_MSG_CHECKING([whether to use SSSE3])
-@@ -42,9 +88,7 @@
-                               [use SSSE3 [default=no]])],
-               [],
-               [enable_ssse3="no"])
--AS_IF([test "x${enable_ssse3}" != "xno"], [
--  enable_ssse3="yes"
--])
-+AS_IF([test "x${enable_ssse3}" != "xno"], [MARISA_ENABLE_SSSE3])
- AC_MSG_RESULT([${enable_ssse3}])
- 
- AC_MSG_CHECKING([whether to use SSE4.1])
-@@ -53,9 +97,7 @@
-                               [use SSE4.1 [default=no]])],
-               [],
-               [enable_sse4_1="no"])
--AS_IF([test "x${enable_sse4_1}" != "xno"], [
--  enable_sse4_1="yes"
--])
-+AS_IF([test "x${enable_sse4_1}" != "xno"], [MARISA_ENABLE_SSE4_1])
- AC_MSG_RESULT([${enable_sse4_1}])
- 
- AC_MSG_CHECKING([whether to use SSE4.2])
-@@ -64,9 +106,7 @@
-                               [use SSE4.2 [default=no]])],
-               [],
-               [enable_sse4_2="no"])
--AS_IF([test "x${enable_sse4_2}" != "xno"], [
--  enable_sse4_2="yes"
--])
-+AS_IF([test "x${enable_sse4_2}" != "xno"], [MARISA_ENABLE_SSE4_2])
- AC_MSG_RESULT([${enable_sse4_2}])
- 
- AC_MSG_CHECKING([whether to use SSE4])
-@@ -75,9 +115,7 @@
-                               [use SSE4 [default=no]])],
-               [],
-               [enable_sse4="no"])
--AS_IF([test "x${enable_sse4}" != "xno"], [
--  enable_sse4="yes"
--])
-+AS_IF([test "x${enable_sse4}" != "xno"], [MARISA_ENABLE_SSE4])
- AC_MSG_RESULT([${enable_sse4}])
- 
- AC_MSG_CHECKING([whether to use SSE4a])
-@@ -86,9 +124,7 @@
-                               [use SSE4a [default=no]])],
-               [],
-               [enable_sse4a="no"])
--AS_IF([test "x${enable_sse4a}" != "xno"], [
--  enable_sse4a="yes"
--])
-+AS_IF([test "x${enable_sse4a}" != "xno"], [MARISA_ENABLE_SSE4A])
- AC_MSG_RESULT([${enable_sse4a}])
- 
- AC_MSG_CHECKING([whether to use popcnt])
-@@ -97,9 +133,7 @@
-                               [use POPCNT [default=no]])],
-               [],
-               [enable_popcnt="no"])
--AS_IF([test "x${enable_popcnt}" != "xno"], [
--  enable_popcnt="yes"
--])
-+AS_IF([test "x${enable_popcnt}" != "xno"], [MARISA_ENABLE_POPCNT])
- AC_MSG_RESULT([${enable_popcnt}])
- 
- AS_IF([test "x${enable_popcnt}" != "xno"], [
-@@ -170,6 +204,7 @@
- AS_ECHO(["  LDFLAGS:   ${LDFLAGS}"])
- AS_ECHO(["  PREFIX:    ${prefix}"])
- AS_ECHO([])
-+AS_ECHO(["  NATIVE:    ${enable_native_code}"])
- AS_ECHO(["  SSE2:      ${enable_sse2}"])
- AS_ECHO(["  SSE3:      ${enable_sse3}"])
- AS_ECHO(["  SSSE3:     ${enable_ssse3}"])
diff --git a/dev-libs/marisa/files/marisa-0.2.6-loong_word_size.patch b/dev-libs/marisa/files/marisa-0.2.6-loong_word_size.patch
new file mode 100644
index 000000000000..2be85ba04ee4
--- /dev/null
+++ b/dev-libs/marisa/files/marisa-0.2.6-loong_word_size.patch
@@ -0,0 +1,12 @@
+--- a/include/marisa/base.h
++++ b/include/marisa/base.h
+@@ -31,7 +31,8 @@
+ #if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \
+     defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \
+     defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__) || \
+-    defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64))
++    defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64)) || \
++    defined(__loongarch64)
+  #define MARISA_WORD_SIZE 64
+ #else  // defined(_WIN64), etc.
+  #define MARISA_WORD_SIZE 32
diff --git a/dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch b/dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch
new file mode 100644
index 000000000000..ff789b1c9043
--- /dev/null
+++ b/dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch
@@ -0,0 +1,16 @@
+Originally reported in https://bugs.gentoo.org/show_bug.cgi?id=843422
+Upstream PR https://github.com/s-yata/marisa-trie/pull/46
+
+diff --git a/include/marisa/base.h b/include/marisa/base.h
+index bf4794e..95861b4 100644
+--- a/include/marisa/base.h
++++ b/include/marisa/base.h
+@@ -30,7 +30,7 @@ typedef uint64_t marisa_uint64;
+ 
+ #if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \
+     defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \
+-    defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__) || \
++    (defined(__sparc__) && defined(__LP64__)) || defined(__mips64__) || defined(__aarch64__) || \
+     defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64)) || \
+     defined(__loongarch64)
+  #define MARISA_WORD_SIZE 64
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
deleted file mode 100644
index af6c3b508d46..000000000000
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-DISTUTILS_OPTIONAL="1"
-
-inherit autotools distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/s-yata/marisa-trie"
-fi
-
-DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
-HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="|| ( BSD-2 LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="python? (
-		${PYTHON_DEPS}
-		dev-lang/swig
-	)"
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}"
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/marisa-trie-${PV}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${P}-cpu_features_check.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die
-
-	if use python; then
-		pushd bindings/python > /dev/null || die
-		distutils-r1_src_prepare
-		popd > /dev/null || die
-	fi
-}
-
-src_configure() {
-	local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
-
-	local options=(
-		# Preprocessor macros dependent on CPPFLAGS are checked.
-		--enable-sse2
-		--enable-sse3
-		--enable-ssse3
-		--enable-sse4.1
-		--enable-sse4.2
-		--enable-sse4
-		--enable-sse4a
-		--enable-popcnt
-		$(use_enable static-libs static)
-	)
-
-	econf "${options[@]}"
-
-	if use python; then
-		pushd bindings/python > /dev/null || die
-		distutils-r1_src_configure
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		emake -C bindings swig-python
-		pushd bindings/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -type f -delete || die
-
-	(
-		docinto html
-		dodoc docs/*
-	)
-
-	if use python; then
-		pushd bindings/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 2f47a949a3cf..7df3c25d5c77 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="|| ( BSD-2 LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -40,6 +40,8 @@ fi
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.2.6-riscv_word_size.patch"
+	"${FILESDIR}/${PN}-0.2.6-loong_word_size.patch"
+	"${FILESDIR}/${PN}-0.2.6-sparc64_word_size.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
index e49507501ada..7ef7e56be1c7 100644
--- a/dev-libs/metee/Manifest
+++ b/dev-libs/metee/Manifest
@@ -1,5 +1,3 @@
-DIST metee-3.1.2.tar.gz 70404 BLAKE2B 811b33dafd6d0f15c6860a97ba9ffb20969548e7fceb3bcc25f96e9eefd27576d076629c21ea7b9c83f934815a6c27229465818c64e2c0fb8996ab9fd6c36a18 SHA512 e1a741a4ebb0971356c00ad51c8b17d273fc3d6453ebe374766259bab855b721cd5223b214447df52f0991474f720010549d88000d47846619252e1c19f84347
 DIST metee-3.1.3.tar.gz 71887 BLAKE2B 9fa4f126abccea44b0a074d8bdb1e7e8d7f7bb4d3334cc77d6c00ef6d315577860fde3d11e81499824e79e01e373030cf4f8aa299864197dbde7b14c7c80fe08 SHA512 65f12ff244e66dbc84925be5871e507af9284f47c100fcf4a458882f2e65a0128ac33783c0144f9dfea96a5d87641a1059885855d565ca0e5623ec27718c9d5b
-EBUILD metee-3.1.2.ebuild 617 BLAKE2B 94d8f50230611a53c17fca2a037773c3d53d4e86f8c720d58e195fee891ba252f249c1a96c01c723691f2bdbb97e513f2943be06211a9c792d931a4ea5a6deb8 SHA512 b059a3d8f2bbc90174e5704e7ae0cd6e0809156e4f3148765fb1237e53f94082f36395a3aaa27ae8b07ffd91e8c5ea0efda16f610b9118e314acc24d8a4adb40
-EBUILD metee-3.1.3.ebuild 624 BLAKE2B 9445caa4e39a921712f9fd20c96ed85722dc9c6ee6ee26d32cf6322e94b4104227af9668c5a0adf3a7f8c799d79c70a6c3bf9571898436b9f9c8d4f7944c49a0 SHA512 a5b01448ede15cbbb78f1292d363f24ec8987787d79c43246defb465b6521ef34a944f6093f476cfb89150098eb21939e145abf7b2c5597d22e8f123f2033d76
+EBUILD metee-3.1.3.ebuild 772 BLAKE2B 35d47ae5bfe82857b269235db049a6bcf8f96fc22567cc9eadbf0dbddc68c990f9a412f9b986034a7c5158c155c01aa3c3768821e11a563d8b65e6dc1fe72e18 SHA512 04d26018484e7c2b8a8978e1a393bc902bbd00167c7b608e6d1e5621315940ecc9eb2338097e151a47f04f9b61c60d58e37767affdcb3dba3d4da7cac1930f94
 MISC metadata.xml 576 BLAKE2B 9e2b068fa33c961eabea553ea1f9fe539f1429467ea52baefbc7cff84bcd3bc802ba5024ed71ae96ef9e810636aaeb1d711f9bd294215bf6cab5e122eda03d7d SHA512 c529229f880fd0f02881265c26a2e7e2841ec02b719a67887423a874253a9414f68614399dbb0cd433b7e9fe5b7ba6785c8fb789795f3b1a8f6c8597949aede1
diff --git a/dev-libs/metee/metee-3.1.2.ebuild b/dev-libs/metee/metee-3.1.2.ebuild
deleted file mode 100644
index 56bfb574467d..000000000000
--- a/dev-libs/metee/metee-3.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
-HOMEPAGE="https://github.com/intel/metee"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS="$(usex doc)"
-		-DBUILD_SAMPLES="NO"
-		-DBUILD_SHARED_LIBS="YES"
-		-DBUILD_TEST="NO"
-		-DCONSOLE_OUTPUT="NO"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/metee/metee-3.1.3.ebuild b/dev-libs/metee/metee-3.1.3.ebuild
index 1c3e7da0adaf..21d55479196f 100644
--- a/dev-libs/metee/metee-3.1.3.ebuild
+++ b/dev-libs/metee/metee-3.1.3.ebuild
@@ -11,11 +11,19 @@ SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0/3.1.3"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
+src_prepare() {
+	default
+	cmake_src_prepare
+
+	# Respect users CFLAGS
+	sed -e 's/-D_FORTIFY_SOURCE=2 -O2//' -e 's/-Werror//' -i linux.cmake || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS="$(usex doc)"
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index 2da8a9b847b3..c2bcb61975fe 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,5 +1,5 @@
 DIST mimalloc-2.0.5.tar.gz 1125567 BLAKE2B 9148ba4af7620eec36e1dde0f6fd2d1e3e9937bd2286ac790a727052402c3286b55387236de3a77e4405983c080bb7acae8deb3334cf9103fcf3f90250080204 SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d
 DIST mimalloc-2.0.6.tar.gz 1127052 BLAKE2B bd8a38cc0eab6ad950a63f494f24e6a91c50d2104335e9ce70963a7baadd26c7a2b7440b2fcabe502d9961549222873d017cb525bf5b32da967cf51aa167603c SHA512 f2fc0fbfb6384e85959897f129e5d5d9acc51bda536d5cabcd7d4177dbda9fb735b8a8c239b961f8bea31d37c9ae10f66da23aa91d497f95393253d4ac792bb3
 EBUILD mimalloc-2.0.5-r2.ebuild 691 BLAKE2B 623b98c9393d1ad2c377e95908f962f221f884448cde7a92c139abc98443a3e3d1bccf00e1d9cdb6ca3f94ce9721a60cffe6ebc7355ab2b0e2ba299a48cc2160 SHA512 35824f644c31590359072a350ca33daf11566b33b40d26ff76986ed5860a8fa5762b9018753c8630662d0e6abed4844574c672f9b6b4d9d046e20d2c59837635
-EBUILD mimalloc-2.0.6.ebuild 692 BLAKE2B 8f4983f6b998772290def656f53e5fa8be762ff8d4ee167112ef383bb4fcd42a9d5fe7548dfe7679314ae46953a9bf52a93877504be5fa052c9195aab8cdc89a SHA512 df7f7822fdc3244d78fe13f2ed0db3df9c443af5e19610585dff4642e4fcf86149d989c0042e60311a5dd25186b2ed4d2921845d1e4e6375960414926c34cb96
+EBUILD mimalloc-2.0.6.ebuild 698 BLAKE2B 3eb6400c93be33c1f752156d6e851ae072fcf9029b0d56709e793b84a65d8543c8a6ec729887f10b1d3d0b2982e2a7c789c3279962161725c01c474e91dac547 SHA512 4b6fa39b2283504cf306463614b3d6700ec0170b4c02317911056133c2cef9a7e106c1a874f86d555f0aaeadb01755e0961c905bc3510ad5172dce94c0e33b4d
 MISC metadata.xml 431 BLAKE2B 6b4122d0fc6609b5ee6d4fd345727301fdf1bf0943507240002d4a574aeb84622a1be6af2f095d231c9d3da303de39485234b7136a91a2d819a5434859eeea35 SHA512 9506d3cd5946abbad9a051e8cda535d361040d015e57b3b0f73a7a144e63d88e972aa427d52373ddc96b60868ee5d21e0f74b6001332343f2f57971ee27e5ab4
diff --git a/dev-libs/mimalloc/mimalloc-2.0.6.ebuild b/dev-libs/mimalloc/mimalloc-2.0.6.ebuild
index 2edb208e732f..ecd6cb33f405 100644
--- a/dev-libs/mimalloc/mimalloc-2.0.6.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.0.6.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 ~x86"
+KEYWORDS="amd64 ~loong ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest
index bdcd9ebc5d70..ed0487b081d8 100644
--- a/dev-libs/miniz/Manifest
+++ b/dev-libs/miniz/Manifest
@@ -1,9 +1,11 @@
 AUX Config.cmake.in 65 BLAKE2B 520fd3e379b53671d4bb9cb62567ec0f569c711d18019b428914967c57189b5e5f55aa589d0469f1c2891a68f285626e88395c2fef04f677bdf4a26633651526 SHA512 040e97901dea4890625a5bf80db145af432dcb0aa6159ac35e496b027ab3d35132392f45e734ab74002505148c7f879efc72595c6cce99469b8526786af3e7de
 AUX miniz-2.1.0-export-cmake-build-targets.patch 6510 BLAKE2B 1622c34af849f7b8818463759f205f71e7b64ba52ecc4cb8a552c457577c95cdea5beb94d5f6ffc986960e5a071b00adb54eda7cd1b34a5aeb692f359d989a2f SHA512 b36377b8d19a8b1d8099e0645d90e9f5778a4947de9da0d0bf04eb344a2ab24a1f84e8410115159e59bdb5569268761944409caecb6bb860aff5f42a57b3d9b1
+AUX miniz-2.2.0-fixincdir.patch 641 BLAKE2B e98354c7898ecff64ee65bdf42229f29315a59e5e10403104fceaf484bee6ede44ed265e50b767bc80ba622140a15ecf8467e1ca43ed7d74f2fa0d0285f5a6de SHA512 17a0f183aa7257e1eb5a8ba044e3e37f7a5903489883c4655b7976996aa85cde9c7d4c25c1487db3fa30cefe0c5adc72641f21185e9eded2d9890a086c485d05
+AUX miniz-2.2.0-fixpcpath.patch 768 BLAKE2B 63f3b6be8be1266b6f3e2db16c0ed42ffefec7b6575a107745775bc1f7c47c463febd6e58e331962b7b2a8aea52379fee1bb6de9fa3921ae470760eb4f0ec9e7 SHA512 049e384397075954a6f581bc8d888e0130a02fda864a79d60f199c77c3305ea5d4bdcd41779985f273fda583e2e9009137eee6133b962041b85b1b08a1d9509c
 AUX miniz.pc.in 315 BLAKE2B d05cd14a7acb4039e5f0521a68e6e5eeed00849a5b5d639fbbd4de45c1e0eab8ed33a22cc608761ab1dd1e1142021b8e5bfbf8e9bab589bfb2545701828f5f7b SHA512 8c1828759a45c58a96bebaac9fa5196d95be85a76be8d4fdd30eb2b4db5dbe582a7e0156fc9a4249c84426bbe69b30d31b2faf162c8d619810012afe6e1ad0ed
 DIST miniz-2.1.0.tar.gz 104502 BLAKE2B 9a7b3818b454809cdfec523d98f13bef3a52e27b6d3857d289438978d12997e38c71aa97fffe060a6b765f8fbbdd8fe8cebced4a45d9f1f040dd3e39cf2a8055 SHA512 e0aba16afdf230d1e54d0a9cedd336b0b158b02744839f0547e14ee47a97fc1a6668f3a181bd46e969b01b158af18dc8ed3c0a4210b3b620242338a2788806b3
 DIST miniz-2.2.0.tar.gz 113592 BLAKE2B 110a71712396fb22075818f681d2e691b8b361e6c8eb786485f9fd3a1e00fcfc95bae4d470b8b1644a1e9674e69617abdba70e337f318969096db222f7a4c3d2 SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111
 EBUILD miniz-2.1.0-r3.ebuild 716 BLAKE2B dbd066b16a5cf7288a9af6b554bc44e0bb10b9259407627f5ecac365dd6ec95047f19386d28a270dda3bcf72e39d7a3af314e17242c79efb712f29491e58e625 SHA512 2956345154f2408dd60cbe472c58605f5f94cc4cea5367ba610af8c2cca78f9df51545483fd8b5fd50533ff97fc48e5a0236127a00c1aee28c7e909f497619b6
+EBUILD miniz-2.2.0-r1.ebuild 617 BLAKE2B 0fe7d970b2b9d495b14704c3d4c11b5d1788e1ee2a0d310f5a89aa8cafda895078afb27e1576a5d888109e27068d8115e9ad4a7c49321826feb5ea32003dfcef SHA512 7fd6662da0168558e7c9b17abd87f271ec6c04b1fcc6c93178924edadf9cef0bb614753e098b983606dc6592100aa61feac5df04a59294c4f772c4ea2a305a7a
 EBUILD miniz-2.2.0.ebuild 411 BLAKE2B 73164596838b7072b0d6cf1058630981f4930290af9ffc4434058cc8512625021377373be724ef993421b9f5d24d5df4dfc2113a986ebd07302399cd360c910d SHA512 67af664ce10ff44a4b7e01799b94c3468e4493905494f0c3ec0b919ab60752c9c2c8572edb2c2ca827bf71e40da1b52583cf3a053891443a00c6410a28e06c9c
-EBUILD miniz-9999.ebuild 868 BLAKE2B 4c35c1ff7de11247e71860fbe61c973b77d456db29a87cf01b3e34a83df0d61b3a2b3d0f5a938081cf1f6f578a97a1489e292ee50b46d1e0ece1bc049b70b7b6 SHA512 9cfb04128eaa89af0a0d005ca8aa03a410addb3953d6522be5c480bbb93e765c1c2b6dbc145c91d57fc9931d7267bca47eb34e711561f4bc2ca7835cf98647bb
 MISC metadata.xml 1119 BLAKE2B 1524ab132d535eadc17d6897113e61c1f4fe85a693a2f1c7241293e11d7751cb1aa708b227a3afe5c269e6e6cc5d9d4981ef8394cacca00f30b1442a738d90f2 SHA512 8704444d82aa2b7a091b06e6ccf872c477ad9515e860c41f939d628b5b0a7742b8343a50c6e4be202acd9c8cbc98450e7a90ce951a625282dae0beb54420e278
diff --git a/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch b/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch
new file mode 100644
index 000000000000..e0379baf49e3
--- /dev/null
+++ b/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch
@@ -0,0 +1,18 @@
+From 37ea28133d9abea3926248c9517676be9b558ca7 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Sat, 4 Jun 2022 09:31:06 +0100
+Subject: [PATCH 2/2] build: Set pkgconfig includedir to miniz directory
+
+Allows users to include <miniz.h> instead of <miniz/miniz.h> which
+seems to be the intended behaviour.
+--- a/miniz.pc.in
++++ b/miniz.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/miniz
+ 
+ Name: @PROJECT_NAME@
+ Description: @PROJECT_DESCRIPTION@
diff --git a/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch b/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch
new file mode 100644
index 000000000000..37f8c7737819
--- /dev/null
+++ b/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch
@@ -0,0 +1,22 @@
+From 9cd715b3b1f5accc2e7cd0b167808c1a47a08938 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Sat, 4 Jun 2022 09:22:37 +0100
+Subject: [PATCH 1/2] build: Install .pc file in correct directory
+
+/usr/share/pkgconfig should be used for architecture independent
+libraries (e.g. data or scripts), while an architecture dependent
+directory like /usr/lib64/pkgconfig should be used for native
+binaries.
+
+Co-authored-by: Sam James <sam@gentoo.org>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -173,7 +173,7 @@ if(NOT BUILD_HEADER_ONLY)
+   if(INSTALL_PROJECT)
+     install(FILES
+       ${CMAKE_CURRENT_BINARY_DIR}/miniz.pc
+-      DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
++      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+   endif()
+ endif()
+ 
diff --git a/dev-libs/miniz/miniz-2.2.0-r1.ebuild b/dev-libs/miniz/miniz-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..8c58554647c4
--- /dev/null
+++ b/dev-libs/miniz/miniz-2.2.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A lossless, high performance data compression library"
+HOMEPAGE="https://github.com/richgel999/miniz"
+SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+	# https://bugs.gentoo.org/849578
+	# https://github.com/richgel999/miniz/pull/239
+	"${FILESDIR}"/${PN}-2.2.0-fixpcpath.patch
+	"${FILESDIR}"/${PN}-2.2.0-fixincdir.patch
+)
+
+DOCS=( ChangeLog.md readme.md )
diff --git a/dev-libs/miniz/miniz-9999.ebuild b/dev-libs/miniz/miniz-9999.ebuild
deleted file mode 100644
index 7bdf95f3cf88..000000000000
--- a/dev-libs/miniz/miniz-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A lossless, high performance data compression library"
-HOMEPAGE="https://github.com/richgel999/miniz"
-SRC_URI=""
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/richgel999/miniz.git"
-else
-	SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples static-libs"
-
-DOCS=( ChangeLog.md LICENSE readme.md )
-
-src_prepare() {
-	sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 3c560093d941..b0baaf7f7537 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,5 +1,5 @@
 AUX mongo-c-driver-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 AUX mongo-c-driver-1.16.2-enable-tests.patch 1167 BLAKE2B 750a692000dcb2abfc38d477dfa5df091ade3ffdf6c72f7a71e0c2da17c8ec875fefa6f049a7f57cfafdcebd7fe044fb6d68582b33845debd877de4760b86e57 SHA512 fb44a8f33f7905dfa71cc5bc0a9198872f008b499af3102f289fe46b57504abbf3eb4ec337d916dac1bd0284e3e955c4a7e75db1256e5b32e628443ffc447f29
 DIST mongo-c-driver-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
-EBUILD mongo-c-driver-1.18.0.ebuild 2341 BLAKE2B 537adbf29e7d00b6e154c25ac7e3c0d75af9cd86934fbb8e17a4b8295e7196f35cca962b255161873e15054e92a1053186f90d5dfdd310d269ae48e18ee2266f SHA512 d51d71f81031be8e0cb89e079e2cd4bad04025996e655305f2bfe05d73e6b1ec92d1c56c49489b82029dcf74f4c4c0c073972792bdf8237feb6f2d19fe85d249
+EBUILD mongo-c-driver-1.18.0.ebuild 2348 BLAKE2B 2086df490db87af053a5d2e32691d5b87330538915646d3ebbcad177324f3afd1a40bc9f2883f8c5f404ce58b0eac749e613f276a4b20bd441c261f247fdef88 SHA512 c6ef3a4cc013078b7baef6dce9217a47a02c1d1cd1cdf969851efdedc48b27a4d350d252ce06600246ca1b43f7bb75d5d015f27a1f99bce10e9fa546fd2cd14b
 MISC metadata.xml 335 BLAKE2B d7b8f44f6698d86dbad1ae9fc535f6c75acb827b07d32af1ba02c94da5196f00f1c3c2d2f519ca388d586867c6b033a3c53d3e3f5856ba32efed730c34316642 SHA512 7c0bf1f1f5065e82ebb03a00b68d41888fbdf4b92c67b116e46016490fbc74c5a44ca8f8245217a7926e85f5d53bc3bcab7499d5ceaf4d4593ab9953e36fc2a1
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
index 0f8eff88589a..2969c22a9765 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~riscv x86"
 IUSE="debug examples icu sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index 841b2d047895..489ccdbf5876 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1,6 +1,4 @@
 AUX ncnn-fix-glslang-include.patch 281 BLAKE2B ae6293b2c16ee870d65cde7398cfe615ba3cbfa682edd5da0e92072d80f37f46f0fdc84648bb3757a266e1406d3289025344cff462ae2c3d84e232460db40759 SHA512 7e424a89b3d2a8b9cd4630e2ea8fd789569bef9bfcbea39c11fecf2cb0d9ece9639bd01e88735715d28fe7d92aa5eee9231d59cade55829f8d4af7e33a4f4adf
-DIST ncnn-20210525.tar.gz 11578821 BLAKE2B 1b6dc67cb89e4761c6de256c8854c3969c553159c11713d9bbbe04abd027e9439ffb694e8129da4d965807d1ec326d643c71c00ee1f032dbf4c2271c2699ceb2 SHA512 5d919b6830f5a75c751d64476f5bf2b9b71ced1cee29e4156c4f01a9d7d8833dfdf8420747c55979c5b39b29fd63b5bf4bc3d27b756a617ef39f4e2ce4da2f93
 DIST ncnn-20220420.tar.gz 12158916 BLAKE2B fcecf395e54ff683bb8301365d805b99439b3797493e419fa8c99a325ebd1dfd80e65b08cffd9283fe453010a0cdde221aeeffa37e154335d2f6d7f6c6b9b138 SHA512 7c567bcd75cf36be7fbb16dba7f978ae965478afed8948e9e1c6f8c681ea678f769e64fae337a5c1d0bc1549bf922c1761b51a7822153a1eb4d267ef8adf1ecd
-EBUILD ncnn-20210525-r1.ebuild 1868 BLAKE2B c384cbc3973e3a4f616a0c1b51fd6313ee0727cb0c1884eb55e8562ec3524059bafbb4cf6b066f8e654df2dac96b3c888cc41fc1e19aa97665262c02dad1345f SHA512 c12bd754d1f3f0cdb4367190c498af52e4dd359f96c0d98405fb29dadee6e7544cf2ae96117628a49b8dcc465453d8f9009afe4d2aeb25c4bdbb985d0c11ec66
 EBUILD ncnn-20220420.ebuild 1683 BLAKE2B c642f997a2dacfe882a15e299947a4728959e6165fa1fa446f043c70cc80201ca760a9be7ec21ed8c35439b87eab3dc7a0d930ffbec24c8f06940ade84708551 SHA512 ce3330ae73163f1cb5479b8ae7ee38a5e0ac3381e9127ce2442fe43eea565be46779cee315c159815c202531b827dfc6b59116375fec0c0c10c2db787525d714
 MISC metadata.xml 602 BLAKE2B 09d7cf6d8eb19d516ac8f53f220808b16610320d8307cb19e34db48160d7e7a300fa3d773b8082a6a35972aad3e4831386b4f68cd754883d377fd4e1b2273d78 SHA512 b85b8572b6f5cdf569ea2137336026c071897f0d9c19fe8b44fb0745c5ca79dead6e2092d7b71a3bcf804eda20dfcfc78f79ee4e5c22eb58e565fb959085f4a6
diff --git a/dev-libs/ncnn/ncnn-20210525-r1.ebuild b/dev-libs/ncnn/ncnn-20210525-r1.ebuild
deleted file mode 100644
index a6aa54a5132f..000000000000
--- a/dev-libs/ncnn/ncnn-20210525-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="High-performance neural network inference framework"
-HOMEPAGE="https://github.com/Tencent/ncnn"
-SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds
-KEYWORDS="~amd64 ~x86"
-IUSE="tools +vulkan"
-
-# Need the static library to run tests:
-# -DNCNN_BUILD_TESTS=ON, -DNCNN_SHARED_LIB=OFF, USE=-vulkan (skip GPU)
-RESTRICT="test"
-
-RDEPEND="
-	dev-util/glslang
-	tools? ( dev-libs/protobuf:= )
-	vulkan? ( media-libs/vulkan-loader )"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-glslang-include.patch
-)
-DOCS=( README.md docs/. )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i "/DESTINATION/s| lib| $(get_libdir)|" src/CMakeLists.txt || die
-
-	# Workaround build issues on AVX without AVX2 (bug #730468)
-	# This can be removed if CXXFLAGS="-mavx -mno-avx2" builds after a bump.
-	find src -type f -exec sed -i s/__AVX__/__AVX2__/g {} + || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # for tools
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-		-DNCNN_BUILD_EXAMPLES=OFF
-		-DNCNN_BUILD_TOOLS=$(usex tools)
-		-DNCNN_PYTHON=OFF # missing portalocker, and nothing needs this for now
-		-DNCNN_SHARED_LIB=ON
-		-DNCNN_SYSTEM_GLSLANG=ON
-		-DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d (build date)
-		-DNCNN_VULKAN=$(usex vulkan)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use tools; then
-		local tools=(
-			caffe/caffe2ncnn
-			darknet/darknet2ncnn
-			mxnet/mxnet2ncnn
-			ncnn2mem
-			ncnnmerge
-			ncnnoptimize
-			onnx/onnx2ncnn
-			quantize/{ncnn2int8,ncnn2table}
-		)
-		dobin "${tools[@]/#/${BUILD_DIR}/tools/}"
-	fi
-}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index bfee594d9fcd..a6789caa263d 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,3 +1,6 @@
 DIST nettle-3.7.3.tar.gz 2383985 BLAKE2B 8d8efbbff98fc1f3eff3296681d3d72346e78392f356aebfe80138ae6ae1ebf3695bd7f74b906beef0cf3625ba6d84bdb43c0f6707f54f4d98870d50c90ac9a3 SHA512 9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437
+DIST nettle-3.8.tar.gz 2404258 BLAKE2B 4e74104d04ccce2d0a531b703e4d4c2e8da24d5b7ac4d769d1bc5011fb5fbe8a016a6de84e0af9804c8b259b163fb77729181d64b81b3af4e8a0c2037e52087c SHA512 af3a910bd661ed9691b1bd66b0f8147aaebdc92ae6ab47640675df263409ecb8d25f0403fcc7dc6471264b9df0a47c025244404f0691ef58c133762f64b67610
+DIST nettle-3.8.tar.gz.sig 374 BLAKE2B 8fd841116bf99a1d7535359ee56972ddda33c9551c1327bf30ec1a6842104d3429a8fdab7a044c0d32c7689f28abdf75f46b9bec3daf78f58167c3e0a5b91da9 SHA512 cbcfb6088a88cbbc573fe477f73db750f3379a4778e4ddf1158768c5d09b12ea0ff65f4f6552f3cb3d18c851199870827f76836bcc8df61ffc35ef67bf98f3b3
 EBUILD nettle-3.7.3.ebuild 1843 BLAKE2B 8cfebc0a207c45179d76614e20099f47f45bee0c9578d8516c14127ad24b47f73985277540638a1cb1fa447c85587928ca0cf142146eef67d611b925ffdbed52 SHA512 ea1906c52d027e64c37a173761542d5cf65d4eed6c1c9126627235d6138203536f4e68188043f96f7ba9303c05e42e1aa8514d8db2a026784e2b6584d6861e46
+EBUILD nettle-3.8.ebuild 2610 BLAKE2B 812a0ccfe3f91a1ef8417724540c4b42f438cc1cd3ddccff3c415ab0d06a914b5177e5b04dc7cbc8c42a7eed0c1032ff3d44f485f2e3dc796736400cadd14de4 SHA512 25dce3a8de08bb9159dc0d0a0354afd9e229ef21f0451828194e3df127135ed5f2379094699e12289703927a8207ea17dfb805b7a1d40e44578e26c2f05ad6e2
 MISC metadata.xml 461 BLAKE2B 889d1a948d2d5406c6995c4be856530d296896031dfaa6a1e910d9ce60a892514f82907208c385c21b5cb4451c19b73145d7e32f46f92487713661def0b829b4 SHA512 76db4561bc4547b0d5a3244bb3fb0c55887d1b4263e75d41ae9ced4577a90fd6be0a6109c201c90a64ba6a7173b33559874dabac6beb066a02923d572d6f1df7
diff --git a/dev-libs/nettle/nettle-3.8.ebuild b/dev-libs/nettle/nettle-3.8.ebuild
new file mode 100644
index 000000000000..b5d3adf935d1
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.8.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nettle.asc
+inherit multilib-build multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+# Subslot = libnettle - libhogweed soname version
+SLOT="0/8-6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
+# The arm64 crypto option controls AES, SHA1, and SHA2 usage.
+REQUIRED_USE="cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )"
+
+DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( sys-apps/texinfo )
+	verify-sig? ( sec-keys/openpgp-keys-nettle )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/nettle/version.h
+)
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	default
+
+	# I do not see in config.sub reference to sunldsolaris.
+	# if someone complains readd
+	# -e 's/solaris\*)/sunldsolaris*)/' \
+	sed -e '/CFLAGS=/s: -ggdb3::' \
+		-i configure.ac configure || die
+
+	if use doc ; then
+		DOCS+=( nettle.pdf )
+		HTML_DOCS+=( nettle.html )
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+		$(tc-is-static-only && echo --disable-shared)
+
+		# Intrinsics
+		$(use_enable cpu_flags_arm_neon arm-neon)
+		$(use_enable cpu_flags_arm_aes arm64-crypto)
+		$(use_enable cpu_flags_ppc_altivec power-altivec)
+		$(use_enable cpu_flags_x86_aes x86-aesni)
+		$(use_enable cpu_flags_x86_sha x86-sha-ni)
+		$(use_enable cpu_flags_x86_pclmul x86-pclmul)
+		# TODO: PPC crypto flag?
+		--disable-power-crypto-ext
+		# TODO: cpu_flags_s390?
+		--disable-s390x-vf
+		--disable-s390x-msa
+
+		$(use_enable asm assembler)
+		$(use_enable doc documentation)
+		$(use_enable gmp public-key)
+		$(use_enable static-libs static)
+		--disable-fat
+
+		# openssl is just used for benchmarks (bug #427526)
+		--disable-openssl
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index cff7f4a93614..837839ac3e51 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -7,5 +7,5 @@ AUX newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch 1221 BLAKE2B 410dfe51
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
 DIST newt-0.52.21_p20210816.tar.gz 128555 BLAKE2B 97c791d7301b657bec68045f2cd9bbe16eef0b099a6304e2336414837b36492bd794be04d0bbcd9eadc6fcd000ba2563a5ab90be5d61249390a6ea5435091f97 SHA512 06c1d5634d88a6126de5eddd1c4d436639a4d739b100f391638b0429a3941eabcaa0ff7398f498d735ec0af5e88deb14178110ab11bf5301ef661f7953692bc4
 EBUILD newt-0.52.21-r1.ebuild 2229 BLAKE2B 974b87429d91ba6d6a9565e13e5c1d569c02d244638ec99e4dc2a620098687942596b54deb9a4662e4c9f8ad16f7feae38faad0e6b9ba48ce7df1892fedc235f SHA512 4d5baa9a7179d6853b19cb6a8157a32105a697079985d39cc244efa0278270399dc3f511bea2ff250eb6b3bd4997d3ebf095dc3a2a245f51fae731e39fb5a533
-EBUILD newt-0.52.21_p20210816.ebuild 2355 BLAKE2B ad17ffd65342b3010a345ac27902a1811c5203af2bc5df46c6319f9a55f803d69ca663971d815c03152b26b4c5ac46216d6c74c929661477e5a0a232d50df3f4 SHA512 71e39517de0ec1095739aa6a4bd0ee049e565fb6eb253c0d4066e9a62950850cff203f593150b466604d2f0062de816c02ea5beb4f930c100f03f697399b2673
+EBUILD newt-0.52.21_p20210816.ebuild 2362 BLAKE2B eb9ffd99f263976b40cb62d9bd8188adcb51b9bcb199019beebc7416091093f5e57f9d58cdae275d9df60e69aa74729656b3ef751abcf1507a7fc7bbae2f245c SHA512 8d206ebe5a472f406f05b573fb2814d4a9e8c69c718247bc3e8b1f58db5c666dd217e16258992a97ab9538f08da2a6890798914d6ddd5d54fc1cf4034c860966
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/newt/newt-0.52.21_p20210816.ebuild b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
index 12d82f3d200c..d6c71471e388 100644
--- a/dev-libs/newt/newt-0.52.21_p20210816.ebuild
+++ b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mlichvar/newt/archive/${COMMIT}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="gpm nls tcl"
 RESTRICT="test"
 
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index cb05bccfe270..95a8f4fcedc0 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,3 +1,3 @@
 DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2
-EBUILD npth-1.6-r1.ebuild 708 BLAKE2B 1f851d12a7be444bf55447bc3f1a0a7598fc9449e43bf2149985b3e08412e3a5c0e9c003d71754d1798a9a22d500cc9217e1580b694e1ee7674a89e6c4f97185 SHA512 793a99e95b5595feee57461079500d34c903ca8a3a5268000070007419785c20666094016c27a69b1933598af1f954d30180abd3ff4e861f3c1fc4c3a4bd217d
+EBUILD npth-1.6-r1.ebuild 780 BLAKE2B 71a78816a5a6ca2f8c02377f4a31cb0badfe7dc1306beb31fdba151bb77770b810de7c61eac14cf49f5652a7ea92899f6a0be32dcf324e11fd6f3d8f832447fb SHA512 2fb1b035d9666e10d50ba33b421041ec4e5a0d2279a31fecc1a253c15355978862e752af21fb80c0c70beed092d5276df968c9cb3308fa2ca47ff3c8bae0fbb0
 MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 81b168a55477..bb3c8b84c723 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -12,6 +12,8 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 src_prepare() {
 	default
@@ -19,7 +21,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-static
+	econf \
+		--disable-static \
+		$(use_enable test tests)
 }
 
 src_install() {
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index dd875b3e5876..909363057611 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,10 +1,13 @@
 AUX nspr-4.10.6-solaris.patch 973 BLAKE2B 8370bedb05c718d7b73d57b5ac5c720ca62499d6d7b7a039da608a9c514996c2d987ba0135b7dcac509d1b9363908f0c0cff6fe47e1f7ca94b7efbd8c19aeeca SHA512 d4e4c44d02be7aafe09e633f2ee747c323036f7438cb87864d91bcd9bb8ac072065353aa4e8a785e38724d33bfdc8adb0e460dbf44ff7fbd8c8dd32b569074f1
 AUX nspr-4.21-ipv6-musl-support.patch 1645 BLAKE2B 0b383804d5e66037041b91dcb7ddd52dd4533384ca5671ed1d36a71740b130863dd2b531867edab804fbb8cfab112282e17d607d7e298eb249ead620f99a55be SHA512 f241e607491d1192272221023d5f3e84b3e88957e7b66ce4d9ba1bcf2ab6639facc08eeb838a0e6753456f41dde4ced4fe99f923e0889030d844c23c62fad4e2
 AUX nspr-4.23-prtime.patch 814 BLAKE2B 2106a841b34445310cef07e15cb77ae4c9465cca9a7dc68acd68408a66383c90bee1fafeaaa144e1b8344d1edae27407714f193a452ffc3d425212e3b2c40fc5 SHA512 9f51a03852f0b3d4352c14ee849ec8af9b3dbef68eaa2755cb5a630018f91e3a2a4fce5742078b8be51e76995218a0cfc7ef8b0c013e8c47f746a61185795eae
+AUX nspr-4.33-loong.patch 2717 BLAKE2B eb0fd910a0177d14070d06946cd7ee0aa6d7d7fc2885b6b61f57789e3436ce6eb09eca542c6828bc36c980d3c6d469c303ad018d10a12d74d3915b76980019d6 SHA512 bbbfd96c48257c9ab19b5d282ef9e5b9013f185b46b2e03690a650985f391386162dc41f8b3b0dba0a383b53427f093d2b6b8b8ba387f42090d7bafa32fb78c2
 AUX nspr-4.7.1-solaris.patch 411 BLAKE2B 0c1f0e621aec9e150bd8c279f46c18256c451b2555b9f264f0da7432fb0e7d5d69e1bbbb7adc9a448d88ca269be41943f2ee60e1cc8e115542e300c1d7c61185 SHA512 11bd4ab3f98cbad2586f999370291d387fe7a817bab9feda9f5493f284410a73318e90072c0052a8216d9ae1cdc5b2a862a99315e09b72560d9bad6ebc16eb79
 AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98c61cdd4245da21a51d5f9b10149e12f5326992d587f0fe04bab79c26acee4aa2e4dded5ddf8c697b5cd4f2e34ea730c6ca7fe0 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.33.tar.gz 1078948 BLAKE2B b46e1c02ab7e5c442288a2cba2868166adb9461950d35fcd76074e3340734057f2b1bbeb3c700f38edf3710323ffd34576dd644814c379033de2a380c54d4fe3 SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e
-EBUILD nspr-4.33.ebuild 3914 BLAKE2B 7e2aa7935be02a5bc117d56705907c80c057c44c5376d1a32e3d85b0a839111ab461cb3c2e0fc305967a4d862840db7e14fdf1b01683bc505772027c78139fcc SHA512 97baa995c88eda154a069d528ebf7453d04911a8258aeb997c984a48620f28d0a049ae9ed7dc2db6bc0ff219ace0cf862bc7246b54826636ae71bd48e840f18d
+DIST nspr-4.34.tar.gz 1096407 BLAKE2B 61199c1319578570f9569011a2fea8ec6b8c4e8337b03517d1b0e1a22749a7449feb2152c348f3a1d73fefa7aa5067be460f4cbc1728c479309f4a2592424fdf SHA512 4cfac886c14cf7df4c4b79fa1c3bc92e1b14260c9c3018fa2562060d62fecb4e66c0b4e8f7edf4f4823def784a919d99dde88a89674f0cd8a644310b0569ead4
+EBUILD nspr-4.33.ebuild 3959 BLAKE2B 963dea226892adbf2c4009fb4b940db2b3b6d20a0c2a72c5a671d6bbfcbb146ed1ebaf35417f816cb4d009e4f9fac5b17d1d0fce9fe0d61d9a14e964f521f992 SHA512 9ed8ed63e1b298d8efaccb9212cc4370bdd3d6d171c2b909cced7b10b601ca856b3a6f4f66b3a8c794788e34d75351a32f68916da48f8bd7ef226e19548d62a0
+EBUILD nspr-4.34.ebuild 4861 BLAKE2B cb2242dd67fec2db13f827f794c46430e344d4c8ae7184be8e649f9e9c990599bb3ce8816aabdbf308113428200ea21999ad0fbd89db4a0364b5a781d2ebf3a5 SHA512 b4e315d122d89d208b60646f28dd430de99e99beac46605eac3846a8d71afd6ed61958836b9f55f19a14e1a113c384c410350e0c81d9871e921dc5829f7e798b
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/files/nspr-4.33-loong.patch b/dev-libs/nspr/files/nspr-4.33-loong.patch
new file mode 100644
index 000000000000..96772a2767c0
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.33-loong.patch
@@ -0,0 +1,100 @@
+https://phabricator.services.mozilla.com/D142407
+
+--- a/pr/include/md/_linux.h
++++ b/pr/include/md/_linux.h
+@@ -71,10 +71,12 @@
+ #define _PR_SI_ARCHITECTURE "microblaze"
+ #elif defined(__nds32__)
+ #define _PR_SI_ARCHITECTURE "nds32"
+ #elif defined(__xtensa__)
+ #define _PR_SI_ARCHITECTURE "xtensa"
++#elif defined(__loongarch64)
++#define _PR_SI_ARCHITECTURE "loongarch64"
+ #else
+ #error "Unknown CPU architecture"
+ #endif
+ #define PR_DLL_SUFFIX       ".so"
+ 
+@@ -139,10 +141,22 @@
+ #define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
+ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ #define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
+ #endif
+ 
++#if defined(__loongarch__)
++#if defined(__GNUC__)
++/* Use GCC built-in functions */
++#define _PR_HAVE_ATOMIC_OPS
++#define _MD_INIT_ATOMIC()
++#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
++#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
++#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
++#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
++#endif
++#endif
++
+ #if defined(__or1k__)
+ #if defined(__GNUC__)
+ /* Use GCC built-in functions */
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+--- a/pr/include/md/_linux.cfg
++++ b/pr/include/md/_linux.cfg
+@@ -1253,10 +1253,56 @@
+ #define PR_ALIGN_OF_WORD    8
+ 
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
++#elif defined(__loongarch64)
++
++#undef  IS_BIG_ENDIAN
++#define IS_LITTLE_ENDIAN 1
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2  3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
+ #else
+ 
+ #error "Unknown CPU architecture"
+ 
+ #endif
+
diff --git a/dev-libs/nspr/nspr-4.33.ebuild b/dev-libs/nspr/nspr-4.33.ebuild
index 7be0ae41e449..ffaa47314aae 100644
--- a/dev-libs/nspr/nspr-4.33.ebuild
+++ b/dev-libs/nspr/nspr-4.33.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
@@ -28,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
 	# We do not need to pass -L$libdir via nspr-config --libs
 	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+	"${FILESDIR}"/${PN}-4.33-loong.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/nspr/nspr-4.34.ebuild b/dev-libs/nspr/nspr-4.34.ebuild
new file mode 100644
index 000000000000..7a7bb7b8a2ea
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.34.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs multilib-minimal
+
+MIN_PV="$(ver_cut 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="https://www.mozilla.org/projects/nspr/"
+SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nspr-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.23-prtime.patch
+	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
+	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+	"${FILESDIR}"/${PN}-4.33-loong.patch
+)
+
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+src_prepare() {
+	cd "${S}"/nspr || die
+
+	default
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
+
+	# rename configure.in to configure.ac for new autotools compatibility
+	if [[ -e "${S}"/nspr/configure.in ]] ; then
+		einfo "Renaming configure.in to configure.ac"
+		mv "${S}"/nspr/configure.{in,ac} || die
+	else
+		elog "configure.in rename logic can be removed from ebuild."
+	fi
+
+	# We must run eautoconf to regenerate configure
+	eautoconf
+
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+	# We use the standard BUILD_xxx but nspr uses HOST_xxx
+	tc-export_build_env BUILD_CC
+	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+	tc-export AR AS CC CXX RANLIB
+	[[ ${CBUILD} != ${CHOST} ]] \
+		&& export CROSS_COMPILE=1 \
+		|| unset CROSS_COMPILE
+
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable debug)
+		$(use_enable !debug optimize)
+	)
+
+	# The configure has some fancy --enable-{{n,x}32,64bit} switches
+	# that trigger some code conditional to platform & arch. This really
+	# matters for the few common arches (x86, ppc) but we pass a little
+	# more of them to be future-proof.
+
+	# use ABI first, this will work for most cases
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+		n32) myconf+=( --enable-n32 );;
+		x32) myconf+=( --enable-x32 );;
+		s390x|*64) myconf+=( --enable-64bit );;
+		default) # no abi actually set, fall back to old check
+			einfo "Running a short build test to determine 64bit'ness"
+			echo > "${T}"/test.c || die
+			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+			case $(file "${T}"/test.o) in
+				*32-bit*x86-64*) myconf+=( --enable-x32 );;
+				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
+				*32-bit*|*ppc*|*i386*) ;;
+				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+			esac ;;
+		*) ;;
+	esac
+
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+	ac_cv_path_AR="${AR}" \
+	ac_cv_path_AS="${AS}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	# https://firefox-source-docs.mozilla.org/nspr/running_nspr_tests.html
+	cd "${BUILD_DIR}/pr/tests" || die
+	einfo "Building tests"
+	emake
+
+	einfo "Running test suite"
+	../../../${P}/${PN}/pr/tests/runtests.pl | tee "${T}"/${ABI}-tests.log
+
+	# Needed to check if runtests.pl itself or the tee (somehow) failed
+	# (can't use die with pipes to check each component)
+	[[ ${PIPESTATUS[@]} == "0 0" ]] || die "Tests failed to run!"
+
+	local known_failures=(
+		# network-sandbox related?
+		cltsrv
+		# network-sandbox related?
+		gethost
+	)
+
+	local known_failure
+	for known_failure in "${known_failures[@]}" ; do
+		sed -i -e "/${known_failure}.*FAILED/d" "${T}"/${ABI}-tests.log || die
+	done
+
+	# But to actually check the test results, we examine the log.
+	if grep -q "FAILED" "${T}"/${ABI}-tests.log ; then
+		die "Test failure for ${ABI}!"
+	fi
+}
+
+multilib_src_install() {
+	# Their build system is royally confusing, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	emake DESTDIR="${D}" install
+
+	einfo "removing static libraries as upstream has requested!"
+	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+	# install nspr-config
+	dobin config/nspr-config
+
+	# Remove stupid files in /usr/bin
+	rm "${ED}"/usr/bin/prerr.properties || die
+
+	# This is used only to generate prerr.c and prerr.h at build time.
+	# No other projects use it, and we don't want to depend on perl.
+	# Talked to upstream and they agreed w/punting.
+	rm "${ED}"/usr/bin/compile-et.pl || die
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index cf38ff5bc1e3..ac36067ac07c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,11 +2,12 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 AUX nss-3.68-ld-fix.patch 1059 BLAKE2B ea449bf15d603e970468f1349a32804403036300c33bb77909d9752f069b2b8bc5bb3ddc3da286b5f0d4f3901c990af6ad308f7b5523103e35d72cfe18e031c2 SHA512 b3f39cb0c9d91968b3dd45fbdbd4de841e17e9b97790c574d8dc6a43e8fa59f3add77125c1117092d4600ea6a89659b0a8a26ff00cdb92165d107f47372ef862
-DIST nss-3.68.3.tar.gz 82406947 BLAKE2B 92461f20294a9dce8c8a7eead9d06a4159e66afeb2d42a3313983fc5606a5f97321e038b9c25a7c7a361506910aee027ec91efd3096efdbf62096556d40896de SHA512 70fa8ab48d45249c04424979640583e8bc867432b7e3f26c1602db49a13861dd070f081ed82660bb7451f835dc859b5788ae12a67f9ddab1f6bd1a7afb1174d2
-DIST nss-3.77.tar.gz 84592839 BLAKE2B a63770f550b062549901afdcc5dc2a11c4648cef6875b023895da01ef53d6afc8c618291de96ac0af3a2c2cd7aa7986f93b4f10102a3c5aca1aa1447c148c393 SHA512 bd62eeb8f90ecd2d3999fd78fea6652736c02a6530f29e98d0cad0707f3b901b30409132eb6a6d53b9f5c05c6b464615a946a2a3e255553c793e44d0ed93179e
-DIST nss-3.78.tar.gz 84815720 BLAKE2B f140fb49e5edff98abdaae5d90adc5fac080cedfd2fcc2cc86968ac8f51116af648802655986a95dba8f1ca4257dca3c01d850bfd2b064abadea215cb9fd8c5e SHA512 ab54d838f41f963fdd4b87477b1e769186ae1f138f7c5d764cd6873be4791146d14dcc85697a2ca92e08f3bfcbeb61d64e26e7b5398095272c18a8196d43ac6c
+AUX nss-3.79-gcc-13.patch 1058 BLAKE2B d0249304f09fdea7e391732e7da63344c3e29c1856cb5ddb9e55a27305ab050077d138d9a8fdfbd6573bd7e7a345ed39f506e534464c3caaae925d1717b75edb SHA512 24dd41401b44ce86498a9b42f96068dbf58c6814ab18453db0615d49bdf327610a1ee2b0e32a2905a1c34364abd8d4c162a179f6b57cac19068babebbed229b4
+DIST nss-3.68.4.tar.gz 82409303 BLAKE2B a3cf572e82ce29dbc77e9356e0db425170f7294f1468755843746539663fe486089660e1c1b379d0184003d9ccf57db6cf0b2c161d7038301c1cb5028175b16d SHA512 f97b63a9f8218f8fbd7b5d48c084b8166366d02cd50aac69a22d56324d2fea01c49d074e51430bd128f510c733085f3f43c9739ce4073a07a5666675e0ef3b15
+DIST nss-3.79.tar.gz 84830113 BLAKE2B f558592bf0983d3c44f11e079512865d310b4f4c225bcc8e2058cb6a4a721d471c575965a1c2b5d0a130dcf27840da3d7b0ee8aa27fc63791414e22ef7804fa8 SHA512 d3311da3bd0e6907760390221c1307a63d84dd8ad9b85dbfdbf59fe4678341c9856b6f93235731999a1236c98dc0ac66d2dc023eb439cb696f73509dae70c41d
+DIST nss-3.80.tar.gz 84841312 BLAKE2B 6244193849a9277bc68c5225b4f836309bdf07bc415b23793d14c5343f5236b27bb7552fa7fb9975f410ea4732e9fc37185fee7bb950bf5d15b478f8bdec3ba7 SHA512 db05df17fea12bf3ec83882bf761663f8f10f3a8ce9a33519c7985d6003945068adb658250cf05d8b598c34ecb4ba7ea5cdc468d9cc7bc786aedb72d7be65923
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
-EBUILD nss-3.68.3.ebuild 9328 BLAKE2B 5883d294203e24b15b927cf60dd90b5a9b4666b26d5a8591ccbf248b99bf82da2866383de792c1bb5af794cb73fc7be73ead212cb3193ef98198509e061010d3 SHA512 0bb43a21931d5a3bd8ff9146ed4c63ad1d3d76075bb27eb25ed97fd3825dbd436576fc71387a6633961ad15bf03bfd37b315094cb2551073ca331187a55572c7
-EBUILD nss-3.77.ebuild 9299 BLAKE2B 046416eeb98364cf71c08cba8f1d1d49c7155f64da66ba960a0907d83ac72388cc3b3c0020324473b974f64513efd2019aa4176ec80a223ae57f7e204ef542de SHA512 7c2b1f165457e8a76d88d1750bc88169b2414df49e706df082dfd5cfc9942245420aadc95fb68fe58446e65a15f8f0eba45ca80bfadfd3bab3a28bdf990b2422
-EBUILD nss-3.78.ebuild 9299 BLAKE2B 046416eeb98364cf71c08cba8f1d1d49c7155f64da66ba960a0907d83ac72388cc3b3c0020324473b974f64513efd2019aa4176ec80a223ae57f7e204ef542de SHA512 7c2b1f165457e8a76d88d1750bc88169b2414df49e706df082dfd5cfc9942245420aadc95fb68fe58446e65a15f8f0eba45ca80bfadfd3bab3a28bdf990b2422
+EBUILD nss-3.68.4.ebuild 9328 BLAKE2B 5883d294203e24b15b927cf60dd90b5a9b4666b26d5a8591ccbf248b99bf82da2866383de792c1bb5af794cb73fc7be73ead212cb3193ef98198509e061010d3 SHA512 0bb43a21931d5a3bd8ff9146ed4c63ad1d3d76075bb27eb25ed97fd3825dbd436576fc71387a6633961ad15bf03bfd37b315094cb2551073ca331187a55572c7
+EBUILD nss-3.79-r1.ebuild 10353 BLAKE2B da796c5bb3b7e73e87c3af0e2531d405070f87d251e6de360e5e63c81ce65e72001233d5f48650bf1a3c1fbe61261d221af6188213dc652e589774e2ad5ad3af SHA512 a047c3ac020ec3cabdc38662df9403d602b17eae4e414f274bb4df7d8790e27259455e94b13bd244a32a9a7a2b1dfa94ef025e0de9bcc108407ef1122f10388b
+EBUILD nss-3.80.ebuild 10480 BLAKE2B 9616ffe516291a9ecf933b11cf3019068fe5f29df9e03f7b56645fa750309de830710d07435c370726a20ded1f945c95f650cef66f05639896f43ee816e73987 SHA512 031ecf427ef2c1621650269be626ffad5027282ca7b788ded666426738dc78314df68ea2fc6c41728f4f3f666723ceb69b89368510919638cbe98b309bd8d21e
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/files/nss-3.79-gcc-13.patch b/dev-libs/nss/files/nss-3.79-gcc-13.patch
new file mode 100644
index 000000000000..04bd977f3020
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.79-gcc-13.patch
@@ -0,0 +1,33 @@
+https://github.com/nss-dev/nss/commit/edf5cb12af8a4668997b7edb65c7add4a1390b09
+https://bugs.gentoo.org/849005
+
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Thu, 26 May 2022 08:08:39 +0000
+Subject: [PATCH] Bug 1771273 - cpputil/databuffer.h: add missing <cstdint>
+ include r=nss-reviewers,mt
+
+Without the change build fails on this week's gcc-13 snapshot as:
+
+    ../../cpputil/databuffer.h:20:20: error: 'uint8_t' does not name a type
+       20 |   DataBuffer(const uint8_t* d, size_t l) : data_(nullptr), len_(0) {
+          |                    ^~~~~~~
+    ../../cpputil/databuffer.h:14:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
+       13 | #include <iostream>
+      +++ |+#include <cstdint>
+       14 |
+
+Differential Revision: https://phabricator.services.mozilla.com/D147404
+
+--HG--
+extra : moz-landing-system : lando
+--- a/cpputil/databuffer.h
++++ b/cpputil/databuffer.h
+@@ -11,6 +11,7 @@
+ #include <cstring>
+ #include <iomanip>
+ #include <iostream>
++#include <cstdint>
+ 
+ namespace nss_test {
+ 
+
diff --git a/dev-libs/nss/nss-3.68.3.ebuild b/dev-libs/nss/nss-3.68.4.ebuild
index a3ff3dba2827..a3ff3dba2827 100644
--- a/dev-libs/nss/nss-3.68.3.ebuild
+++ b/dev-libs/nss/nss-3.68.4.ebuild
diff --git a/dev-libs/nss/nss-3.78.ebuild b/dev-libs/nss/nss-3.79-r1.ebuild
index 225e7a316b86..2f82bbb29d11 100644
--- a/dev-libs/nss/nss-3.78.ebuild
+++ b/dev-libs/nss/nss-3.79-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit flag-o-matic multilib toolchain-funcs multilib-minimal
 
-NSPR_VER="4.32"
+NSPR_VER="4.34"
 RTM_NAME="NSS_${PV//./_}_RTM"
 
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
@@ -15,8 +15,9 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert test utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
@@ -27,8 +28,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl"
 
-RESTRICT="test"
-
 S="${WORKDIR}/${P}/${PN}"
 
 MULTILIB_CHOST_TOOLS=(
@@ -40,6 +39,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}/${PN}-3.79-gcc-13.patch"
 )
 
 src_prepare() {
@@ -169,6 +169,8 @@ multilib_src_compile() {
 		export CC_IS_CLANG=1
 	fi
 
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
 	# explicitly disable altivec/vsx if not requested
 	# https://bugs.gentoo.org/789114
 	case ${ARCH} in
@@ -184,7 +186,7 @@ multilib_src_compile() {
 	LDFLAGS="${BUILD_LDFLAGS}" \
 	XCFLAGS="${BUILD_CFLAGS}" \
 	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
+	emake -C coreconf \
 		CC="$(tc-getBUILD_CC)" \
 		${buildbits-${mybits}}
 	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
@@ -194,10 +196,32 @@ multilib_src_compile() {
 		CPPFLAGS="${myCPPFLAGS}" \
 		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
 	done
 }
 
+multilib_src_test() {
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+        # Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
 # Altering these 3 libraries breaks the CHK verification.
 # All of the following cause it to break:
 # - stripping
diff --git a/dev-libs/nss/nss-3.77.ebuild b/dev-libs/nss/nss-3.80.ebuild
index 225e7a316b86..b273c86582a8 100644
--- a/dev-libs/nss/nss-3.77.ebuild
+++ b/dev-libs/nss/nss-3.80.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit flag-o-matic multilib toolchain-funcs multilib-minimal
 
-NSPR_VER="4.32"
+NSPR_VER="4.34"
 RTM_NAME="NSS_${PV//./_}_RTM"
 
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
@@ -15,8 +15,9 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
@@ -27,8 +28,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl"
 
-RESTRICT="test"
-
 S="${WORKDIR}/${P}/${PN}"
 
 MULTILIB_CHOST_TOOLS=(
@@ -40,6 +39,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}/${PN}-3.79-gcc-13.patch"
 )
 
 src_prepare() {
@@ -60,6 +60,7 @@ src_prepare() {
 
 	# Respect LDFLAGS
 	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
 	popd >/dev/null || die
 
 	# Fix pkgconfig file for Prefix
@@ -169,6 +170,8 @@ multilib_src_compile() {
 		export CC_IS_CLANG=1
 	fi
 
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
 	# explicitly disable altivec/vsx if not requested
 	# https://bugs.gentoo.org/789114
 	case ${ARCH} in
@@ -184,7 +187,7 @@ multilib_src_compile() {
 	LDFLAGS="${BUILD_LDFLAGS}" \
 	XCFLAGS="${BUILD_CFLAGS}" \
 	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
+	emake -C coreconf \
 		CC="$(tc-getBUILD_CC)" \
 		${buildbits-${mybits}}
 	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
@@ -194,10 +197,35 @@ multilib_src_compile() {
 		CPPFLAGS="${myCPPFLAGS}" \
 		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
 	done
 }
 
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "30-45+ minutes per lib configuration. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
 # Altering these 3 libraries breaks the CHK verification.
 # All of the following cause it to break:
 # - stripping
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 6da4f045f748..640e834312c3 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,3 +1,4 @@
 DIST ntl-11.5.1.tar.gz 2304103 BLAKE2B 92284383451c7a810f7ee8d9a82836695d19d2a2e46b71c8c60b00acb77f4b4d3bad5497a309616a3e3188567d20203f5ad31295130ab0f3ace08417188c9fda SHA512 cf1f642b8a0f9cdc6dda888e07183817dc67ff494e56a852053aeb15b3d2a0e61fbc05824779c5d1f20b8115fba6f97266acf7e0b0b527c25df5989c86d5928f
 EBUILD ntl-11.5.1-r1.ebuild 2071 BLAKE2B 63b41f8d75761d7d002238955c7c3a8f81af90cd3db436eec1e5a30017995f2ffa2456d912e3b103bdb25d3916e5d6f94b17f70ae5960b91fa83bb870f3201a3 SHA512 71a9d39b67f2144522090613a9143585ae17727d200958a89ae7317d6dacaadcdf09d5d10fcca2c00c77f507243fd7e56bfef9cbdc989c42a27f828a8be18dc6
+EBUILD ntl-11.5.1-r2.ebuild 2109 BLAKE2B acdc6f33fba7f2dfc82abec4a303eea07e4f364127376fb84305382041b2ebee4ba10874ada71cd3fee70c73ed7005b9ebcfe3e4883301ac32f643897862afc9 SHA512 a07995d7da5fa543982344701b9d57ab9110db4ee8643926312777fd5fcfaf38d712fdf3442c34f8dfabd1f110c67c13a302016639ff053654600771c3cb6c0a
 MISC metadata.xml 553 BLAKE2B cdfae3ba1eecfe54b279aec52c8a122226eb0247dfad805feb9f0854705e99247f15e42dedd6d08164a8d9c9cc9db871a481f6bcebad3062ac32ad05c3c32b7b SHA512 ca5e891461461757b75aea48a2cf631cc871daf33159c1f2c2a9a9e6acad43db97733de1c24754709e9b4eb1173a50af3ce63690443ce5ddd6794de9580b0d19
diff --git a/dev-libs/ntl/ntl-11.5.1-r2.ebuild b/dev-libs/ntl/ntl-11.5.1-r2.ebuild
new file mode 100644
index 000000000000..fd3a3c4dcc5d
--- /dev/null
+++ b/dev-libs/ntl/ntl-11.5.1-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs gnuconfig
+
+DESCRIPTION="High-performance and portable C++ number theory library"
+HOMEPAGE="https://www.shoup.net/ntl/ https://github.com/libntl/ntl"
+SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/44"
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc static-libs threads cpu_flags_x86_avx2"
+
+BDEPEND="dev-lang/perl"
+DEPEND="dev-libs/gmp:0=
+	dev-libs/gf2x
+	threads? ( >=dev-libs/gf2x-1.2 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( "${WORKDIR}/${P}"/README )
+
+src_unpack() {
+	default
+	gnuconfig_update "${S}/libtool-origin/"
+}
+
+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)"
+
+	# Currently the build system can build a static library or both
+	# static and shared libraries, but not only shared libraries. The
+	# name NTL_GMP_LIP is *not* a typo.
+	perl DoConfig \
+		PREFIX="${EPREFIX}"/usr \
+		LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+		CXXFLAGS="${CXXFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		SHARED=on \
+		NTL_GMP_LIP=on \
+		NTL_GF2X_LIB=on \
+		NTL_THREADS=$(usex threads on off) \
+		NTL_ENABLE_AVX_FFT=$(usex cpu_flags_x86_avx2 on off) \
+		NATIVE=off \
+		|| die "DoConfig failed"
+
+	if use doc; then
+		DOCS+=( "${WORKDIR}/${P}"/doc/*.txt )
+		HTML_DOCS=( "${WORKDIR}/${P}"/doc/*.html "${WORKDIR}/${P}"/doc/*.gif )
+	fi
+
+	# 780534 - Required for rlibtool so it can find the generated libtool
+	ln -sf libtool-build/libtool . || die
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		# bug #775884
+		find "${ED}" -name '*.la' -delete || die
+
+		# Use rm -f because the static archive may not be created when
+		# using (for example) slibtool-shared.
+		rm -f "${ED}/usr/$(get_libdir)"/libntl.a || die
+	fi
+
+	rm -r "${ED}"/usr/share/doc/NTL || die
+}
diff --git a/dev-libs/nwjs/Manifest b/dev-libs/nwjs/Manifest
index d41720e4ffb7..3596884ca7ae 100644
--- a/dev-libs/nwjs/Manifest
+++ b/dev-libs/nwjs/Manifest
@@ -1,3 +1,3 @@
-DIST nwjs-v0.63.1-linux-x64.tar.gz 129907717 BLAKE2B 5ae74de12a2290f5cf8d320745e3c1f236ba9c4da3c9eaa3055fec2f305de96d91c39041a246b8301b956f769b47ac660a9d5387264e6715681140834207041f SHA512 58bf72b54fd8fe55c47b702e4ec361259d81b26e7e465e07c439e513517db725ed5cd881de844b0ff3bbe488b14b239181eeaa3e7f7f8fc05afcb7251b796210
-EBUILD nwjs-0.63.1.ebuild 1909 BLAKE2B 37d684d53be8ece9e37b0c6f625acf0bf459cf7964bb88f6f0cd5517eb5c58ed81fde366b1b9a210a9b5cecb5047b7b2326900d4ae59ecd35f66b377d957a537 SHA512 9ee620f94e8dedbc16613d9ad5e35b9bb756670786024b4334b4d3e2feb5e4a445d71a41eccae77a01701ba617daa06efa7cd18ea8c528c42294765a6d85ce88
+DIST nwjs-v0.65.1-linux-x64.tar.gz 132698134 BLAKE2B c94ea5555e531a5bf7fe682cc7975a9bd77af82e313095e7a1ae20719be9b0441d2640ac10609d78bcbd53eb81a9fe895fedbee97a4465fed0ec57f0c7d3ccc0 SHA512 ff21c7b8b885e5ac55df0ad276b936ae8dc47793df612b6c9f9b5ca3e372d43bd8068b9135e5fb21a260d989f5a9f7faff36a3ffb77a4d241eb3d171ad2931dc
+EBUILD nwjs-0.65.1.ebuild 1917 BLAKE2B f16a6a9dd22361ed2fe86a2b5844aae76f2033db6760e16579f3066ae109907e8e6500f6f285be5d0730bec66242b9c4def4a5da557f5b8cba9da0130a09eb9a SHA512 49c26249875223e6c3f7320580ff7291097e3805165e4ad12db08fb19f03189a9056fd141d9ae116a9060df94641b3d564f5ba93fd8e3e514aeb3a00cdbe4c67
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/dev-libs/nwjs/nwjs-0.63.1.ebuild b/dev-libs/nwjs/nwjs-0.65.1.ebuild
index da5447f72fe4..34ded89e3178 100644
--- a/dev-libs/nwjs/nwjs-0.63.1.ebuild
+++ b/dev-libs/nwjs/nwjs-0.65.1.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
-CHROMIUM_VERSION="100"
+CHROMIUM_VERSION="102"
 CHROMIUM_LANGS="
+	af
 	am
 	ar
 	bg
@@ -55,6 +56,7 @@ CHROMIUM_LANGS="
 	th
 	tr
 	uk
+	ur
 	vi
 	zh-CN
 	zh-TW
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 5bbaf7225210..804500fe0506 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,6 +1,6 @@
 AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93
 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.3.0.ebuild 1524 BLAKE2B e738dd830515e756ddcc34bbc3aee067ac118e5d88ec07bafa37229cd7f1fc798576061e72570a63b626ff8c92d652fcdd80cb78e3afa6c1dfc9aa739d72e234 SHA512 16991b86d0d3be933f226e1dffd23c3d388b6c524426fb43a12267ee19ad681a4b6911798a305420ad65c4c1df1a8c51618b6136f1dac862f8a8c553ca8db0f1
-EBUILD ocl-icd-2.3.1.ebuild 1475 BLAKE2B dd1ff1e709bbdfe7fb3b7463864b9ca7ea83bfb153e7335a91c8ef27e1400af22f796265763eb652e0a95249b8cbb0c379b751246e05a0acd1a147c1760275d7 SHA512 3d9aaa113f9b703cc8d98dce446f306189e38ec316e6cc8e6975f1f6d710317ef772871830b3c964c6d08a08a35643f07dc2cba8795e5b086ad192d568064888
+EBUILD ocl-icd-2.3.0.ebuild 1586 BLAKE2B f01515e00516937cae99afaf6bc7637cbfd53117c8e05f5c101c223b9e9a1fa3dcd58f89f83c5aabe533634199da1ab21ab8eca16cc30b9766ed99e37408e469 SHA512 00e44abe6073cfece37eeaf349861c901c420e0c9b80df13f0a0a7ea8ffc73a33968b3c96ea8fa5099247a36b27196b67711ab68ff6588520b39b181768650ba
+EBUILD ocl-icd-2.3.1.ebuild 1544 BLAKE2B ec535c90d510a18019f4710b898a5222b94e82d249e758f39e6915b6251db29b9b079d75efee2b9019eafa46fc59a02477a97da783b1b217a07fb62140a7bf51 SHA512 9dc2c2abcadbcc44db6e304185b7168499b79cb8ecf7b9de88796c99a8529e40d2efe6a1c8a1967255e724de1dc2f8f65976177f8424a8a796250f23786e80f6
 MISC metadata.xml 397 BLAKE2B 385d442979cec4852b3ca02d98413415ea62683c4bbdf33c5ace01879f8a4a4f7bedf9a0f7ba4f88dcea4267765a0635cacb4a619e6d9294c6d399e01220a1f7 SHA512 730e4cd26169de827576ac7d61a07caa08c6d78cc1561417c5e017eee58a7137436003aafac620223ae1513a100c7817a3e00463ea50f0d9e3690949f2c54614
diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
index 341d58d9a219..84890c9fc9b8 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,8 @@ src_prepare() {
 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
+	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers \
+		--enable-custom-vendordir="${EPREFIX}/etc/OpenCL/vendors"
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
index 4e769ccf921e..c991dc0798f9 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30 ruby31"
 inherit autotools flag-o-matic multilib-minimal ruby-single
 
 DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
@@ -33,7 +33,8 @@ src_prepare() {
 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
+	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers \
+		--enable-custom-vendordir="${EPREFIX}/etc/OpenCL/vendors"
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index d79573ee1520..fa5b4ef1e4b1 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -6,5 +6,5 @@ DIST opencl-clang-13.0.0.tar.gz 25299 BLAKE2B 1aabb4a97ba0bfd6129ea2b821508457de
 DIST opencl-clang-14.0.0.tar.gz 26109 BLAKE2B 2ae5e6d69e2f13b867712d03b52fce893aeb70566f7f97d54858639786276f49b0b6b5768aebfedeb7fe50d95511178d7dd9df7e80d3fd27df1fb3fe1d2ab955 SHA512 ab9a3fd40542283bdd2646d9ef8d3217420c82a41b183d705e48f48949505ecadc1fa435e23a7ceadf5a335200f5f3752b42715e2ac7f63173fc09637c5c609a
 EBUILD opencl-clang-12.0.0.ebuild 889 BLAKE2B 8425391fe210277d711c1004f518663ac42b330d28248051c00bac651dc3c2f750933e2edb4964a3cbb37280c389e0cdee89652537520e0e597d4b3f414ef3d9 SHA512 3e4b16553a983134a02ad94b48a33a51e564df6228a4482a3a2f09b95e263b36e9c08969849146ef6b3ff79e7e5b085d0d57441a00d65ad191f632affd9b2102
 EBUILD opencl-clang-13.0.0-r1.ebuild 921 BLAKE2B 27c6192ef832933135aab894574c064f2406ec37992cae78366d6a0f5225b5e1479d9bab6c24182e9d2614cb997ce2682c4f75632347c58e1c947e5d733d95fc SHA512 577e0403af1962813e0f854a81ac830410e40b89be981c6e4811e9f6f4e71959b08c145e51fab88ac95f7049e41b7c0426e91e62a581e2e2b1ba3d6c665eead2
-EBUILD opencl-clang-14.0.0.ebuild 880 BLAKE2B 8b128d2cdc2db8bfe4c6e9d07a3b14c473a5eae9c033d696c2d9ca9f12a1db0b450cc5ce99ea544d0be320bec5ea065d6e3569a2dcb502f4d7cbefbe57979c7c SHA512 e4fa70772ddde5571c526f2aeda40e00e6daf81a612309db61e8db9f2123c717f6e3daba1f6c5c169089df385ab3aa3f9e8f456dc891365802bcfb776a18ec48
+EBUILD opencl-clang-14.0.0.ebuild 879 BLAKE2B c8e67dc6c53a91e153bec1b9c22849ae0a56aa009ee3b317b8332858fc19cc2d28afbf4fe312dfed35bd0b0614e2e64498dc68c8cadcad83aa417b0948b7a34a SHA512 41e32bdafaf1a956120b0bce9ba5f792335a68145e7665d22d153398cee8923bb62b8c3777005bb34d9df9fde331e416b360ae9231e2e7dd53392e38e0e8c991
 MISC metadata.xml 583 BLAKE2B a16519cc07cd2add030b90218d3cdcf9473c684e0a1a0149e7dd352881213c8579c3ed7ceee69db479264fca10561ac023c01be7451ce689fa6408b81cf8b032 SHA512 d3c3f41c5c5fdb4b6b85c737071540ef8d53e148d5f7e69367eeaa6cbe7cb84563d2381de851cc4da41b5300856dd7e6b1e67454a4fc9a9d890590e3a17526b5
diff --git a/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild
index 02c30dc2f648..321c419f1a1f 100644
--- a/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-14.0.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="14"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index a76b5a053b9f..7cc4328d0611 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,7 @@
 DIST opencl-icd-loader-2021.06.30.tar.gz 81832 BLAKE2B de36c69a46582a468594dd61997d2c3e44f523613b3da4b9c4a20ae764e4be47b00e656f6f79e371dc32174c6be0a827e3a1a8830af92ab552799e2837f62c66 SHA512 baee7fa33fe654034aae60cf9886d79a04f4dc61a1546bfa1016c66bfba103caa9fb7b55ee79854f2f7435afb40c82b1b6ff8022507279dea271ab4d96b0076e
 DIST opencl-icd-loader-2022.01.04.tar.gz 81969 BLAKE2B 20018654ae1e9566d806f4d1de64301e0f023ffad2d432c852d4dcf7e323c9c1d60f2aa49a1290cc1263e0e9386b7b0ae4095341f9aaffd6a27edf53b1d1b49e SHA512 060769ed8c84d906b2feacb4be5402c67b5cd561dc2334b384a731e66f301840ad2fc2ed143d32cfeab246d91a6c1f5377b6c9db4d8fc0571a90838c575aca01
+DIST opencl-icd-loader-2022.05.18.tar.gz 86968 BLAKE2B 24931d9f59e885ea5673c774c30632735392a9994545d87737ac392566af991385f25a5b71a8f79b4dd271c6675667088123d25c015fbc843378641f19791ffa SHA512 a02cfef224f552294f029ad5ffda8901cc486cedaab8e7b47723eec59d215488bce4d255bd6350980e8fbcf7f71c73939b10ebb2b7cfd51c5b8051079e2b3af7
 EBUILD opencl-icd-loader-2021.06.30.ebuild 887 BLAKE2B 152f167a5385e89f7e6929f78186aa8472abca2bfac911ffa223200f3c8231455b9e9d83de56ec36f9708f7a4d27df7c169e01061db30c0b6a4a342c777d3d2d SHA512 1d26f1fb0fde5932ed82a935b6893e0762d7ff8aa419f0ed1afbb69f02b7e72f31c0ebccae5aa7255ecf717b7d1d70dcfaa400e258b298615c93245e38fa60dd
 EBUILD opencl-icd-loader-2022.01.04.ebuild 887 BLAKE2B 50f97b3dc2211ebbbba28ad436bc40527e4e5e50e5962bb3dc3ea1a65c48a1eaf2aed843f9b82af66259e672a52bbdfbfd5aa986f806d4aa4fb891c8d8be6ecb SHA512 35084b36b4d681c70d0df9895fd46873ec1f997aaf6700d0e4bc863936adc88c961b1e948568d2dbcc91898ac3714914f834f6bf80bfb0e4cf3d58f078302ea2
+EBUILD opencl-icd-loader-2022.05.18.ebuild 884 BLAKE2B 371bbcc8847bafb842a316bc4649411db18958adf61074bfc19d11b65da8e2fc8007b3ba977e35a1396d053eedc5a3707ace3d54a8966e43949f01cfa0d712d7 SHA512 78bfe2ad248aa037391010d50bcd63f3abb3fe1f9a041cf61d4e0db103cfb8b9af9e9ad39cd9a9a1b588962868ba336883f7d3402729dafefbff5c45cbbcf437
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild
new file mode 100644
index 000000000000..e6f7a876b853
--- /dev/null
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+MY_PN="OpenCL-ICD-Loader"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Official Khronos OpenCL ICD Loader"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-util/opencl-headers-${PV}
+	!dev-libs/ocl-icd"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \
+	cmake_src_test
+}
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 9180268987ed..9481af8eefe6 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -4,11 +4,17 @@ AUX openssl-0.9.8e-bsd-sparc64.patch 1484 BLAKE2B 6cfba6ee4fa849e6d7799fbe749abf
 AUX openssl-0.9.8h-ldflags.patch 1151 BLAKE2B b215e46c380e571f153445f902803cf5d03d44f6f8b95a677c08bdf542e6d199c58f1f4699eb7dbd9de8bdc02b697a7971a9a06157d96c3dbd4295090a778723 SHA512 7f98c5ad310710aeceefd6fac440682bf2baaf41ce17de535add54af88c45fa0689e6e6c26bafb4fe2290fd3b6d80c51d85ffda1e276a73a3d66a319585aab11
 AUX openssl-0.9.8m-binutils.patch 684 BLAKE2B 35650e98595910d2e6b6fc846b49fecbb2a8e4a8b647bbec009a829ae4af8afdc7e7edac7a1eec8f13af1ad69b7036ca6af28bfd9509e6bba58f2b3906d6bdd5 SHA512 5e8a20111bd4809e7375c7323dab2c2edd6a131d1ec2377ee99c5e06ceb7b4b000e9606ba6d0e68cd67d8e001cc8194e11e301eace0feb066d5f3c5b331b5f04
 AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162a8b931e455f35f9e045372102d1461e3e3fd4cf4e4f544ec06a0b46a573d2009c8decf22678df03707c2487bade64f27b5 SHA512 b8e745ff90e447b000ace9cfd5f746c1bc8f3bb8249064d1d2f1072a1a628f5a89c405c7f384c73f0310f2a2f7af672950a9b7adbc583b1ee94b41d911b8a708
+AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
+AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021dcbb3efa421866f6e09bbee6287aae95c6f5d9498bd9d8974b0de747ef696242691cfebec90b31dc9e2cc31b41b81ec SHA512 f75ae1034bb9dda7f4959e8a5d6d0dae21200723d82aebfbea58bd1d7775ef4042e49fdf49d5738771d79d764e44a1b6e0da341d210ea51d21516bb3874b626a
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
+DIST openssl-1.1.1o-test-fixes-expiry.patch.xz 6180 BLAKE2B 23ef36d7bd05c98f7fab6de25681a53fa7a558d114548836b6cd90a57c4f4e45dc9fb622936053608b463320605b7df60db2d2caf3811b249f6ead3791a1c081 SHA512 577aec97fb31cd9efe3b30d82c560d3e7da57ae52c4de0f86e951b777a673830baaadcc5eb366c523024d37405531c6d32de26bbbc1e77df15c7822c72e937e6
+DIST openssl-1.1.1o.tar.gz 9856386 BLAKE2B 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641 SHA512 75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23
+DIST openssl-1.1.1o.tar.gz.asc 488 BLAKE2B a03a967e7e2124d1a76ad7765e2f48065f40d32ba102a433be603ee8f86b26a2d246dcb97a95bd694ef3005889ce4f1951f76d39fe1d683f92da1aa3023e9c2d SHA512 da6d88de7c1cd807b6089d50f8bb102c317c0b45ca26e517e3e400c5c65f787d94a1ee522af76279e93790a7fb491348cf25ffcfd66ecb9a9d35209328cb221e
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
 EBUILD openssl-compat-0.9.8z_p8-r2.ebuild 4983 BLAKE2B d1d4e37b0b7f0226cc5c76894c28e14319882948621f9afb55979c3714894bf0bdbb4cabce3eb7b9070f353714c93fdbdfbd7fa4a368c9f50d49cc941c4d79df SHA512 85535f889a0fd5cd0d623beaa9b9b1df9efc6147e15e381985b5fd394614d5a52b350675f124425f2ae94b73f8303a0877bb26b2e09b998349b5fb5a942abb7b
 EBUILD openssl-compat-1.0.2u-r2.ebuild 7794 BLAKE2B 292aa0999be2c173b86b9324a8e1e73fd536b38af5106d09d776931c8a170808ddf976536d7f88398260e1cda58945fe747255a8f3c2d4432ab4e8ca139e83a4 SHA512 271767ff717c9324a34c3ae1964a6a428f83e97d002be6df797cadc809768a198ab090cb313e5aa3bc9fd22d029f2cf17c3612f51e154e140a552bfdf9cb55f2
-MISC metadata.xml 1052 BLAKE2B 2ffccfd5734b90288ec59fb3d79af191c14641e6ae0b7ade8bccbd8631e086548e40676e3c254a228b2b35dfd6362f4529d9afa86317a80985b87a864961ac2b SHA512 f626f85f74c20349d4b60a386b9f41aac4c2d50fcc7cef68f2eec7c784e8f731b2c1dd6158622509c9ee012f412cb721de3ef0bcc2d38225ca07d18724c213b1
+EBUILD openssl-compat-1.1.1o.ebuild 7828 BLAKE2B 5f374aadbd173b82e7b2a1fd1de1f166e8f46887d96bcb889eb7baf8e3621e6dc4ac5998b4540bd2958cdecb38d827f3039da535be526d947dfbe00ddd08c413 SHA512 0ba38b74bca90d5a6848894bbe163b7d9f5019ea096f7bb02206ce91616bc6753c493be6546b592cdf49fccb535f964f1cc8c8a312b801db0fec09c36b9ea7a6
+MISC metadata.xml 1151 BLAKE2B f32554d98229f7d8c6bd87427f4babe5fb9396755d2ec21e91038a129a49bf87b2425ddfdce6472af87e315eaaea045d62e0b6ef1b59b1216aa4fcb93e9b8fb3 SHA512 1184412ad45223998061646ac47fd4169026e4eddf5a5c700f8794be79ab95c3bfd32f766c84fa3808cef06785565c2e44be50ce497efea49b9e5f3768e61149
diff --git a/dev-libs/openssl-compat/files/openssl-1.1.0j-parallel_install_fix.patch b/dev-libs/openssl-compat/files/openssl-1.1.0j-parallel_install_fix.patch
new file mode 100644
index 000000000000..c837e208cf6a
--- /dev/null
+++ b/dev-libs/openssl-compat/files/openssl-1.1.0j-parallel_install_fix.patch
@@ -0,0 +1,21 @@
+https://github.com/openssl/openssl/issues/7679
+
+--- a/Configurations/unix-Makefile.tmpl
++++ b/Configurations/unix-Makefile.tmpl
+@@ -77,8 +77,14 @@
+      # to. You're welcome.
+      sub dependmagic {
+          my $target = shift;
+-
+-         return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
++		  my $magic = <<"_____";
++$target: build_generated depend
++		 \$(MAKE) _$target
++_$target
++_____
++		 # Remove line ending
++		 $magic =~ s|\R$||;
++		 return $magic;
+      }
+      '';
+ -}
diff --git a/dev-libs/openssl-compat/files/openssl-1.1.1i-riscv32.patch b/dev-libs/openssl-compat/files/openssl-1.1.1i-riscv32.patch
new file mode 100644
index 000000000000..c94b0323eb43
--- /dev/null
+++ b/dev-libs/openssl-compat/files/openssl-1.1.1i-riscv32.patch
@@ -0,0 +1,61 @@
+From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Thu, 29 Aug 2019 13:56:21 -0700
+Subject: [PATCH] Add support for io_pgetevents_time64 syscall
+
+32-bit architectures that are y2038 safe don't include syscalls that use
+32-bit time_t. Instead these architectures have suffixed syscalls that
+always use a 64-bit time_t. In the case of the io_getevents syscall the
+syscall has been replaced with the io_pgetevents_time64 syscall instead.
+
+This patch changes the io_getevents() function to use the correct
+syscall based on the avaliable syscalls and the time_t size. We will
+only use the new 64-bit time_t syscall if the architecture is using a
+64-bit time_t. This is to avoid having to deal with 32/64-bit
+conversions and relying on a 64-bit timespec struct on 32-bit time_t
+platforms. As of Linux 5.3 there are no 32-bit time_t architectures
+without __NR_io_getevents. In the future if a 32-bit time_t architecture
+wants to use the 64-bit syscalls we can handle the conversion.
+
+This fixes build failures on 32-bit RISC-V.
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/9819)
+---
+ engines/e_afalg.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/engines/e_afalg.c b/engines/e_afalg.c
+index dacbe358cb..99516cb1bb 100644
+--- a/engines/e_afalg.c
++++ b/engines/e_afalg.c
+@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max,
+                                struct io_event *events,
+                                struct timespec *timeout)
+ {
++#if defined(__NR_io_getevents)
+     return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
++#elif defined(__NR_io_pgetevents_time64)
++    /* Let's only support the 64 suffix syscalls for 64-bit time_t.
++     * This simplifies the code for us as we don't need to use a 64-bit
++     * version of timespec with a 32-bit time_t and handle converting
++     * between 64-bit and 32-bit times and check for overflows.
++     */
++    if (sizeof(timeout->tv_sec) == 8)
++        return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL);
++    else {
++        errno = ENOSYS;
++        return -1;
++    }
++#else
++# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64."
++#endif
+ }
+ 
+ static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
+-- 
+2.26.2
+
diff --git a/dev-libs/openssl-compat/metadata.xml b/dev-libs/openssl-compat/metadata.xml
index bac0f2af8887..51593722cef0 100644
--- a/dev-libs/openssl-compat/metadata.xml
+++ b/dev-libs/openssl-compat/metadata.xml
@@ -13,6 +13,7 @@
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
  <flag name="tls-compression">Enable support for discouraged TLS compression</flag>
  <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
+ <flag name="weak-ssl-ciphers">Build support for SSL/TLS ciphers that are considered "weak"</flag>
 </use>
 <upstream>
  <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1o.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1o.ebuild
new file mode 100644
index 000000000000..20a03ddac7fa
--- /dev/null
+++ b/dev-libs/openssl-compat/openssl-compat-1.1.1o.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+
+MY_P=openssl-${PV/_/-}
+DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN/-compat}/${P/-compat}-test-fixes-expiry.patch.xz
+	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="openssl"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!=dev-libs/openssl-1.1.1*:0
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		kernel_linux? ( sys-process/procps )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssl )"
+
+# Do not install any docs
+DOCS=()
+
+PATCHES=(
+	# General patches which are suitable to always apply
+	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
+	"${FILESDIR}"/${PN/-compat}-1.1.0j-parallel_install_fix.patch # bug #671602
+	"${FILESDIR}"/${PN/-compat}-1.1.1i-riscv32.patch
+	"${WORKDIR}"/${P/-compat}-test-fixes-expiry.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P/-compat}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES}; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# - Make sure the man pages are suffixed (bug #302165)
+	# - Don't bother building man pages if they're disabled
+	# - Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (bug #141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
+		# use GNU ld full option, not to confuse it on Solaris
+		sed -i \
+			-e 's/-Wl,-M,/-Wl,--version-script=/' \
+			-e 's/-Wl,-h,/-Wl,--soname=/' \
+			Configurations/10-main.conf || die
+
+		# fix building on Solaris 10
+		# https://github.com/openssl/openssl/issues/6333
+		sed -i \
+			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
+			Configurations/10-main.conf || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	local ec_nistp_64_gcc_128
+
+	# Disable it for now though (bug #469976)
+	# echo "__uint128_t i;" > "${T}"/128.c
+	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	# fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		${ec_nistp_64_gcc_128}
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use_ssl sslv3 ssl3)
+		$(use_ssl sslv3 ssl3-method)
+		$(use_ssl asm)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl tls-heartbeat heartbeats)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+
+	emake build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.$(ver_cut 1-2 "${SLOT}")
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 8d43d85949f0..b8c11617b845 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -6,15 +6,18 @@ DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-1.1.1n.tar.gz 9850712 BLAKE2B af530258d9f7ca4f1bd1c6c344eb385e766e465c9341dd08797676165f67bbb82d3fd549ed7559dc12fb8c9c4db5e04fa6ec7ab729ec1467f5e8bce469ff5398 SHA512 1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4
 DIST openssl-1.1.1n.tar.gz.asc 488 BLAKE2B 8fc18fdc884473dc4c243499cc3528691a9ecc184e39e8d942450d41c42d22a96398036ae804af23c4f28d082c62f5babaa275ceb2e13b33b5acfd59a802c186 SHA512 24abc3d187cabed830dcd3189a34c2dc29e0b8013a607011a0e85cc68f0ec48c1de14a005053a4de3a4013cfa9658016ac65cfb8cfac58da55231371926beeda
+DIST openssl-1.1.1o-test-fixes-expiry.patch.xz 6180 BLAKE2B 23ef36d7bd05c98f7fab6de25681a53fa7a558d114548836b6cd90a57c4f4e45dc9fb622936053608b463320605b7df60db2d2caf3811b249f6ead3791a1c081 SHA512 577aec97fb31cd9efe3b30d82c560d3e7da57ae52c4de0f86e951b777a673830baaadcc5eb366c523024d37405531c6d32de26bbbc1e77df15c7822c72e937e6
 DIST openssl-1.1.1o.tar.gz 9856386 BLAKE2B 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641 SHA512 75b2f1499cb4640229eb6cd35d85cbff2e19db17b959ac4d04b60f1b395b73567f9003521452a0fcfeea9b31b26de0a7bccf476ecf9caae02298f3647cfb7e23
 DIST openssl-1.1.1o.tar.gz.asc 488 BLAKE2B a03a967e7e2124d1a76ad7765e2f48065f40d32ba102a433be603ee8f86b26a2d246dcb97a95bd694ef3005889ce4f1951f76d39fe1d683f92da1aa3023e9c2d SHA512 da6d88de7c1cd807b6089d50f8bb102c317c0b45ca26e517e3e400c5c65f787d94a1ee522af76279e93790a7fb491348cf25ffcfd66ecb9a9d35209328cb221e
 DIST openssl-3.0.2.tar.gz 15038141 BLAKE2B 140c4c80a0cad89cb0059fef6a4cd421460e6af9a3973f7a3eb5e39f64c0d44794d46e7a869e5235fced139f2249351e37a9ee5ebaa17f2708d63141ebebf919 SHA512 f986850d5be908b4d6b5fd7091bc4652d7378c9bccebfbc5becd7753843c04c1eb61a1749c432139d263dfac33df0b1f6c773664b485cad47542266823a4eb03
 DIST openssl-3.0.2.tar.gz.asc 488 BLAKE2B 2f6482114271c4f512159fa159486a3b3470637d770cd1614fda004918d06ed9ab562e655d1580d2ebb05745ec72987488c2161b72d078017cc157003d4205da SHA512 4303391a58107c76ad9b05510f5bfc95f687f4cb2f9ff5b03fb262ba99b573423ab83f0437471199954496799b343191b889ad9ef8fabdd7ee4ec3ec9b5f1d81
+DIST openssl-3.0.3-test-fixes-expiry.patch.xz 29056 BLAKE2B 11be776b9c4baec770d81ff180581d7d8292261f32ebfcb2cfd399d684cef1b9e7b4575d906f23e8a61d853eafb178e1b0e01d9324dbe598c876c0ef74bcf5e8 SHA512 23bc571dfca453deb4f1812aea5fc1bcf1c27358d8638a66ce7f359a698b09a35bdc86e01db36aa5e59b37cc7e36f0ced6f1463b383fb0d904aada69f5d5cb04
 DIST openssl-3.0.3.tar.gz 15058905 BLAKE2B 8141d13dbea2f1febdd4e46aa404e9f3bac51e1fdc0c9b0df8bf3bf6852e18b09201a2a8cbee99f72e8d6de660834093449b7a14a3fbdda8511286ca3b6743e7 SHA512 949472025211fabdaf2564122f0a9a3baef0facb6373e90cf6c4485164a50898050b179722d0b358c4d8cf1787384ea30d5fd03b98757634631d3e8978509b1a
 DIST openssl-3.0.3.tar.gz.asc 488 BLAKE2B 3f31e3a73706b69683220e05b1b4ddc75dc3e7e12652dca711e4aa0eb3c023ef736aee9ade15172d7f28e1e1af03e86d4854ec6c3d167cad42882f483c5e56d4 SHA512 04afe65c6af1ae43a9967462383a6a4f567f5acff19ec1952cd6fce2dc3c3d4dfb3cb54126562724c148f40dcb66668abf727282d35730bbf36f82b5c6bacace
 EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
 EBUILD openssl-1.1.1n.ebuild 9296 BLAKE2B 49772a36ac8fcb336c1b4b6effa42447c0d2b5d4fcdb018ec852f2a79d7e48e026b4c313b76d2adaefdb38f1277d5d972af1c9bfa9b1ff44ff29df7a23ab4438 SHA512 cfd85bf40c59048231d5a302ebefb1ca9888e6f619c91ac28b4e7c26a1f4cff3e2c3a652bdf8cf8cb113347b0bf49db7ad82e76908fbd4e149f1ed971dba298b
-EBUILD openssl-1.1.1o.ebuild 9304 BLAKE2B 72ebe4db297705ddd4b1e997758daf8bc80f3198cca0ec17f7f18b6880ee84a332c91f72b703c788b0ba6840a02d76bfa30510233e37908112c2fdc14544433c SHA512 bc183565e800c1e1f18df35836bdb20b5f26e21734fe4cf77d218cf161ce8b614af68ec3e85f824d0baab45936c0700333a2146874490647f0db7c1ba0ea0556
-EBUILD openssl-3.0.2.ebuild 8461 BLAKE2B da0438ee498a7c718678596c00517bbbd15af8350d7d9fe5c0ca7cf5b0009019022a6aac19ee9ddc77b46089262778098633a2360d52b1d7aec1865da0394844 SHA512 18ca4c6e0944fbe12afa68b21475d947a7145b874c6a7a336e564b18f3688e45af2941ce1008e800eb053f1a7133b748bb6d99ccdee8f0dbf3c839ce1c4aa417
-EBUILD openssl-3.0.3.ebuild 8770 BLAKE2B 9d0f113b0921f15e45b3e17b0d07aa8094a481f03d39d4ac35d6a4d2775123d7a6ee419f0c97d01a4b87e02d8534b634cfa8d8c956ac7d76760567ca3e0275da SHA512 41957dea5b1d49eca541d52070fefb738a7d373a44337fe322a2ec09481bff71f0d11935b0e64212d892f3b410249187ec1131cdc21dabc094712ddeae06374f
+EBUILD openssl-1.1.1o-r1.ebuild 10144 BLAKE2B 037eb29b40857eef4c2631912a6f60f9a7499dd7de402464d9cb3070d1247d3637aec4f1b2f45d1db7aa7b2c9d2832c2f4142cadef01706d087bfda9bd749fcf SHA512 b866690093cbf04de142cc27d29129fcfa4ffe93c9a167f76853eabeb957b35d6c50c42b7b77b89d3d301630eddc2100c78d7b61421dbf47eea7180d7ce3f0b6
+EBUILD openssl-1.1.1o.ebuild 10079 BLAKE2B 60f51f6b8f18b4ea8704c5d7e0cf9603fed7246c20daaa7cd29589fb5c92ff78cac6993bcbea08f156562dd981a2040be633276200840cc14787c73dd75268ad SHA512 d15574f89b552c8bd2a14591e6200431567e48ae889ebc0358ad92aa00fe79e45bba41e68581c6eeea9168a200374328d11a4b9ed881591c27ce29ce78402444
+EBUILD openssl-3.0.2.ebuild 8459 BLAKE2B 72e50467995c79e31fcfd3b40cf94d24bfaeb9c40f7e33ad3108bce95b41760f1423ad30b046f32cc6ed57ca5fdea056efa131b7ecf661b1cb58407b77ec3e7f SHA512 a16ab4538cf0cc7b772771c0784c7707e006f9635f4e6c7ee65b0789b1ab979eb713b0eb0d447d61de3a38ab9b9047abccb301f7c4e67e128cca57b47910725c
+EBUILD openssl-3.0.3.ebuild 9552 BLAKE2B d85584fb8d951c2aa841fc61e20ac2fb7191187c5a0388029f8e463a9a8e4618c31bca72c044eb5a1914f2deeb4bcde1ad3baa2c6389fe18be2386a282bafb2f SHA512 3b5c6f4e9966d5cfd38a583ebc0064c63b43c7c022722386e93328ace0e3331153eac9bb73454e5ea34a7922af3599f5d18ca76141bf5070c57909da3b01214b
 MISC metadata.xml 1585 BLAKE2B 104cd90ff54c6789edddb7f433252731754cb600ea663c6da66b28ee988541b9fa5f8b3086684841946ca8c4928c8768a1ed11d39419a26c039da840912a66ae SHA512 13cf734d5d1685135e0f1c488af0e4a2f1295eac33c45d65b1dbdd1b04100b1ca5f3d5d1c9938f4100f8df548ba739c9ade56c72176de92cb7f9c2cc2da818cc
diff --git a/dev-libs/openssl/openssl-1.1.1o-r1.ebuild b/dev-libs/openssl/openssl-1.1.1o-r1.ebuild
new file mode 100644
index 000000000000..0e55dcc43e49
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1o-r1.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+
+MY_P=${P/_/-}
+DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-test-fixes-expiry.patch.xz
+	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+if [[ ${PV} != *_pre* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		kernel_linux? ( sys-process/procps )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssl )"
+PDEPEND="app-misc/ca-certificates"
+
+# force upgrade to prevent broken login, bug #696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+PATCHES=(
+	# General patches which are suitable to always apply
+	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+	"${WORKDIR}"/${P}-test-fixes-expiry.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES}; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# - Make sure the man pages are suffixed (bug #302165)
+	# - Don't bother building man pages if they're disabled
+	# - Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (bug #141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
+		# use GNU ld full option, not to confuse it on Solaris
+		sed -i \
+			-e 's/-Wl,-M,/-Wl,--version-script=/' \
+			-e 's/-Wl,-h,/-Wl,--soname=/' \
+			Configurations/10-main.conf || die
+
+		# fix building on Solaris 10
+		# https://github.com/openssl/openssl/issues/6333
+		sed -i \
+			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
+			Configurations/10-main.conf || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	local ec_nistp_64_gcc_128
+
+	# Disable it for now though (bug #469976)
+	# echo "__uint128_t i;" > "${T}"/128.c
+	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	# fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		${ec_nistp_64_gcc_128}
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use_ssl sslv3 ssl3)
+		$(use_ssl sslv3 ssl3-method)
+		$(use_ssl asm)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl tls-heartbeat heartbeats)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
+	dodir /usr
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*}
+		d=${d#./}
+		m=${m##*/}
+
+		[[ ${m} == openssl.1* ]] && continue
+
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+
+		mv ${d}/{,ssl-}${m} || die
+
+		# Fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
+		ln -s ssl-${m} ${d}/openssl-${m}
+
+		# Locate any symlinks that point to this man page
+		# We assume that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+
+			rm -f ${d}/${s}
+
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.1o.ebuild b/dev-libs/openssl/openssl-1.1.1o.ebuild
index 5b19fd948893..730dfb22685e 100644
--- a/dev-libs/openssl/openssl-1.1.1o.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1o.ebuild
@@ -3,20 +3,21 @@
 
 EAPI="7"
 
-inherit flag-o-matic toolchain-funcs multilib-minimal verify-sig
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 
 MY_P=${P/_/-}
 
 DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
 HOMEPAGE="https://www.openssl.org/"
 SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-test-fixes-expiry.patch.xz
 	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
 
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
 
@@ -34,11 +35,6 @@ BDEPEND="
 	verify-sig? ( sec-keys/openpgp-keys-openssl )"
 PDEPEND="app-misc/ca-certificates"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-)
-
 S="${WORKDIR}/${MY_P}"
 
 # force upgrade to prevent broken login, bug 696950
@@ -48,6 +44,12 @@ MULTILIB_WRAPPED_HEADERS=(
 	usr/include/openssl/opensslconf.h
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+	"${WORKDIR}"/${P}-test-fixes-expiry.patch
+)
+
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
@@ -62,6 +64,16 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
 src_prepare() {
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
@@ -106,10 +118,20 @@ src_prepare() {
 	# and 'make depend' uses -Werror for added fun (#417795 again)
 	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
 
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
 	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
+
 	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
 
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
 	# Prefixify Configure shebang (#141906)
 	sed \
 		-e "1s,/usr/bin/env,${EPREFIX}&," \
@@ -150,7 +172,6 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB RC
 
 	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
 
 	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
 
@@ -172,8 +193,7 @@ multilib_src_configure() {
 	# Don't set it without thorough revdeps testing.
 	# Make sure user flags don't get added *yet* to avoid duplicated
 	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
+	CFLAGS= LDFLAGS= edo ./${config} \
 		${sslout} \
 		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
 		enable-camellia \
@@ -191,14 +211,14 @@ multilib_src_configure() {
 		$(use_ssl asm) \
 		$(use_ssl rfc3779) \
 		$(use_ssl sctp) \
+		$(use test || echo "no-tests") \
 		$(use_ssl tls-compression zlib) \
 		$(use_ssl tls-heartbeat heartbeats) \
 		$(use_ssl weak-ssl-ciphers) \
 		--prefix="${EPREFIX}"/usr \
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
 		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
+		shared threads
 
 	# Clean out hardcoded flags that openssl uses
 	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
diff --git a/dev-libs/openssl/openssl-3.0.2.ebuild b/dev-libs/openssl/openssl-3.0.2.ebuild
index 2ef0aaed3200..3d56892f5980 100644
--- a/dev-libs/openssl/openssl-3.0.2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.2.ebuild
@@ -128,7 +128,7 @@ src_prepare() {
 
 	# Prefixify Configure shebang (#141906)
 	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-e "1s,/usr/bin/env,${BROOT}&," \
 		-i Configure || die
 
 	# Remove test target when FEATURES=test isn't set
diff --git a/dev-libs/openssl/openssl-3.0.3.ebuild b/dev-libs/openssl/openssl-3.0.3.ebuild
index 514ea991ddcc..23cddb4f6b9b 100644
--- a/dev-libs/openssl/openssl-3.0.3.ebuild
+++ b/dev-libs/openssl/openssl-3.0.3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
 inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
 
 DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
@@ -16,8 +17,8 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-test-fixes-expiry.patch.xz
 		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 fi
 
@@ -53,6 +54,7 @@ MULTILIB_WRAPPED_HEADERS=(
 PATCHES=(
 	# General patches which are suitable to always apply
 	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
+	"${WORKDIR}"/${P}-test-fixes-expiry.patch
 )
 
 pkg_setup() {
@@ -81,6 +83,16 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
 src_prepare() {
 	# Allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
@@ -124,12 +136,21 @@ src_prepare() {
 	# and 'make depend' uses -Werror for added fun (bug #417795 again)
 	tc-is-clang && append-flags -Qunused-arguments
 
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
 	append-flags -fno-strict-aliasing
+
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 
 	# Prefixify Configure shebang (bug #141906)
 	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-e "1s,/usr/bin/env,${BROOT}&," \
 		-i Configure || die
 
 	# Remove test target when FEATURES=test isn't set
@@ -196,9 +217,7 @@ multilib_src_configure() {
 		threads
 	)
 
-	CFLAGS= LDFLAGS= edo \
-		./${config} \
-		"${myeconfargs[@]}"
+	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
 
 	# Clean out hardcoded flags that openssl uses
 	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
@@ -266,7 +285,9 @@ multilib_src_install_all() {
 	cd "${ED}"/usr/share/man || die
 	local m d s
 	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		d=${m%/*}
+		d=${d#./}
+		m=${m##*/}
 
 		[[ ${m} == openssl.1* ]] && continue
 
@@ -282,6 +303,7 @@ multilib_src_install_all() {
 		# We assume that any broken links are due to the above renaming
 		for s in $(find -L ${d} -type l) ; do
 			s=${s##*/}
+
 			rm -f ${d}/${s}
 
 			# We don't want to "|| die" here
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 6ea9c20398b6..9789adeb4139 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -7,5 +7,5 @@ AUX ossp-uuid-1.6.2-manfix.patch 539 BLAKE2B 040ee470f34d74ed076264310898697a6ee
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 BLAKE2B b5d2aa2673ec14779f4bda0c28609c807071eaf88a876d472bbc19de891b04aad47bdd4105712e28e604a968062ffdf199b60f1903fd89dd4caabd919bac2348 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c
 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
 EBUILD ossp-uuid-1.6.2-r6.ebuild 2173 BLAKE2B 4b519dfedca832601ec5c253f3c05bc9f591116dc651fe7d4b2ae77f6a77a44bb10acfb512164e5cf43ecb4bd86270116e8ed4c77979d4411021da03c7d5f958 SHA512 b01c2e04a003a85a469417c973bbfd03f2a1d164003a50c137c8f08e37cafbb8f9260086edcae22c6f8045cf55c2787e649ceb285ab7bbafe8998b5910fba78a
-EBUILD ossp-uuid-1.6.2-r7.ebuild 2288 BLAKE2B 40a3ad919b7c4853577d99af36e4ef25069d480bb1df410d4a201e7ba53146196a7da0ac12a3674bf996f356effbd04361a6cd1bce16450186bf27ce8021c42f SHA512 2475afb3c6fea25eb3b2e56d75e971c0e2a086b7581094c01838422d97c666b4be7ac9325a06b48cfab56116bc35fb3d7a705512826b9632a6952d713054b66b
+EBUILD ossp-uuid-1.6.2-r7.ebuild 2277 BLAKE2B 5b03a5c341b812185bfcdfed750fbe4ab4d2aaf4b7fab142f41f80e32e39f01e53748d779cba885712ab7450c95076d106f06ce88d3872d37aa94bc9e038d1bf SHA512 b38b1c8e8f21ab01ffb573c2cb2a3ec8fa50558827d52f11eac6bad22c428530831a61813456b19b06a1eb51d6c66a3a00066026177ff15604c5cd4bf8f59fb8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
index 90dbbbf5b19e..335448aba2c5 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
@@ -12,6 +12,7 @@ inherit perl-module
 DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID"
 HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
 SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0"
@@ -21,9 +22,7 @@ IUSE="+cxx perl static-libs test"
 DEPEND="perl? ( dev-lang/perl test? ( virtual/perl-Test-Simple ) )"
 RDEPEND="perl? ( dev-lang/perl:= )"
 BDEPEND="perl? ( dev-lang/perl )"
-RESTRICT="perl? ( !test? ( test ) )"
-
-S="${WORKDIR}/${MY_P}"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo-r1.patch"
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 5207a666b699..478662359447 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -4,7 +4,7 @@ AUX pegtl-3.2.1-werror.patch 1486 BLAKE2B 86a1b3e9a40c19a5f959d9a3c100eb4417edff
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
 DIST pegtl-3.2.1.tar.gz 244746 BLAKE2B f1d4ab0bfbc0be09affc83ffdf07796705be949e1addd06e241b8c06dd34bea3844a34b6dfe143269e110279615238afa606944c52af32f8cf6ea34398c40c7b SHA512 6297adea085bb3043a60c28eb3a868a7c2d203b351f907ea3fdc4ef34c63f87a5786ac7d297531f8b8c8c3414f5ddef658a025a7bae2515bdc750e974975f6ff
 DIST pegtl-3.2.5.tar.gz 248904 BLAKE2B 008f7b058c5a62910911815bee671baead509e673ce8f67bebc4244edd1abed4c2467a03cb47e55e75c3be17b937834915f568a0a47066ba80949b868aa69494 SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14
-EBUILD pegtl-2.8.3-r1.ebuild 735 BLAKE2B 954e7a6b26792e51e8cfcc80a3fa9923a117e36cd9afe091322501eefd06c3398796de9b50ec3d63bc015333e67ec4de840ca868b11d3428c655389856f385e2 SHA512 dbdf8f3c6eccc8992800b3261c220d8394ccf03f4142baf4b3ab2f3347be1c5901039d9efca36d47a6baf05977b78544b5114cf5ba693eaae2aa9935331535f7
+EBUILD pegtl-2.8.3-r1.ebuild 734 BLAKE2B 0ac4b7b00fb7114acd879880a9ec29b05c69ec8ec918f3810b6664086ac9ff52b025ab1e8ef26f7f4e112eb99cce1b67c367569e4e7cb910081752326f00b50a SHA512 a2046d66fe48a82b166609772dce0b3c585b95704c250f43ad487eb6fb0e89faafb83dcf9977015d27b0c37102584e8d5ebc0e9000c2309a102b790ee1f2ed95
 EBUILD pegtl-3.2.1.ebuild 644 BLAKE2B f13a446fd6c4a49de02f678a2035835ab231c7a638de5ed37b0c81f565c3818de36687f3dfdf8c26ec63787270cbec90a26382309974eda7a44e78fd5620bd80 SHA512 bff8430db834d07082d0437909858730ff4e22863925b72d9f30186f08944d4bd9dffb75c19c31c901ef4f9ab926679f937d7972d8791d0bb8f602eb8c81af05
 EBUILD pegtl-3.2.5.ebuild 651 BLAKE2B cbc29c4dba17343f6ae26ff7e2a4bbb1978ef37ca9b99e031cab00601670e267289a7a2d799f17f7c2196cd84fc62655ce26ca53bd4be7607ba6b96fcf375fc7 SHA512 b9c453eb3f0e578a79547c63cf951ea3311423a55ebe512e2e1a9d0499c747435f9550930f73288ad9867110128e3cf220b5ba893dc41311fbcb2d558f1dbc63
 MISC metadata.xml 331 BLAKE2B 12e6c4cfaaa53a618b8522bd05d8405f2a302d4e191350442839e393e2f97163444670d63b30afa6d103978d5f5218b40b4222a928cea413de52853108cba66e SHA512 b21bb068dca39dc56e95bf6ae50da18a0b9662e70bc3bc7896919b92a204c695baa7152312ad9a7db857bb42ca35b01cbdd78bc3e697a4aac617459dc8ae3e20
diff --git a/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
index 4321cb0d206a..5f25adf3029b 100644
--- a/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
+++ b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 75584d6ffb86..c13e584a79f6 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -2,5 +2,5 @@ AUX pkcs11-helper-1.27.0-nss.patch 614 BLAKE2B 68db71f025aebd620d278fa3847b1ead5
 DIST pkcs11-helper-1.27.0.tar.bz2 422425 BLAKE2B a9fd7ef04dce1abbae57b09a12b4be560465ae0cf2910443332882967d00b6380c62944820aa9580e101459d1c35edaae68cd7abbafa308a8b152921ac32f04c SHA512 5799342cb755dae8b7ba0880d652e9d4b4f1e52a74043015e1185e1e059326cb2689bb51957db98060ac2257dee34e2f047dcf3d52ad59fd49b91fedcfc5332b
 DIST pkcs11-helper-1.29.0.tar.bz2 422549 BLAKE2B fec72ac82f1545fc50f80b5b28db12906df32fa3bc65f80541d8bee7f1d1c8062f1f0516344237424022c01d4f390e8a72e3e0262250f3b6c51df92c768d81ee SHA512 c530f5a4b5826a02bfe787a1293a7595d5a0d6348daa16675bd10c6d6734b1f24a3cc73b5b89433cf1edf8815f8b7298fdfd1ed686f096bb5edfb425e9430eb2
 EBUILD pkcs11-helper-1.27.0-r1.ebuild 1071 BLAKE2B 4d0d25826aa7d793940481c06936db32c76079afc1a070b13f076fe7f04ac1d6aeb3087f3fe3866b239083ed85a97c3fcd92c4457bc9aef2ba08eb3935a0616b SHA512 d99c56df4a2d9c652cf14edca110f8c43c496bbee70e85f1206e4d670739985b63216427f586e7309e4d35b5e71db298b71556dfde176fdc429cd545f31cfa23
-EBUILD pkcs11-helper-1.29.0.ebuild 971 BLAKE2B a918ddab756b30c0850765cef5a50c5dd745061852de581c19a8e35e0dd32ae177790b345b0fb18c306b136d8edb50dd368529773b97736d89286e4841456a83 SHA512 4eb9576ebdad75f71d4fd4b5ae3229c6d240549ac9fe982d9b7065e9c8716fd0a0dc5348851c151f27f4f14986473220c5e18afad1e2fe5c881776f7eaa4ec5c
+EBUILD pkcs11-helper-1.29.0.ebuild 978 BLAKE2B 398c33e5fe845e85b971eedaf3e1f56f7f0f633ccfb33dd9677ae03c8fb1ea9bb7e691c7a70bc383c9d6cc0c286f3aad54a7e74f4935281fe858459adfc7fd89 SHA512 e2fef116e2c1429916ebe6228a016fc47e1f8e2f863c8dbebd01dd31a7b40ace45e2d1fc48a65d6c3fb28fec801bf3a51ad038ca4ddf1465768486fac984c8ff
 MISC metadata.xml 435 BLAKE2B 7740f428a33cecd516c6cfb96de878c8080b2cba0b42c78cc34bac42d128619cf4a42b966aafe30bfc13a045ad0017285ecff9d60d237eadd715fcdf6029c8b8 SHA512 2a9c9d99cfcac14b7c201d5d931f5d1fe0d544328f32db5048a9cd15f0a99ef4016e4b5ec4391500cb5a9e3c00205c72211c61c1fc13cda330faf6b7eb9eeea9
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild
index c8b02fd6835d..ee7003924d9f 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc gnutls nss"
 
 RDEPEND=">=dev-libs/openssl-0.9.7:=
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index f562653caf30..4785b4ca7300 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-wayland-protocols-1.6.0.tar.xz 41752 BLAKE2B 63f733b63e6e707a340cfbfa0f0a774833e119ba53b8754ef6c05e09b42413284642740b9bcd6abfd7a06f1b651faf3807ee11121aa82b6ff9b1b20894f831cd SHA512 a9306d30032c46e8046ffbc8713e1afab732ee48a43922d0091cff25f0aaf407bee6fd08c333d9a83d064b903ebd1699d7d0ceadfe8b939ffd4d5e2129c22cf8
 DIST plasma-wayland-protocols-1.7.0.tar.xz 42000 BLAKE2B 581d6c375e7f17abd346ccc9482da46238fcf52a84c04d991ccdcb95bd4472dc6b2c2c612382ffd7cebdb669da00be05df9b0f5e58cc6767fcb7183b0e8ae459 SHA512 1ed01ce6af375c4012b3367377cea172446f2a7f1bef01c2e56dc2482c378955f9507e4e3bbb2ab316ba116ec181beaf9287f5b81199a02d5fd9eefb658bcb9c
 EBUILD plasma-wayland-protocols-1.6.0.ebuild 456 BLAKE2B e5ba5ecd1d0111f4c6567c1db52bb9e967f0831cdf48c031cfc77711a72566fb64b493fb8bdc8d9d4023e6bde06cd792fd929d1756888dac25caa2414167d3bb SHA512 57f44a144aca8e2545e0664e4c577b356c70c0785aa0380c450e8bad40e828a66adae19895ae95d4e11ab34404a9a5ae060b5821784e121ee98022fa60fc2c38
-EBUILD plasma-wayland-protocols-1.7.0.ebuild 459 BLAKE2B c05eae4ba93f37cf0039b597891869b52491a41a70d5e5170db96ffdaaf1771f0b131e58fb208dd48a955eafb282d8ab8787bf32b5ec201ee77969cbc93169d1 SHA512 46033ce4c2e0272546f775ce3361f6d2cb24364d6cdbb630918bddd358ed29d6d6c6a78472ab3bdd1af6b6526ef40fd1d587d0df0e25187b2b373e4adc49d30b
+EBUILD plasma-wayland-protocols-1.7.0.ebuild 466 BLAKE2B 3b6285f7be063d17d29828acde94296a41fa2b21ab62d12c7c0ab676f3539da8ff4dd5850d34f55c86a9c70f0a2d696060bec80fc611d99bad42e166f1b8a1a7 SHA512 b5ced19be3e3c6db9c1a90039df126622d5535eb1e1225eb52728d3d130ec76a54517263c77cbcb1b8f9b4bb6db85225090148d608cb7a9278b81acc0b579826
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild
index 1b2528ddee83..6ec8b9afd1c5 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/pocketfft/Manifest b/dev-libs/pocketfft/Manifest
new file mode 100644
index 000000000000..cb07bccfca09
--- /dev/null
+++ b/dev-libs/pocketfft/Manifest
@@ -0,0 +1,3 @@
+DIST pocketfft-2021.11.23.tar.gz 26769 BLAKE2B 80eb02a2a73d46febf562c3c0b7ad86ee5d9f93b41057c99f9f7f767b7cd2e6b7bc3986e67faaca6e69b9d7e2402febb8d427cb8c57badcafcc5ea0dafd04b20 SHA512 d212cfa34ecde2f38b789d218b5ed4fb9069e41f9d35587dd058b8af89cf22e79a1c8f8ddf2d47d794fa23a7e363cb0631b25461ae3fc9fc5d58e1bdf6356600
+EBUILD pocketfft-2021.11.23.ebuild 504 BLAKE2B 22950fd40293fc8c55278de89b8e9fcf0c717be252b9e136a5357dbde44d3c8595e12a15a3ffeb544e48e239da7772e75f9716cbf21b52779ef4d31dc2d96af8 SHA512 d56addf04a2e91ef9d3a626ef610afafefcae77397956ec7230679f3efa292db378dc4fa6d1df25c4ce042efdc96be3a63f3a31e753380bb7a247face724867c
+MISC metadata.xml 331 BLAKE2B a635b7af9c5cf340c9110053d453d08db710e8db5f088899f43e598faff2c69c765661d9dc092793a04f8be190c778873162c1dee862cfc0f5e97aa1be1c0bec SHA512 c54f95572fa78026e4657ba9e2643f482dcd15d111acade68b93b5ad87b5a22b2a2eba08da7999be0c7c25e4cce497821b411e0425042c03aeb6e97af00a4e43
diff --git a/dev-libs/pocketfft/metadata.xml b/dev-libs/pocketfft/metadata.xml
new file mode 100644
index 000000000000..0d78ed7431c8
--- /dev/null
+++ b/dev-libs/pocketfft/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mreineck/pocketfft</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/pocketfft/pocketfft-2021.11.23.ebuild b/dev-libs/pocketfft/pocketfft-2021.11.23.ebuild
new file mode 100644
index 000000000000..d86eed5e7369
--- /dev/null
+++ b/dev-libs/pocketfft/pocketfft-2021.11.23.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CommitId=daa8bb18327bc5c7d22c69428c25cf5dc64167d3
+
+DESCRIPTION="PocketFFT for C++"
+HOMEPAGE="https://github.com/mreineck/pocketfft/"
+SRC_URI="https://github.com/mreineck/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+src_install() {
+	doheader pocketfft_hdronly.h
+	default
+}
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index cfdf61fc6cc4..b7b75c00cb1c 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -2,5 +2,5 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43
 DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
 DIST poco-1.11.2.tar.gz 10935312 BLAKE2B 66b4cdb6cb4b5dd4f5f0eee744e1d147d66e98561ec4286ed09693b638d565fbf084c3e40eff3f6a9a88cff167b1d774da08e8c8424986aefe13d029a540afe2 SHA512 3f9e46dbfb0a85f19389b269725cb6272172d993d8239f13da8110c0c6ce9ed2b6595708d5dba91a027292c74358c87da988e22587a74011e84707816a6a277c
 EBUILD poco-1.10.1.ebuild 3785 BLAKE2B ca9eeac5cedc288c23fef5400d2428704b09aa707fcdbe02d12d9905caf3d72beed144a1588e6a440c66f59751f7b7e3d9e81cbcc86acbfaee0dd27222e54028 SHA512 f67bb94b6b08ed7f5d17d3c3b6f7186d7d7bd834bb8eedf1db045e001d683ac8ddc3be94ef3e2e1e0a27c65ee5b88525e46208907dfda88c7b17fa5d4c1261d6
-EBUILD poco-1.11.2.ebuild 3881 BLAKE2B f3b8beb999657398871b46b7e8c8285a35dfd447fc063a26f2480ae713a915d5c8ebe86d4eedf460409251ac245016c0e7ecf05e9d03670e95b73d1ea2e7d43f SHA512 d890ce83447bb34b448fcb261e77036f5714e666d3e790e127abcdf2f38b90c7e98dd4cfc3feb4515429c1d27a91915e185de22c434a3c93a4c5332f123a578b
+EBUILD poco-1.11.2-r1.ebuild 3938 BLAKE2B d32cf63f1eb2b26789d3615a3f6908712b1af02ffeeac7fb9001893b6058e68b799ea3d3e0b54f95f3b932e8f8248378bc5e92e4365204009fb748f6e9557ee9 SHA512 c3084a698ce14b8f523e0582d314d2d9afabe588306c59c9acb22f09762d488df651f7443929d67355b1d01fe132ed17ae016ea9e40dbe7899a1251dd07fde44
 MISC metadata.xml 2644 BLAKE2B 397adfc4fd51bebcd784cea4e8cb99f7eef7013ccb5b391202d22816bd5831641ba7e22f2a5350fd8cf6103d810c1553e279ef37b23d99135fe9637c8ef46308 SHA512 2d6cfc831e51575aac6f6ad43bb70c7e71c39ea8623d05042afa34496213df2016977c962cfc65e215a3fc698e12cfdd60e9badeafdc2832bb30e830741a5efb
diff --git a/dev-libs/poco/poco-1.11.2.ebuild b/dev-libs/poco/poco-1.11.2-r1.ebuild
index 260b3ec77580..40f8cc859b35 100644
--- a/dev-libs/poco/poco-1.11.2.ebuild
+++ b/dev-libs/poco/poco-1.11.2-r1.ebuild
@@ -34,9 +34,11 @@ RDEPEND="
 	>=dev-libs/libpcre-8.42
 	activerecord? ( !app-arch/arc )
 	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
-		 mariadb? ( dev-db/mariadb-connector-c:0= ) )
-	odbc? ( iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC ) )
+	mariadb? ( dev-db/mariadb-connector-c:0= ) )
+	odbc? (
+		iodbc? ( dev-db/libiodbc )
+		!iodbc? ( dev-db/unixODBC )
+	)
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
 		dev-libs/openssl:0=
@@ -91,6 +93,7 @@ src_configure() {
 		-DPOCO_UNBUNDLED=ON
 		-DENABLE_APACHECONNECTOR=OFF
 		-DENABLE_ACTIVERECORD="$(usex activerecord)"
+		-DENABLE_ACTIVERECORD_COMPILER="$(usex activerecord)"
 		-DENABLE_CPPPARSER="$(usex cppparser)"
 		-DENABLE_CRYPTO="$(usex ssl)"
 		-DENABLE_DATA="$(usex data)"
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 9741460aac9a..00f88ba5a86b 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
-EBUILD ptexenc-1.3.9_p20210325-r1.ebuild 1207 BLAKE2B f0655823c804b2444c220efbc3ca897237d664a1b8f81d8b979bca56547c5e5fd9e727cefa16829aa4703286f2de94cf34c59ff30957b3fa953cb40b7564ff66 SHA512 04442261a3f686c87571f98008d41b61fb9fc2b514858289565ba44ce7325a44f5f6a8943fd7a71d9942b045edacb1fc9ea61b54edc4d48618342a9731a1d301
+EBUILD ptexenc-1.3.9_p20210325-r1.ebuild 1214 BLAKE2B dda36e9d453544da0c07f11c5062caf1db0635334904895d06b5b64b5d51c7f559c2e0e05a95e885a45b359a5ea27b9c8b83b6381ed9695524c52356f324c39d SHA512 0e966cc098cbabc3f4335fe93d3ace158bd243e4c1c38fd5f81bd71fcabec4f1d7770ce33e174c04590a21b659416e4cca5db05b888976ee3a1a521f4d195fa9
 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
diff --git a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325-r1.ebuild b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325-r1.ebuild
index 5da28cacc4ee..f3313148fcb3 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325-r1.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="iconv"
 
 DEPEND="
diff --git a/dev-libs/qqwing/Manifest b/dev-libs/qqwing/Manifest
index 568548e58ba1..c8d549212400 100644
--- a/dev-libs/qqwing/Manifest
+++ b/dev-libs/qqwing/Manifest
@@ -1,3 +1,3 @@
 DIST qqwing-1.3.4.tar.gz 352060 BLAKE2B cf78a3d06c529ab1d47739ee0914e268fe8375d5dd7eb73a05ed91fcd7231b0f2103ae2490a8edf438ebce5ec77457f2686338edb61c38a804af34df78763c31 SHA512 6762b97d7595e7831edb80d9fac06ca784c6dfb6c5717e72adaac6973ec94bec417806f8ae4b80ed95b876388c8c1a00906b0fa8653a115998c5170db25aab0d
-EBUILD qqwing-1.3.4.ebuild 370 BLAKE2B 6ee3869e0d81de63a936e378dc800c8afa6ba73cc54bc35a320c03355ecae79f2746031deb724477fdb2ee1b3d90f86ec4ff13744e19d4b3850bdc741e382c3f SHA512 cccd1ca6200df6995b9c2e59e80f23700d652acee1168a5b3a867ae33cd05a7fe8a95234f42ab1162da3f9afae0f95cc6ca4b34d94140740cfc3b3741361c88f
+EBUILD qqwing-1.3.4-r1.ebuild 370 BLAKE2B 6ee3869e0d81de63a936e378dc800c8afa6ba73cc54bc35a320c03355ecae79f2746031deb724477fdb2ee1b3d90f86ec4ff13744e19d4b3850bdc741e382c3f SHA512 cccd1ca6200df6995b9c2e59e80f23700d652acee1168a5b3a867ae33cd05a7fe8a95234f42ab1162da3f9afae0f95cc6ca4b34d94140740cfc3b3741361c88f
 MISC metadata.xml 344 BLAKE2B 7ccab937a954c7bf6a62964af9cf5da988d468441feea89de8c82870e4d414b8d916e63db83e026886c636d5d204d4415581a84b408e8e453293285e94d3cd38 SHA512 d3bb75e12aee5f1d3126b583c178048d365f28bb219953e32d20b1b59e809d24e916ae81617b16f3e31a5ba9f9ddd87cac9fa20e38a65d757fa41184f8f51640
diff --git a/dev-libs/qqwing/qqwing-1.3.4.ebuild b/dev-libs/qqwing/qqwing-1.3.4-r1.ebuild
index 927b08ed0527..927b08ed0527 100644
--- a/dev-libs/qqwing/qqwing-1.3.4.ebuild
+++ b/dev-libs/qqwing/qqwing-1.3.4-r1.ebuild
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 0805299f211a..4f99b5ecbd4a 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,8 +1,7 @@
 AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
 AUX raft-0.11.3-disable-automagic-check-for-lz4.patch 2819 BLAKE2B 132e07bd4dc447bb67b2521c89e06c697dce9554d1f2b737aa460a22be9f7a2999f39ebd1b25f81863ebd764ef127856dceeadcb2a12aecdb01cf01f1cc22bc0 SHA512 9de7af38c778366e63e03991fa147844695dd0b4cd2e62559c5f82a0a2e914abf1bab5b905ad3cf26512d6d48670bfdb40a0683ef7dd1383eb0229f6718a70a4
-AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
-DIST raft-0.11.3.tar.gz 329571 BLAKE2B 08b145bfbcc26b50f69c550599978ed365ccbbd021b9c4699784c08bd7e0f17f366b1709c22df1a467fbdb524668a753f431744419da8f18d57ea52c5b33de38 SHA512 7d1a7455ff8d58ed1f3d259cade1c74fcb22732a55242dcf761cc6554739c0ea1c462aa02591d28d8fa2b343b23e6261a5e15d02e2a31467969b7d9f9f3b5e92
 DIST raft-0.13.0.tar.gz 332490 BLAKE2B 8d14e07b12d4f5a7eadb626b72a90b4defffaee26804a982f257ef80f75ff47ccf434a7dc6b62f36177120cd12ce8c772a6f293e9ad48c61df277b10c0df1854 SHA512 1d65f21ac85deb36a6f8681bd506656a34994164ba51f7c23aa523673024dacf5616bbb3f706c0da4df38c0cc1a00b330459209c80d404545686525da2916afa
-EBUILD raft-0.11.3-r1.ebuild 1095 BLAKE2B 075d92ab1d95dacff2027da82952aa8f252eeb43b8ff3c4aaf0c5c10eb8df3f810a96c456dd7963ed04554f59081b3f864769bdb2e4e61003dbfe38e2e8e492d SHA512 31a64647fc3e944d2f76ec095fde4d5c2b28995bd68e6517538563c8d7b026bfd9999e68c75d1872970d30be1b3a74696d84a9086942ccf067ff3ee44194c76b
-EBUILD raft-0.13.0.ebuild 1037 BLAKE2B cae0c8c010c63a57dc3ab146d043843b5883ebbeb818591a2ed9bbbb286f4feb3e2bf5abd2b169853693819777d9f038331b0b54c67809e04a5d668adf8edfdd SHA512 8539b565f69c8254c06a1ffa85565f104af75a9a7fff634e66baad0b499c1c3a35507af75ba1e038c72e736a5f13541aeeb4f4b8d0ec8f6e79715fdfd9e05d56
+DIST raft-0.14.0.tar.gz 336032 BLAKE2B 22f03a54ba99cbfd5564f5b730d42dc7ad786071daaad4928b331d0d740c9289fd4a3226a08a67b8e40b62319613173d9d8b0df5b40577a68f876f6015a53f16 SHA512 c8b6b6428d65a7d97e74cea2b41ce443d90741afe71c3c173f2ea3c84782a892f20158f6635a8eafda6d4a729ba001ea991640d43ff6cfafdacb1b607104de3c
+EBUILD raft-0.13.0.ebuild 1036 BLAKE2B 7efcc055596a4c780584a745324afd333b4fae36e474befd70b906f0ea82835fad930f38bf38951b56f0f9c349e8cc2226d8b6642b70ba2bde5fe5850a3149fd SHA512 5a00ba7613d4bace49eff5b6d9a64c66986b72f568b1f42d455afe69e1b21200c6f37f5fe594058589950af11feb3fd4441ada0e3f0fd55b167bb9dc6eee945d
+EBUILD raft-0.14.0.ebuild 1037 BLAKE2B cae0c8c010c63a57dc3ab146d043843b5883ebbeb818591a2ed9bbbb286f4feb3e2bf5abd2b169853693819777d9f038331b0b54c67809e04a5d668adf8edfdd SHA512 8539b565f69c8254c06a1ffa85565f104af75a9a7fff634e66baad0b499c1c3a35507af75ba1e038c72e736a5f13541aeeb4f4b8d0ec8f6e79715fdfd9e05d56
 MISC metadata.xml 813 BLAKE2B e2ee68230ca6938ecc09c7cf9a3c4acbe961c1a6c44cfc5521f5d1fca93d7b1a62c1bcf10290207288f3e5c04b8ecebb7d4ee4ba2b1a12326eb58e80e0276ee6 SHA512 e163b16c585f79757c35d5a84ed017cd173a40fdef5ea736f4a01c24ffc3db2f5f0d69486c58217d8910eee47757da5da23e8353f4254990ba13c2cd56ddaa57
diff --git a/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch b/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch
deleted file mode 100644
index 7a22682c2e03..000000000000
--- a/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit e0948518f6eedad85c7705fb3963cfdda3627d8f
-Author: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
-Date:   Thu Oct 22 00:19:31 2020 +0200
-
-    Always skip init/oom test
-    
-    The RPM package build in COPR is being executed on a tmpfs which
-    always results in a failure of this test:
-    
-    init/oom
-      heap-fault-delay=1, heap-fault-repeat=1                   [ ERROR ]
-    Error: test/integration/test_uv_init.c:156: assertion failed: _rv == 1 (0 == 1)
-    
-    Instead only for certain architectures we always skip this test.
-    For more informations see https://github.com/ganto/copr-lxc4/issues/8
-
-diff --git a/test/integration/test_uv_init.c b/test/integration/test_uv_init.c
-index 8c9b5f7..57db7f3 100644
---- a/test/integration/test_uv_init.c
-+++ b/test/integration/test_uv_init.c
-@@ -144,10 +144,8 @@ static MunitParameterEnum oomParams[] = {
- TEST(init, oom, setUp, tearDown, 0, oomParams)
- {
-     struct fixture *f = data;
--#if defined(__i686__)
-     /* XXX: tmpfs seems to not support O_DIRECT */
-     return MUNIT_SKIP;
--#endif
- #if defined(__powerpc64__)
-     /* XXX: fails on ppc64el */
-     return MUNIT_SKIP;
diff --git a/dev-libs/raft/raft-0.13.0.ebuild b/dev-libs/raft/raft-0.13.0.ebuild
index dfebdcca2626..e0f234b3f1c2 100644
--- a/dev-libs/raft/raft-0.13.0.ebuild
+++ b/dev-libs/raft/raft-0.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="lz4 test zfs"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/raft/raft-0.11.3-r1.ebuild b/dev-libs/raft/raft-0.14.0.ebuild
index e0fa1e7d55b7..dfebdcca2626 100644
--- a/dev-libs/raft/raft-0.11.3-r1.ebuild
+++ b/dev-libs/raft/raft-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="lz4 test zfs"
 RESTRICT="!test? ( test )"
 
@@ -21,7 +21,6 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
 	"${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
 	"${FILESDIR}"/raft-0.11.3-disable-automagic-check-for-lz4.patch
 )
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index 84fb2b3403b9..4fc603ec4784 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -4,6 +4,6 @@ AUX rapidjson-1.1.0-valgrind_optional.patch 814 BLAKE2B c12e3571050eb63da3e02eb0
 AUX rapidjson-1.1.1-valgrind_optional.patch 868 BLAKE2B 39e46efcd4ebea2f85b40531e46bfcf23eed894e93b6fe4cd8fcb7ac8c614d5e6e98c21c17304f3cf6c7c6415eadaa32b4c496f559f07fd56870820a027dc2c1 SHA512 a71016e4dc17d40afe18ea84c915ff52ce78a28c8e9a0d10342db34954993e2d65dbff7059c6683837334414c73ade934c805d0fa3d758358f7b236d1b57371d
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 EBUILD rapidjson-1.1.0-r2.ebuild 1196 BLAKE2B e1f709ff94d5cf7cb1c581cce49415cc76e221f8a2134e5b7c3f2ececd39aa7ac86e945653e331523675c02ace4e1e2256221d700141815a83b61b8fc94ca01f SHA512 e4fab2177decc21c90598409eda202ca59ed4b2c8e99e920ec8ecab72c2a5f6aa30cbd3064af6ddd6f7e388f8523a61cb38d3ecfd63a6af02d59b3aeb02f1189
-EBUILD rapidjson-1.1.0-r3.ebuild 1394 BLAKE2B 27e330e27b9a2945d489b0dfd684c026f56771dea1b0130cd49e7e9b6b820ffa6428db756d92ceb700391d1926322d3e0084cce453e357ffa54adbd200846f2c SHA512 966a30312d91dcdfe512e8817a501e597ce937b592f0b0bdff846f06e5744ef9ee5aa066c4789de2d256db258163d61461324bdb73e951644e63e72c4b9639c3
+EBUILD rapidjson-1.1.0-r3.ebuild 1400 BLAKE2B 0ded67bc026547dbb0ec4e6723bf97299912c7b333be7d870103a2f55e986214a1e0061ff68eeb5260a50c40873f0d0f63967316c5eac91509d4012a45cc2a6e SHA512 3a850c60cd93864b1d5c08162d8c2b3ca7d50fb76c408036529c48d34fb70811b74abde18dbb3786a77ea207767b2a8c838b6c702ab91b30ed8950643ea3541c
 EBUILD rapidjson-9999.ebuild 1372 BLAKE2B 63ce9fe9810b4634c309033bbc6d1fe8dfec760054bd729dee5fd09bd3fcade93b01e404bf8668dfd9ee796d5ffc1c7834b2b1d67af8fceeafa2a037a776c640 SHA512 e73764145a92116b5bc65d4c336f775e4ab142b560d9ec26b9a63b41d688ac4579887b8da9b720142ee05401d9460bd4c9aac89db01bb2edf6f23a341a11a15e
 MISC metadata.xml 396 BLAKE2B d177f4924bccb6e3900f0c431d7924334b0b22fb29463afbaaef3f0277aaa762829d1967c5159fee70785cbd650e00386e7085e74ed46f5636a4566f21247e6e SHA512 29f756f76db339ccf8367aef394335a2ffd158f83d6f6babb48ec3eda39b078125b10741e8cd5e87ea136bac243b0df77816efb7ae1ce01ee0507ed0c8e82ae1
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
index a73c6599b674..a58044c99310 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/rapidjson-${PV}"
 fi
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index b4888526ff60..9d21493e49d7 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,5 +1,7 @@
 DIST re2-2021-11-01.tar.gz 408934 BLAKE2B 31662b1e9cdfec67347cbe146763a29cc8970683d545965e649a5f54ac318c40cd6daf553b6098fae7024a944f73914641b05970f1274511fac6766abe6b9130 SHA512 9ea04638b7a8667fa9a9d9894c543417c86dde21a93bd4508ae8a43fdd21384092866a3f55e93249942f36488c165e93bee18c61bab3cf138a920654563b8122
 DIST re2-2022-04-01.tar.gz 380861 BLAKE2B ebb9ac6754382dc3a2b4c6ebab994678d364b83fc433e8c7b3b8ca8733503da41b37b796081cc24120801bdda8e69fbf111ccb9ddca51808129c65c622738e61 SHA512 fc3d7cc1ee6bd771719845566d83ffc8c4e19d838748e842a1e19c7564473c9a0a061bebb3966ffa82de6515346f9bbddc2d94ceb3de89233f58826774bd7ce7
+DIST re2-2022-06-01.tar.gz 381032 BLAKE2B a4cf937e0341102a3151cd1741d51cae1bdd8ab589dcd4c9ee2f51ca43b325f7604fd5e6ae85db8ddd8fcca615ade6817a45664a037baf9cd14023ae4c4a46ac SHA512 f3d5f2a3aa5eda74bc8f434d7b000eed8e107c894307a889466a4cb16a15b352a0332e10d80ed603c9e2e38bbcbdf11f15b6953cbdf461cc9fb0560e89a8ceb8
 EBUILD re2-0.2021.11.01.ebuild 1352 BLAKE2B 4ad2554b45cee9027bb7fbf9ee731ed1e8b20648613a0a980a260e60c408edeee71208c7e91d3901fc7171bdfb59eb6933b1632c0ceb48bcf0441597706bee43 SHA512 f174c10a29fb1952841a7bd30ba28d03a13fb07423d5a7343c90b04d1b4027ab6c51a57541cb0f5fab24e75c13085362ca77256ba8e47d5f4fab1680862f62d2
 EBUILD re2-0.2022.04.01.ebuild 1356 BLAKE2B cdf5159b4c76e967b204b39a882ce62c217d653b36e1bafac6ff5611817d99b0fe567014efbc347ca1f5d8e987f91555044775ace99b2128f577424cc0bf2a74 SHA512 4db1e770dec298a128b00ab8b6dc42c219a33aef680c3c5ca2af26cd18b02a140ec591d3fb11769eeaa0ef337f88685d1f6edd3873901a51a60b8831edce0f4b
+EBUILD re2-0.2022.06.01.ebuild 1356 BLAKE2B cdf5159b4c76e967b204b39a882ce62c217d653b36e1bafac6ff5611817d99b0fe567014efbc347ca1f5d8e987f91555044775ace99b2128f577424cc0bf2a74 SHA512 4db1e770dec298a128b00ab8b6dc42c219a33aef680c3c5ca2af26cd18b02a140ec591d3fb11769eeaa0ef337f88685d1f6edd3873901a51a60b8831edce0f4b
 MISC metadata.xml 486 BLAKE2B d99b0956f406a1e5fbfaf9a8516aaa86c328829bbfd6b4c3cfc2e925d2862e08dd31cebb730c957ea38a9b5aa84a3010ddd51760e2db8385f9b5d608b40b4d37 SHA512 e882f04350157da3e0ad7438f2c6a340853f6b589996041931f6686860d61c861e003692f5df616282e498c18266ded4803fd63760c2457dfbd04ca1b5d93391
diff --git a/dev-libs/re2/re2-0.2022.06.01.ebuild b/dev-libs/re2/re2-0.2022.06.01.ebuild
new file mode 100644
index 000000000000..c566acee7cdd
--- /dev/null
+++ b/dev-libs/re2/re2-0.2022.06.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/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index ccc9ef7378c4..e1e88728310f 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -3,4 +3,5 @@ AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc8
 AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db9411531b827d25aaaec721b6756c4a5503179a477fa3d452fff4deaa1fdcaa78c66f5cef0b4cb0d36e06a89050e520a2e0fd36694121eb8a71669 SHA512 406e0d0d97c7c181a16c2a72ec291582ada1c1dbec1cdb53ca62ec73f954a1116462b97f3cf85ada4adfc4ebff35081ac4ce0ce9e2b7155e61402dbb64f57c20
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
 EBUILD redland-bindings-1.0.17.1-r100.ebuild 3925 BLAKE2B 8fcd8814a2a5fe2bd4a2e3f95b25686eb4ba952c13b0f72e054d48c79717d5466d2b434dfb97e8a908390291d04d1ba742db70064b715852a8946d9dfcdc3e88 SHA512 12c5bfed035846bbd56941c709bdc9b60cacf35e55a53bf521a51c76dd8ebafce3e21da2897d3e89cd202358c0d3a601c0ce543743130a7fbffa7726286d2c37
+EBUILD redland-bindings-1.0.17.1-r101.ebuild 3790 BLAKE2B ad5c2dd47882aad04b3e5e69538ef10d02ea7901aafce9e99fbb874a4fec88c4e28f18f9156a7a677297078f1a128206866d4506cd118ce13131d3d23ff79739 SHA512 84823b0671a03c55e23986762d6722d1cd2e4cf8ec87406dfb82cc0840d3a684a21df6c25b3b645a2faa0581ec5f851a307f0e72f72544de67e9c3ed23ab229b
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
new file mode 100644
index 000000000000..169122ec6cd4
--- /dev/null
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r101.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+
+USE_PHP="php7-4"
+PHP_EXT_ECONF_ARGS="--with-php=yes --without-lua --without-perl --without-python --without-ruby"
+PHP_EXT_NAME="redland"
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_SKIP_PATCHES="yes"
+PHP_EXT_SKIP_PHPIZE="yes"
+
+inherit lua php-ext-source-r3 python-single-r1 autotools
+
+DESCRIPTION="Language bindings for Redland"
+HOMEPAGE="http://librdf.org/bindings/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="lua perl python php ruby test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="sys-apps/sed
+	virtual/pkgconfig"
+
+RDEPEND="dev-libs/redland
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby:* dev-ruby/log4r )
+	php? (
+		php_targets_php7-4? ( dev-lang/php:7.4[-threads] )
+	)"
+
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	test? (
+		dev-libs/redland[berkdb]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bool.patch
+	"${FILESDIR}"/${PN}-1.0.17.1-php-config-r1.patch
+	"${FILESDIR}"/${PN}-1.0.17.1-add-PHP7-support.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# As of version 1.0.17.1, out-of-tree builds fail with:
+	# "error: redland_wrap.c: No such file or directory",
+	# have to copy the sources.
+	use lua && lua_copy_sources
+
+	use php && php-ext-source-r3_src_prepare
+}
+
+lua_src_configure() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	econf \
+		--with-lua="${ELUA}" \
+		--without-perl \
+		--without-php \
+		--without-python \
+		--without-ruby
+
+	popd > /dev/null || die
+}
+
+src_configure() {
+	if use perl || use python || use ruby ; then
+		econf \
+			$(use_with lua) \
+			$(use_with perl) \
+			$(use_with python) \
+			--without-php \
+			$(use_with ruby)
+	fi
+
+	if use lua; then
+		lua_foreach_impl lua_src_configure
+	fi
+
+	use php && php-ext-source-r3_src_configure
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	default_src_compile
+
+	popd > /dev/null || die
+}
+
+src_compile() {
+	if use perl || use python || use ruby ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl lua_src_compile
+	fi
+
+	use php && php-ext-source-r3_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	default_src_test
+
+	popd > /dev/null || die
+}
+
+src_test() {
+	if use perl || use python || use ruby ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl lua_src_test
+	fi
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots) ; do
+			php_init_slot_env "${slot}"
+			cd php || die
+			${PHPCLI} -v
+			${PHPCLI} -d "extension=./${PHP_EXT_NAME}.so" -f test.php || die "PHP tests for ${slot} failed!"
+			cd "${S}" || die
+		done
+	fi
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	emake DESTDIR="${D}" INSTALLDIRS=vendor luadir="$(lua_get_cmod_dir)" install
+
+	popd > /dev/null || die
+}
+
+src_install() {
+	if use perl || use python || use ruby ; then
+		emake DESTDIR="${D}" INSTALLDIRS=vendor install
+	fi
+
+	if use lua; then
+		lua_foreach_impl lua_src_install
+	fi
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete
+	fi
+
+	use python && python_optimize
+
+	if use php; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			exeinto "${EXT_DIR#$EPREFIX}"
+			doexe "php/${PHP_EXT_NAME}.so"
+		done
+
+		php-ext-source-r3_createinifiles
+	fi
+
+	local DOCS=( AUTHORS ChangeLog NEWS README TODO )
+	local HTML_DOCS=( {NEWS,README,RELEASE,TODO}.html )
+	einstalldocs
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index d2909d74cd97..24a958f4755f 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,6 +1,6 @@
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
 AUX rocr-runtime-4.1.0-cmake-install-paths.patch 4031 BLAKE2B 144df57dc9fa014779d6490217ded97511228d88a7e8864e4eea2870f8b48ec361b4a16ca5e3571ed27a1f91e32d07d694d93c3a2075c60af626c57112ae4e86 SHA512 28f6b3db96df74ede81219005d5d62194f2d41b0628de92202a4293983384390e68c9da1005af86b2b2d2f19f1de6fc2ca4ac1f4dcf9358f66ca519c894f2043
-AUX rocr-runtime-4.3.0_no-sqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca
+AUX rocr-runtime-4.3.0_no-aqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca
 AUX rocr-runtime-4.5.2-cmake-install-paths.patch 2683 BLAKE2B 9f4c3e232e81e7544e77c7388c5f555bd564e4806814d40012820023c4293242bdbbcafb788141e437fdfa6a3269d241710d74587492a657cc80fcb8f9cb29e4 SHA512 62165ed65c9d26194bbd4c3a9e1dae6d0ce2b8d61a6d421d5800e2a9a885e94cde648290090cc3654bf8b4a4c5263899c52e556d1d42e08d6d75f4bf00860928
 AUX rocr-runtime-5.0.1-cmake-install-paths.patch 2744 BLAKE2B fbbecdefbfabcbe4cd7f029e10d6abed94b492f94157839336adf83e98efe5c0e93dbb20856ca6adab32cb315bbd7b6c397c8fc48b66ea784cdbb3becb5f718e SHA512 db7ee8b87b526991a62c3cbfd385e85d27e05ba9a7f4726e8060d7ad29917e154bdcd0715e61a08210dad4b6112c731dfcab9e9f7e809b74da2f74c62a1eab72
 DIST rocr-runtime-3.10.0.tar.gz 691857 BLAKE2B 68403081180fe1aead570f8055f91d13083516766afe6c9fd18d7619162cc12fa6dd0ec824ffdc44832d1ab7e823ac2cc399b7cbb4e603f95db54e492de152c5 SHA512 9ca7c7a22ea2a35437aa1a23a331c36684ada1af0f389f697bd6c1e35c4f9493b851d7e7176a0892be36d3d7de93000f7db37e3d2c109fa6c1932851c3bd703b
@@ -18,8 +18,7 @@ EBUILD rocr-runtime-3.9.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37
 EBUILD rocr-runtime-4.0.0.ebuild 1530 BLAKE2B 065d3d28d95d8832f8630496e023b264b28e25f7a99d253be765251047472a3bd4364cb0bedce6b7025221e3b6e92ed1964713884f08bd595017597e8b904bba SHA512 099d1810b5ea7d2fce49e4914b0f4453fd7c202dcee62a2e83875f7e0b47e59c6741e6c21a648f422b6d4c28aa5ccd18d6aa93a6b32d10705b6fac4f5aa68151
 EBUILD rocr-runtime-4.1.0.ebuild 1648 BLAKE2B 6e654ed96e97b9a60e25db92eb8ab80ace4d773dc7c4082adffc805f20dff9ea8b0b139e421df625a99764f1b61d22700864e25296011848bb91f8025b373362 SHA512 abc3ab62999a8e3bb6c6d0616e528b3e2c3914a67e1b40548d71ff31a409ed53f81dfb2c9e0dfdfa23e9d5ae8ca4f092d575bb003acef8695d373dd7fca36c01
 EBUILD rocr-runtime-4.2.0.ebuild 1502 BLAKE2B 6f7d48bc7bcc89ae585b202ad2bd4b523142fec9d00418efa297248548867bd02ddff6812fb01572d03bdb70438837437d777384a78e706d1eb420a12d61eae7 SHA512 df94dcb2549a9da7048b7a9d22ec4c4e5a617b85e95d0f5d576a770ee5f1ac3d1a71504e9b1a92752904568cf1dd11ec0fd8a35b11d17d8329c07dd0aae762fc
-EBUILD rocr-runtime-4.3.0.ebuild 1471 BLAKE2B da97efe7c43ae47cb314a285fe6ba4cc970c0f166460cf09fcee567b15d378042603fc8f37ccc6b71d5d8daf9629b340aaf4a5e9c8a4c2fbecba1a26b8eac13f SHA512 46f6a6d34dba469a8aee43d2c543347f9bb43433871cb34c5a21a520de2fa1a78b1e3cf58e9fcedc157674c1c96a31bd04afff1b7d7d6289ae98d283774c9742
+EBUILD rocr-runtime-4.3.0.ebuild 1459 BLAKE2B c9542e8686afc2718d468b363ed926547cc32cd2389c344b6e3c621bd3c1007239f6e9434df645054daccdfcd78f4ddcc8a78156019e4c604a7ee8a88866a28d SHA512 74e81b3beed9e9d564f3ce006b235c60b546adc60701303c3f95e36fb00f4b81b8fbfc4867a3740b4ec368052e68f4eca4b4847f97d858fdf72c5fffa8669625
 EBUILD rocr-runtime-4.5.2.ebuild 1414 BLAKE2B 0c0e4b7d3e1d643e5fda6d3636789811e6a10dc3e990a84900643c0fbae667b2f9ce0dec2c79b801b2730acf83a5ba7de025bab6b0b353363d177891f2884591 SHA512 a1967d10a99f3dfa250f9cec2a244b5e670c80a0c895ee92a0feee00f600428ee7037465ec09b99b15437158c9f69d14d2bfa249cd5dfab7689015c43468b924
 EBUILD rocr-runtime-5.0.2.ebuild 1378 BLAKE2B 31699837b204a3e5b21a237b20f89d766f195f235dade08a194a1a3be9eb60a4c17ea013595bdfc5aca1faac9ea4cde8022887f4787fffad98ccfa9844184eab SHA512 f23c922627b50b0ad5c6482d3b9022390ad8715bf4f39e6317faec73c9b0e1416caae7f4e4828319c7873537db117690b1b567c575faf3b2e993fdcce122cfdf
-EBUILD rocr-runtime-9999.ebuild 1628 BLAKE2B 16ac148adea537c587db359add7d324183b6ec4039f59d1c81905db332d37a225e84e5cd0f7b370f994637eda0698535263e61d3ff62896f5c232e7fc1d11e95 SHA512 2cd282faa8ef6417029ff002d75ac2c7fcff602239b82246496daaeb587b663399ec9e4250ed3f5dd922318f1ff83aa36448e3481766661602a3ac283494a199
 MISC metadata.xml 515 BLAKE2B ccb566413bfb5e7027d1596b040f6c957dc8d58fc413859c4a08fbd484ab16d536948bcf24cdd1edd5bdc8a4951b5abe6adbb3da6fde37e5a9ba1bdcfd312827 SHA512 6d0f0ab69b8f04a9106d71003f17c00e693b42c03aa5c430ebb03f7ffb3ecb8f4b10128fd22462692b97870c23e85aa3f037433fa65c55a342d64038f0db5a93
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch b/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-aqlprofiler.patch
index fdb34b75b2d2..fdb34b75b2d2 100644
--- a/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-aqlprofiler.patch
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
index 2be1fb23feb6..fc1b4b73bd0a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
@@ -19,6 +19,7 @@ DESCRIPTION="Radeon Open Compute Runtime"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.0-cmake-install-paths.patch"
+	"${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
 )
 
 LICENSE="MIT"
@@ -33,8 +34,6 @@ DEPEND="${COMMON_DEPEND}
 BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.0_no-sqlprofiler.patch )
-
 src_prepare() {
 	# ... otherwise system llvm/clang is used ...
 	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
deleted file mode 100644
index 38fc7decb01f..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug"
-
-COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:=
-	>=sys-devel/llvm-roc-${PV}"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-
-	# ... otherwise system llvm/clang is used ...
-	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
-
-	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
-	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	use debug || local mycmakeargs=(-DCMAKE_CXX_FLAGS='-DNDEBUG')
-	cmake_src_configure
-}
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index 3440254fee57..6ec54ea0916d 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,3 +1,5 @@
 DIST sdformat-9.7.0.tar.bz2 699483 BLAKE2B a7f831fa42cc6371afaee47876bee5d2b8e9ef3b05a9fa8281e1746d0b038fb75b0f96d5e84b615b114a25424de65be08dbea052a53813d01b07ca8a1c0d08b9 SHA512 8b05dfaa47dea7cf55dafbed828b3c361f1c13f368fd4ac50cd35c1be859e401bdbd500a79286f7b8b0e6bac04f92a4c406e910a22aa1a9583aa8ffb660c1f89
+DIST sdformat-9.8.0.tar.bz2 706107 BLAKE2B d4880b8b26bc792f7932f92238fea9e583284fb95fd139da2755590f795bf8f00d2087b949ff44df7c04f7e3e81218f7a7f5643c65164e7805b76626ac13de4b SHA512 090e654f442c26d0a930960fa603ab5e58a28d8cef276ea75f4f63cad29c249c90045e76a2e081b2f90bc569b80abee086efe7598c138fd81b387535debf7e6c
 EBUILD sdformat-9.7.0.ebuild 808 BLAKE2B 00efeb0f8266d762d3d509d5d3b2257117dc7757e788218e30f8096fdcce3ff57da627e90e75b09d8f2bb41f51d236b147083cdf5149ff708e4680ab441a992a SHA512 fcbc2147f6b49eb76016029d7fff1ad1a6c77f16d31cd5592b46c18e143ff518027ac257dd8a3a7ec0813a32c137a438b6f5020d1a7d44680b0418fa1ced0330
+EBUILD sdformat-9.8.0.ebuild 808 BLAKE2B 00efeb0f8266d762d3d509d5d3b2257117dc7757e788218e30f8096fdcce3ff57da627e90e75b09d8f2bb41f51d236b147083cdf5149ff708e4680ab441a992a SHA512 fcbc2147f6b49eb76016029d7fff1ad1a6c77f16d31cd5592b46c18e143ff518027ac257dd8a3a7ec0813a32c137a438b6f5020d1a7d44680b0418fa1ced0330
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/dev-libs/sdformat/sdformat-9.8.0.ebuild b/dev-libs/sdformat/sdformat-9.8.0.ebuild
new file mode 100644
index 000000000000..4a78444096c6
--- /dev/null
+++ b/dev-libs/sdformat/sdformat-9.8.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# subslot = libsdformat major
+SLOT="0/9"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-libs/urdfdom-1:=
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:6=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/ruby:*
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# get rid of default flags
+	sed -i -e '/_FLAGS_RELWITHDEBINFO/d' cmake/DefaultCFlags.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_INTERNAL_URDF=OFF
+		-DUSE_EXTERNAL_TINYXML=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 6a19f282465b..5a8eaa75a1e0 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,5 @@
 DIST serd-0.30.10.tar.bz2 586386 BLAKE2B 7f84b425a9eed36c5b59b22b8fd2cb9139a3de2bd1a47f92fd9888c433d931dcf83f13c2460d821c04f4244a79aa4330ba973017508ecb5f4564e78ae45b9b9a SHA512 ed7b49abfd3dc3a724b047f5f0cd07b811596330c96d91c0ce90540440f03260e05daee76c3ccccc3d4ca39afbbd4f3d07decbb601730e90c133a09c640c0006
+DIST serd-0.30.12.tar.bz2 594475 BLAKE2B acd065613494f05d1b2016c2097c1efbd1ebe3a5b901fac3a60d27140fee5c51ec17314df7ac2d3ad89d852dcb016dcf7255271f506f900445ce275335ed7d01 SHA512 c330648eb2c947a6d220f42d0af63fd2744da496301483e58be3cda387da166711d6acd5cee2df8cbb837ab450e1802b3f9a0a2973e5ad6d976b69b863aecb7f
 EBUILD serd-0.30.10.ebuild 1219 BLAKE2B 0837bb3d8169f3cb341e26d3c174576086883dd84af5e4dd7c3de3ab6e559c2871673febf34a1c3cc7331311ea513cbada5d66b7a562ce7bd0c6614edb5f4a42 SHA512 7d824ed149a697a7b08892d46c04bbc8a3cdaec1b3d7944a6815db2eae684252cbe95288834383331697f03508fd7b5fe71ddb1dc7a00eba4f0cd4d4a5c8fdcf
+EBUILD serd-0.30.12.ebuild 1220 BLAKE2B 3576f15f7889bc691aa3d3eb6725de60e6a2c51a7a6e5f7f4db9aef1bb6a8f95d611aa80988ebda6324d9c7c21aebecbd472f6fa39edb1ad427004592e8801da SHA512 efc5a4981cf328f846ff7f0c46c7de1c8eec42929d48cf307e76fc3c9a41b3c3e84e04a024b3b751bb6b9a2257ff4c2433120a548b770d730e155569ece5fae2
 MISC metadata.xml 659 BLAKE2B 7d8a07b42b1ca5f3f178fbd8e465d6e594e1005510ea7aa999b4d4435d33269ad7a45a9fc6b70a663895824379a1ac2c388dffabe3d69e877cd2a92b7375b63f SHA512 0d431ac490c2b20d6da92afd0c2e663926bcaa3e1bb4273a0178e969a619988e25184939bf6424c2ffb7ab90813ffc6941534b9ae72d59793b6ad1f4aa15a034
diff --git a/dev-libs/serd/serd-0.30.12.ebuild b/dev-libs/serd/serd-0.30.12.ebuild
new file mode 100644
index 000000000000..a718e7b727d0
--- /dev/null
+++ b/dev-libs/serd/serd-0.30.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="http://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+)
+"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index ee6a8297e7dd..3a7da033f868 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,15 +1,18 @@
-AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676359cd5c02cbdc5c97d3645c627667b6986b84bd53285103b50d152d663469623d973ca6f1332fc6b554412ba57be9395dd17a016e1 SHA512 00814353defbd7b77a88ad67faa151494c203470cc4627d8777f8dad7e5918e7650514b76dfb3007644a0864fc848cc30bd71aa61ec86b93bb9b66417da3d961
 AUX simdjson-0.9.0-tests.patch 599 BLAKE2B ac05983a3e8b1396554a4c962352afa39fbb46c53aaba95dae6bacd8c0f9b270499be3df7b82464d6f29a872e0bf9253c3d1a47d3d62727adb166388e2944682 SHA512 6e0220083dd6fcc1426a3d0b8250e8249e83868963e55e7e31221e3df2e2469794d73a59e3068722d20fb5bfb33c9d49ba5c9aa18028c8afd8a8d0d066f29a11
 AUX simdjson-1.0.0-dont-bundle-cxxopts.patch 611 BLAKE2B 65671f33b25e9569de8a938801663178290f2627019936d82986bd94a57517edded5fa0e1183c96ca716b512bde2aae54f6cacd75415e054db74205e0eae9559 SHA512 12f9626b375eac67f7ee17ded553653cffcfdbced9abcb7ab15f51ef731477e707304cf1dc0d5e40c79fc3faeafe644f23e81cccba8b6f6408190b71dbf4eb97
 AUX simdjson-1.0.0-dont-fetch-data-tarball.patch 658 BLAKE2B e15a9d8186f422f14e66bd42f07b72441f69b6d6c1caf2536f08f56445f3b869f3a97d49e96e12536e5e86fb1f886233724abcad723ccd19e7563c9d5450fe79 SHA512 5e6aabff62a58274ae058ff8f0057569048578207914c9a983ce0c51bd23eb77e272d0c2f92ff7b164a592569fbd677327f83955700967b71e8ada7f1d103646
 AUX simdjson-1.0.0-install-tools.patch 933 BLAKE2B 1464f6eba0bc747dc24fc94ceebefdf52fbdd147293fce80a2d3612c0130a4c0a68bbc7dcad5ac1dbe2f1bbd4b6030ade7dd78717c80be74e497872fd66f0037 SHA512 ba399139793ac9b8be76eba69844d74c931c9edaa20adf42f21353bb242ec9d5e093c9cb26e36542b7b8cb12f75a5a8906992b6569c990af77af189318c67ba7
 AUX simdjson-1.0.0-tests.patch 383 BLAKE2B dc3dcbc08ec78608a94e5d04ff217a774e1c41d45f8c0c0135a52bdb2e217bf15cf9b16b35f9dbf77fc84353f904bdeaa25bf7068e93a452203dd7e9b3e40932 SHA512 95e6d933c0b673b26496aada4bca7dddd386617733dc23b15e6bd7f8275a24c206d149e95159985941257b49ae633dc8c340bec034595f3f781ed81accc5f9d9
-DIST simdjson-0.9.7.tar.gz 7956250 BLAKE2B 2fa04be699eb5573ac17db9b476ded1853cfe45c0993c9303b70bfd0e8e4343b69e4a02f21dac35d2c0255826bfedf41123fd635d36d48a08f74b28b5a6536ce SHA512 6f4ad854adc2b932f9926610cdd28ddda7fc1776b84a224adb5b337f81c92721bd11c8ab180897117891cdefe9c1ef14b9f062c9a1a2ebc5b5582c29cb656bf0
 DIST simdjson-1.0.0.tar.gz 1546728 BLAKE2B 6b70416404776b4fcc30cd3ab07b8048899bbe3497af779504a685bc2459424e82bd40bf100d7ed8ccfa05e871a0a1edd9eebd11294cdc3d1780797d7f79ba1e SHA512 dbf8abfeec5c079f4d87e8bf31d1af27601f7f0578ebb8ad28a25f496b4b771b68a75f9a11f61706c539d54c36a493a2d2819bd15427c3b7f7a0b36811177f17
 DIST simdjson-1.0.2.tar.gz 1551616 BLAKE2B 534e312de977b82604595ccf889348545ed355fb9cfb6f618d42236122578f6102ce7bcd31204c3013dbeeff17c35effaff62531a7e17e5e83ac07150b1456ab SHA512 04a3bee2d847680aa1f55115007ceec01652bebb8d5187cfbca0af81bedff355cbac949862a82e3060071da1a58b62d5b028bcd91562b962756aa5cab614f073
+DIST simdjson-1.1.0.tar.gz 1555845 BLAKE2B 6dfd4e938b9f1f6a6314f39929b74a7e822fbb37510914eb3db0660b9bbf68ef0b2fb4c45aa2e1246f6530d3848d0055220d4c5ead3093f97956a6154b22a899 SHA512 f8718bd039e1a25f0b95880b957c43e6eba6eada6bb7f58cedde37669a46b15b3ff9f4c4ea775e1cf949657642ef0472fa8bac5bdc98882df63e7f292fb5a723
+DIST simdjson-2.0.4.gh.tar.gz 1612055 BLAKE2B af60f4ae6780eb4068ac85c2d6784539b14fad6b7871c091f2ec3dc4f8cc9add8510f4d92a8db6ea305a1c2cc6919c8f8604d31d4e939677f3ed121b53891c24 SHA512 5d993939aece8555dc7fc5d63be14103af4ca164fb0cd53ac96578ed8a9fac61f974c247544ad007710c7a710bfaea7ad94098a143c713097237cd47c7792463
 DIST simdjson-data-1.0.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-1.0.2.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-EBUILD simdjson-0.9.7.ebuild 1165 BLAKE2B 453e53adad33e3475e3a1a6afa87972896dc4c8852da2c44475de102bc8b21ca3e95108896a27094c251600c1f39602279f5e6e522c9cdecf38d34d7341bc734 SHA512 33055dcbe20f9c060aaef86959b54439a9001bf45526437d30d03af17cc909c1155393ff27581b5322e2b4f1865acc95dba12f191e6c9c9e0c0ba55b398a90e2
+DIST simdjson-data-1.1.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
+DIST simdjson-data-2.0.4.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 EBUILD simdjson-1.0.0-r1.ebuild 1835 BLAKE2B 1ee4777881353dedeeb986d5d3cb309cff58353b71ebe97a2bcfbf209c53e29f8dccd1780307248f310370c8f4b2da9f47311bff3a0abf1fddfa72e4c204a8e3 SHA512 39815d3422d6fdab49d9684295c48ac84a1d1e1f68835edd89a766d809cdd857dbc5f65d5da3a41fb4a67e05add726f6bce91dc24fc2a596a8fdc7f66651b7dd
 EBUILD simdjson-1.0.2.ebuild 1836 BLAKE2B 942a16cd6611fba7763ff2bf1498eafa240c5a1cec900baf2d9f9e0c41bb41004ea491dcb2e5bff1c51265b7d4afea5bebe1b9944b91e3878cf111fc50598c4c SHA512 d0380c7e3d7d351136d95acf5e4b01577baf79fcb7a132af243bbbc99c1e5fc5c471e3322db3e7a30b31420fc7fe7a011aebbbe743725dd9fa5215518d9b45fe
+EBUILD simdjson-1.1.0.ebuild 1836 BLAKE2B 4138055e3875f3fbe8179bf6a28763f269f1e91bb72ded3ace4a7b158fe2e701e0ae7b6de4e615085d7348fa9951d3eb09cf16ec6a103279c29812d3ebbab536 SHA512 b02ed933a900e8a43a9e9bf31c50367dae27e40dce1da1f6532607a3154b53e197cb0d30897f0e40b08480afd7c4ae29531b463d5a1cb60b49f320858d4167db
+EBUILD simdjson-2.0.4.ebuild 1842 BLAKE2B f7ddb79888fc5224565e6e58203db7c22f444732d159ca55efd6a0af4617f23db7e8a7ea0eebf828ab2285dc4a6ce9b030238bcaa10c7c162313a3b0ccc21e7c SHA512 c42d70b050e1819f0e735bd06a7cf306fb3bd57328499a573f69775a362089c6eb214d5171f385384e6c66bbd6cc6df02c70c8b553d8aae322db127267a2a4c3
 MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
diff --git a/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
deleted file mode 100644
index 6a76cf83ed98..000000000000
--- a/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
-index 2c41169f..2f5d4436 100644
---- a/dependencies/CMakeLists.txt
-+++ b/dependencies/CMakeLists.txt
-@@ -129,15 +129,3 @@ endfunction()
- if(SIMDJSON_COMPETITION)
-   competition_scope_()
- endif()
--
--cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON
--        SIMDJSON_ALLOW_DOWNLOADS OFF)
--
--if(SIMDJSON_CXXOPTS)
--  set_off(CXXOPTS_BUILD_EXAMPLES)
--  set_off(CXXOPTS_BUILD_TESTS)
--  set_off(CXXOPTS_ENABLE_INSTALL)
--
--  import_dependency(cxxopts jarro2783/cxxopts 794c975)
--  add_dependency(cxxopts)
--endif()
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index f1a82be7..b1b7b1a0 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -1,10 +1,8 @@
--if(TARGET cxxopts) # we only build the tools if cxxopts is available
-   message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
--  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
-+  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
-   add_executable(json2json json2json.cpp)
-   add_executable(jsonstats jsonstats.cpp)
--  add_executable(jsonpointer jsonpointer.cpp)
-+  add_executable(simdjsonpointer jsonpointer.cpp)
-   add_executable(minify minify.cpp)
--else()
--  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
--endif()
-\ No newline at end of file
-+  install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)
-+
diff --git a/dev-libs/simdjson/simdjson-0.9.7.ebuild b/dev-libs/simdjson/simdjson-0.9.7.ebuild
deleted file mode 100644
index 9ce02457aecb..000000000000
--- a/dev-libs/simdjson/simdjson-0.9.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/8"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=ON
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-1.1.0.ebuild b/dev-libs/simdjson/simdjson-1.1.0.ebuild
new file mode 100644
index 000000000000..01fbcc889778
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-1.1.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs cmake
+
+DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
+	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-1.0.0-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+	fi
+
+	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
+	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+	use test && mycmakeargs+=(
+		-DSIMDJSON_TESTS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+			-DSIMDJSON_TOOLS=ON
+		)
+	elif ! use test; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/simdjson/simdjson-2.0.4.ebuild b/dev-libs/simdjson/simdjson-2.0.4.ebuild
new file mode 100644
index 000000000000..c4d2349ceae7
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-2.0.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs cmake
+
+DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.gh.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
+	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-1.0.0-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+	fi
+
+	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
+	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+	use test && mycmakeargs+=(
+		-DSIMDJSON_TESTS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+			-DSIMDJSON_TOOLS=ON
+		)
+	elif ! use test; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index 8682e8760b83..7ed3409595dd 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,3 @@
 DIST sink-0.8.0.tar.xz 295064 BLAKE2B 8187520979b43966a4e2d782e0ceb651c49eb25a349e2f9f2251b47978b0eebe64a98ce8c04f1854cdd05779f01c2cb68f1fa008568c1e95d292dbcd65fc61fe SHA512 008ca8355ffbed2bf89a906510aac4c505c8e44de49f445db283aa565e233e7652f2e46c5bcf37e680dec940a8c0f1525e6a8f708e1b4742db62522255c8bad6
 EBUILD sink-0.8.0-r3.ebuild 1397 BLAKE2B 1bfd9829b5b0fe000900d44dcaa6254b541234a9ce99b6cf51714e95a6abf332f599605a77327496a9d0e1e9d669f514864ff002f37de61ed77e72c4ff0d07d0 SHA512 5525bb993f5100d1a5fdad5559156744ed0ea2feb456c3887516515a13b689cfcecc6212f1b94a6cc739ca2889071b39c301f68bbdb2e6b2f3e1077c631acf1b
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+MISC metadata.xml 236 BLAKE2B 219db736f77611984b5f2e1279f05575460ed974eee871808e2416e919104f563db1b29146c8dc34d8acac54edadbe5da16ca957c969c28922676e13bfb6c36b SHA512 09114b2f38ebda6f06b8c48887dfd47a4d632110afd7904ddbca9af0c7c402634415c765b49a6231dbec01f05c78210adef4f81f28138b56217dfa55d854dc63
diff --git a/dev-libs/sink/metadata.xml b/dev-libs/sink/metadata.xml
index d925f2439758..3e9f700a5e18 100644
--- a/dev-libs/sink/metadata.xml
+++ b/dev-libs/sink/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="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 3d634e98a052..cee6653c798a 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,9 +1,5 @@
-AUX skalibs-2.11.1.0-respect-user-provided-flags.patch 1207 BLAKE2B caaf3b25d9b588aa2edf974fb1c680da80aa7eb0a46764faa65e7faa3dcd0cd0483114094fdbb855f2300be73f32914127a8a1405ec79f5340b7995278bf0389 SHA512 6637398016c16be07429cbb58d150bb7ca75768b162b2ae0a05c77dfbd0f0346b60cfc53b1ef2df7b887caebda9350cba4b1d396b8d3f16357861a7468695bba
-AUX skalibs-2.9.3.0-respect-user-provided-flags.patch 1215 BLAKE2B 48efa77149dfe60b2c77bdbc778bc71e73fd9d90a2e33ca1c2fd922839c1c7c03d8f85b099640d0994654c7b82fc1404b687207fd36a058ae0c0479ef93d62bc SHA512 b2f2c44a9c99ee56d9773673b8edd335934b9342d1560cd260e4ba773b7596e1fd9765454e47270bf8c2d0f6ce21afaae76a3164b8184c88d6ef602c02f7a1fb
-DIST skalibs-2.11.1.0.tar.gz 218300 BLAKE2B 9ab30a43065745a8d2d846167dc9887b0353ec55ec7d4b26f663870fef8dee5eebbf73056346829c1187946f1a64de05eea5067e7b6ea4d5be522f586915ba27 SHA512 7db390b887234437d52f3b9388f7398e92877cde4c93de76532abff64ee1a127524181c53a0fdddd86bd84247d84f704527bd89c5581e27433081862e9970af7
 DIST skalibs-2.11.2.0.tar.gz 219085 BLAKE2B a8aeca79890465784cae5e958d73359544416b11ac3ca4fb412ba00e59db28ee041c745653efb9f1553944974579238b0d9e8e5b3696de9a07d4e2e11333d631 SHA512 174e92be03cfb8ee41d9dc78bfd183a435d01481ad9835b74b38e000012cf6fbadd30f97c27203dbc942102641349626f92000510636dc73f413a5aebd7f7942
-DIST skalibs-2.9.3.0.tar.gz 231372 BLAKE2B f0d0b530eab4d0c98346a94af078604d741a6da4ac9625b6b903011b791c16789a8488b562623376bfc1119fca5a2ab1c2dc35b563cb1d8ff36edad2d7793922 SHA512 41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11
-EBUILD skalibs-2.11.1.0.ebuild 982 BLAKE2B 5da34d1c1400f249c0e364eeaddea15a307e9a695fcd5ee5dcd63f3b842f755f6ae0f8b6b79cdeeeacb7d8483d3a79adbe498e013ee63b80aa4e85d1ab9fe74b SHA512 03c6c97b9fbf23260dc96f83b32c99a2ecc24ea19a00ae2171a0add5d575a6607178fd150b195fe0fc5ef40c05f6957bf0b98ef9d553454dd720a290d2dbf6ec
-EBUILD skalibs-2.11.2.0.ebuild 925 BLAKE2B f60df8e2420b8cffd2782d1ae966a463e12cf3b06638edac0413f508612fc7e63dc16c087250e2f131ef45589c00e9101b2dbc2e689e6ef7f7bab2c7404fa0ee SHA512 005fecc565e4a69f1e9323c9445569235d9991d74299558930cb2462e67f09a2b0ac24751e6a72cd5ff812957e374470ad6153adb6bf26a29618b881ec0b1c46
-EBUILD skalibs-2.9.3.0.ebuild 1033 BLAKE2B a020fd7b3c911e796d3059d4ae1263b9cb5285f2908af24d8f5b0b767ec87f037da81e3c0a3a0b397756fde1943eff9fc59cf25e74e7236610ad79de2bfea18e SHA512 b4de37ef321d442c12ec8a6e2ceae183b6ec7c577f3f2d849bc0ee89df36732d4abc4b50bfeeeaebe6288084987644c7f38ed18a393502c664e63e8f983a9b83
+DIST skalibs-2.12.0.1.tar.gz 222717 BLAKE2B f094677bbe2efe4c4dcd4359bdfaafa07dc2d436691517a868870e88a360fed8fe81008ebb5ad6f2737d12764a8313b20c31fb52e0c424174744451eca991d9a SHA512 383961588eeb4934ef68e25764d3e258d7d9f19fdd14156490e8d9e2e111050c92b34b1786d007c269d09f82cd234bdcbecb13ef603c101e9439ce4b77a6e635
+EBUILD skalibs-2.11.2.0.ebuild 923 BLAKE2B 425d25ea8f525abbec4b6019c3ce2a234f7170a193d613f98752225876942a17bd2ee33a766286bd009ad99c8a5ef1e37d78c1463e1a2306f13b7224272edb42 SHA512 c57af30c867da127abc76165b0814704c5aa686e247f1d77a3a25c853834c2e249cf995a91c935fc8a6731c869edc80197e8a80b6267eff349814454576a8d31
+EBUILD skalibs-2.12.0.1.ebuild 878 BLAKE2B 9c85e378857d096e21211f71356ed3d8c5743e450bf12fac8a233806fa9905133bcc88df7b3f26cdc327985601a64b62000bec667e240be5c5faccf81a653a6a SHA512 82e0e95c0550f7a4080e4a3282e230f02b2cf9bf91c37eaa18b24d48bdfeecf86e73751cbbb7b46f7a4ec8e7e7ac1f329adbbb3a726bed6adde2baa5284c283e
 MISC metadata.xml 500 BLAKE2B a0a2130490a01139a57fa7cfe6fb63532250b5d26b3d94bce3cc5da02552f53b84c0f6e714604040026c95ef6031adcec3cfae5f002e2d4f830aab5c594c9d20 SHA512 401f71564f9d41c07bf1271789654f4a1ff6bb957ff03945dc62a501c1dd9f3f3a49c5f1a4177d6f79182283cd9ef62243a7083d0f0c3efd076935d304f0cdc9
diff --git a/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch b/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
deleted file mode 100644
index 3092d86f3f6e..000000000000
--- a/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Laurent Bercot <ska-skaware@skarnet.org>
-Date: Mon, 24 Jan 2022 11:44:29 +0000
-Subject: [PATCH]  Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during
- autodetection
-
-Upstream-commit: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")
-See-also: http://skarnet.org/lists/skaware/1656.html
----
-diff --git a/configure b/configure
-index 1aa8fc7..430e57e 100755
---- a/configure
-+++ b/configure
-@@ -99,7 +99,7 @@ stripdir () {
- tryflag () {
-   echo "Checking whether compiler accepts $2 ..."
-   echo "typedef int x;" > "$tmpc"
--  if $CC_AUTO "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
-+  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
-     echo "  ... yes"
-     eval "$1=\"\${$1} \$2\""
-     eval "$1=\${$1# }"
-@@ -113,7 +113,7 @@ tryflag () {
- tryldflag () {
-   echo "Checking whether linker accepts $2 ..."
-   echo "typedef int x;" > "$tmpc"
--  if $CC_AUTO -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
-+  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
-     echo "  ... yes"
-     eval "$1=\"\${$1} \$2\""
-     eval "$1=\${$1# }"
--- 
-2.34.1
-
diff --git a/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch b/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch
deleted file mode 100644
index a36db4853a15..000000000000
--- a/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Laurent Bercot <ska-skaware@skarnet.org>
-Date: Mon, 24 Jan 2022 11:44:29 +0000
-Subject: [PATCH]  Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during
- autodetection
-
-Backported-from: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")
-See-also: http://skarnet.org/lists/skaware/1656.html
----
-diff --git a/configure b/configure
-index 55f34f8..49b3678 100755
---- a/configure
-+++ b/configure
-@@ -99,7 +99,7 @@ stripdir () {
- tryflag () {
-   echo "Checking whether compiler accepts $2 ..."
-   echo "typedef int x;" > "$tmpc"
--  if $CC_AUTO "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-+  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-     echo "  ... yes"
-     eval "$1=\"\${$1} \$2\""
-     eval "$1=\${$1# }"
-@@ -113,7 +113,7 @@ tryflag () {
- tryldflag () {
-   echo "Checking whether linker accepts $2 ..."
-   echo "typedef int x;" > "$tmpc"
--  if $CC_AUTO -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-+  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-     echo "  ... yes"
-     eval "$1=\"\${$1} \$2\""
-     eval "$1=\${$1# }"
--- 
-2.34.1
-
diff --git a/dev-libs/skalibs/skalibs-2.11.2.0.ebuild b/dev-libs/skalibs/skalibs-2.11.2.0.ebuild
index 0eb6a5c6b8ab..f878f25eee05 100644
--- a/dev-libs/skalibs/skalibs-2.11.2.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.11.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc ipv6 static-libs"
 
 HTML_DOCS=( doc/. )
diff --git a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
index c2ffd2478c25..748bda1854a2 100644
--- a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
@@ -11,13 +11,11 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc ipv6 static-libs"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc ipv6"
 
 HTML_DOCS=( doc/. )
 
-PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
-
 src_prepare() {
 	default
 
@@ -37,7 +35,6 @@ src_configure() {
 		--sysdepdir=/usr/$(get_libdir)/${PN}
 		--enable-clock
 		--enable-shared
-		$(use_enable static-libs static)
 		$(use_enable ipv6)
 	)
 
diff --git a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
deleted file mode 100644
index fb9bc2eb668a..000000000000
--- a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="General-purpose libraries from skarnet.org"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc ipv6 static-libs"
-
-HTML_DOCS=( doc/. )
-
-PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	econf \
-		--datadir=/etc \
-		--dynlibdir=/usr/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--enable-clock \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
diff --git a/dev-libs/sleef/Manifest b/dev-libs/sleef/Manifest
new file mode 100644
index 000000000000..a482c48448d5
--- /dev/null
+++ b/dev-libs/sleef/Manifest
@@ -0,0 +1,4 @@
+AUX sleef-3.5.1-gentoo.patch 1261 BLAKE2B cef8f55c1e24e0366636965a7838caf2f1f204dd6bf76b3521bf4e8f2819af461394a743417999245a3cdcd204069914b03285234f073bdbd45852dc6d2b62ba SHA512 2dc7a8f1dd4e061df24ddc0061ca9e6b1fb06d6660a95c9a9bf33b90c419cc36fb2ab7c1c9aeb40cb019f459a7552aa3aae8e9189d7d0c5caf21fbc4390c49eb
+DIST sleef-3.5.1.tar.gz 1210108 BLAKE2B e10e23cb830252dd2ed34e24bfd79b5e812640572afedad899cccd462019c7a4e41c7b3b9f0ff5a77549fc45dbc51ae0ebeeada4c38f011cdac0262d2982ade8 SHA512 e8e4e5028db52998c6b82bd462622c08d670e4e85273327f1c3bdbd900827dd7793b217c2876ca1229b6f672493bb96f40140e14366390cccea0e6780689e128
+EBUILD sleef-3.5.1.ebuild 616 BLAKE2B 634808838d4e0cd22ca29c1f27fdf431067d1f8a38d394ca5d3ebcb1d8fc25c7191e346bb699629193cc6e0ca8231d8f1c366ce6e99edfd66e17df4f478f45ad SHA512 095a451f96283cc1adfb196ef01b4cfb4233e60e259d0c4659e2e60b69eff6b5f4222b50329d4779ece219b0db0eb0943532c4ca726b5b93ddc41892a1d63b63
+MISC metadata.xml 327 BLAKE2B 983705672ddaa295e873a6fe7a7e7caf7c4d3fdd7c587fa2bff53e457e580ad1958108931e50df7f27303aa75937a702f3cae3d830b3f34760b95f06ca15458a SHA512 8cc8e6126c425e73d9431937f2bedc7dbb68f294359beaf4923e4105284465a7cb4c678693afdf3a16469f9d1a846d7543b550bbd5d100f369a0f93b6bd90c7a
diff --git a/dev-libs/sleef/files/sleef-3.5.1-gentoo.patch b/dev-libs/sleef/files/sleef-3.5.1-gentoo.patch
new file mode 100644
index 000000000000..2246f74151fd
--- /dev/null
+++ b/dev-libs/sleef/files/sleef-3.5.1-gentoo.patch
@@ -0,0 +1,18 @@
+--- a/src/dft-tester/CMakeLists.txt	2022-05-11 21:48:47.011990780 +0200
++++ b/src/dft-tester/CMakeLists.txt	2022-05-11 21:49:07.424697074 +0200
+@@ -186,15 +186,7 @@
+ 
+   # Test roundtriptest2ddp
+   add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_2_2 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 2 2 10)
+-  add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_4_4 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 4 4 10)
+-  add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_8_8 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 8 8 10)
+-  add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_10_10 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 10 10 2)
+-  add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_5_15 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 5 15 2)
+ 
+   # Test roundtriptest2dsp
+   add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_2_2 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 2 2 10)
+-  add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_4_4 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 4 4 10)
+-  add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_8_8 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 8 8 10)
+-  add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_10_10 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 10 10 2)
+-  add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_5_15 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 5 15 2)
+ endif(LIBFFTW3 AND NOT DISABLE_FFTW)
diff --git a/dev-libs/sleef/metadata.xml b/dev-libs/sleef/metadata.xml
new file mode 100644
index 000000000000..40e9c116eb75
--- /dev/null
+++ b/dev-libs/sleef/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">shibatch/sleef</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/sleef/sleef-3.5.1.ebuild b/dev-libs/sleef/sleef-3.5.1.ebuild
new file mode 100644
index 000000000000..7d994a46c2f5
--- /dev/null
+++ b/dev-libs/sleef/sleef-3.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implements vectorized versions of C standard math functions"
+HOMEPAGE="https://sleef.org/"
+SRC_URI="https://github.com/shibatch/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_FFTW=ON
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 3bba4fd55eed..80814e4eed52 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -5,5 +5,5 @@ DIST snowball-data-887fb7a3e006f32b4979e0d55f2543abe78a42f1.tar.gz 33063750 BLAK
 DIST snowball-stemmer-2.1.0.tar.gz 220324 BLAKE2B 3d92a2f5b4bd633932d681f2555cf1cc1a2c1a1c71fd0272f09bee17628d034a20649450dd90242c155ab7b262e685913d5ad4034bce6e7a41d76f0dfc724137 SHA512 1efd7d8ab58852987e83247048244882c517e32237c8cb3c0558b66ecfb075733ce8805ebb76041e6e7d6664c236054effe66838e7c524ee529ce869aa8134f0
 DIST snowball-stemmer-2.2.0.tar.gz 223846 BLAKE2B ac06a603ab21dfe5508c1a51419568c15d61ad079a3cded98ca6a47716f4119e480b109756a107da1e6c9994062073cbfb29ac4feb3e5e4ffab6feb4db2b9930 SHA512 02c43313de9de2518ea51cfb11f1c29145fc046c7838329bfdefd70b604009ad44b6db8175c25b0db31f03db30a6aec5857aa35775a9c204ec976df9cae62957
 EBUILD snowball-stemmer-2.1.0-r1.ebuild 1355 BLAKE2B c6c88d62144aac21f24c351a5b63133fb3de11baeb2d51599b3bdc401b8ee1b3f2adce59af4780720ccb1afc71d5fd97ee56d613a1fe3b68bf9633686f1af57b SHA512 99eccbef0b0dc3b42433438827f744f04165e4bbb57ca8abc7927a1d5ddeb32d7ebfe01ae99ddd6537af879afbb543f8c91aaaaf2870574df6988eedbdd55b20
-EBUILD snowball-stemmer-2.2.0.ebuild 1329 BLAKE2B 29c31c690a3052544468639716a1a885c66cf2b2204accbcee0d73466eead8559a454096dcf8eca74a26017d38a61579b1dd02e0bc4e2630d84b2b75f5e00fce SHA512 0bd0dcffb7854513992b36ecedcacd8fc121e8fbde3ecec5e2d5241498d7fd3a438d78a547dcc26b7cd4444c7fc651824fbced37097e65175c1ecf2b46ede2a9
+EBUILD snowball-stemmer-2.2.0.ebuild 1322 BLAKE2B 6d1d88b37b2a9107135e1dfe1682db8015b754c4e5ab64a12aa4dc3a3efd5f360605d395f3712d8f1e82d090541cd6f21e11673a143df150872f9c47b097951b SHA512 349f5c4a8750a9b29ae2cae6af1663458a65c2b07d1dc0e38755b1324e88be1293ee6fa0cf11073abfea797fd4b271ad4cf09ee1fe55d46642d918b9cebcb03f
 MISC metadata.xml 216 BLAKE2B 8ee3fc474431bb5216c1bf008cae233e6710753065ef303f86c694489d511571a7de860e785a1bbbbb4a1fb709ac3800e13677c75c9d312447ceffcc834d3b7b SHA512 f058726d4f2f98447c6df082db3b9f966ec23819805b9a6d340aa6fc7f96e0150058b55c1478b5e41dc3fed90753a188e3c6c362db1e551feb941efef3f63897
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
index 64f05cff45c2..4b7e56dcd32d 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/snowballstem/snowball/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="static-libs test"
 
 DEPEND=""
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index a73c539176c6..3844fcdb4362 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,3 +1,3 @@
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
-EBUILD softhsm-2.6.1-r2.ebuild 981 BLAKE2B de147f4cf805c23537d7430421eabb5e8cbc711f4c0a5b2c120cf81319458cee18a5d5d8c27ecea3fe13c3d589efda38b61cedecde0ee08f105fb54a49b9224d SHA512 49ba64706f6108b845ad3d99b696d8224c2e3678c1e23123938c6f53f3deceaa34aab4831420b944d119fda3cddfe570b155f2202e1e5cd9c291c35c00888cdf
+EBUILD softhsm-2.6.1-r2.ebuild 988 BLAKE2B fe58d863f201974bddb494b79e53815f0a41bf65b1faedac3bd6452945bc1104dba9242b6c0748055542afb7c2492e7c5ca099801a013e5f88e9a73aed1ba034 SHA512 64434af2467e1bf240e226dd8b0b9ca8a56a6c7c03f5c165dff18e4418c39cbeb791f66b464c35ce95fd4c704f27395834cfcedbf68c7b5db36b456e59ee29b7
 MISC metadata.xml 293 BLAKE2B 160341ef0b3359ef0db3bd7c78fc0fc0cb443d46c3e9d41fbb6b517c86a3f7afb7afee87d1afcf45b65b2e94b89c4b35e5a74dcb6ac4533be8c843d2190f228b SHA512 6994691430cb2953ff999558029f1e210d3b6f335c3637eb3d96e31310d706ca066b9cc7d94859a2a3559c8e9791b4d260decf240bb73401da9b19851b711bec
diff --git a/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
index cb48ec27b916..0b9c9a9a8875 100644
--- a/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
+++ b/dev-libs/softhsm/softhsm-2.6.1-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
@@ -9,7 +9,7 @@ SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gost migration-tool test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 800a912d9dde..ba5c68b1c4c9 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,7 @@
 AUX sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch 673 BLAKE2B cec32a83d67d5d8157f13dae4ba0d2e59e32aeba233cfc76811cf3f66f1d1c2e76d439be40f2de4ea8901da88a5f547e699aa57bc989360ebc31e5e1a4b1e099 SHA512 f4d310e31b1ad7075ad0ebb6d7d249dcd2c773093f36434518891b5b44d43851c13c2d20d2fc9b96f7e85f4ca30a27f7b248300a8ad2e21724e8e4bd100508d6
+DIST sord-0.16.10.tar.bz2 524630 BLAKE2B 6737d3495846529e6e4d14cbb2ac47ce4e67d04298381a119ba0107144deb56a53de9aa363397c2e302535f998c7c3ad44d340f52f70ac341ad6b635db608cb6 SHA512 715201eaf4a13a3635337cf8fa7c1a1f229f1d589f70cdf8f67183d90df29cd8b4af180650ce9cd0c651c712d11901bfdc6b51f9b8d7c6e70d8d8f30b1861281
 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
+EBUILD sord-0.16.10.ebuild 1182 BLAKE2B d10ca88ecd72284b9f7ed35ab5cda8f7ddfef5a8d3532ceefa5f9672963a972b7897cb26360c0abb9422697bdbfefabc0ee8726979f4e357b3a22b3035d8a1ba SHA512 45e758a075e9c7c3ea59079653a9447fd4bcf6b3deacd67ed71c6cb7d637f204889a310a5bfb3428d5e6e0bb5740cb8bc395f05631d3368b52f123502963cd07
 EBUILD sord-0.16.8-r1.ebuild 1269 BLAKE2B 1673da8136415824f6bcaa5fb6774b4ffab40f095dceed0e84ab201322b73e2c3691a116b63e96e2b1f31c646d790a5e83b0a67afe91fe9597fda116b629f9c3 SHA512 1ce5e65487ed5a7780175433f0de3e1eac1f4f598ad648129c1e57c92aef387411d78d8ced54940f67eaeec77c5face5619ad91a19cea6eafea74e09c03cab6e
-EBUILD sord-9999.ebuild 1128 BLAKE2B f3bd1ae3e1dac7eb242e590dbf0961118a93d202c38efc9ca5d921becc740e3ac05d5aec094dab3bb6270b43e7c9703358ccb48d506c66c570550e6a499a4e99 SHA512 fe1fb72b64d1aa2f1274500b271ad117dfb1ddd35fa7087303eed3dc01123ba0ae8a7ef827e8aabbe69833dac5db14743689852e7d59fefdd183f77e13176f7c
+EBUILD sord-9999.ebuild 1128 BLAKE2B 9ba38e9717b8614797ac6920cdc5a5865f039fdcf78b0f0f5f2562b36615a984b17bcb41749c40580e591c592d3c6a7355eafdbff35f253102a48c987ff02d05 SHA512 143642a6558e8bb9cbf5b4c47908764567a27d7e413a413f4c16d5b459c1b3d76ab0b6369c7d6a939b09726fd2937c64f4eab050a100dc06c5d9833d297b17ca
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/dev-libs/sord/sord-0.16.10.ebuild b/dev-libs/sord/sord-0.16.10.ebuild
new file mode 100644
index 000000000000..de92d6aef14c
--- /dev/null
+++ b/dev-libs/sord/sord-0.16.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/libpcre
+	dev-libs/serd
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index 815103371d51..fbe89d308563 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-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
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
 
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 42d4baa909d6..67be52eae75d 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,13 +1,9 @@
-AUX spdlog-1.8.5-libfmt-8-fix.patch 483 BLAKE2B f0412cf6755ee0a73ec444e5d9bf614e8367f2c71e490af83ee321a242e3eaaed15b77b5da91858a8f90b02cfc1baa43fd89d8472be2d187640fddcfe5f5b6bc SHA512 08c2e0a639eba9b13ef01400d9cf538afc2dc10981b52064e811d89f49c861d29bff12fdb948215581f39a2e868353d478b5c24df8760f3f5d49c50355ff32da
 AUX spdlog-1.9.2-fix-clone-test.patch 422 BLAKE2B adf5104879b3ffae5658b8cc38d78b56e9c330c59add082a4604372ba45822512774a331995634915bdf3514ed4cf74d5e8171835cea3e8dbd9bae33177ebfdf SHA512 e66801855e2856f5195644eb31b3f53fee62164df9883d66289c6bfefff1c1c7e7d4aea320b0cd510ab5a656b415886ab2fe2686047d77f33cde4f997569b2c9
 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
-DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
-DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
+DIST spdlog-1.10.0.tar.gz 368651 BLAKE2B e40afa9fd1dd791e1f703392f0f54fc798ed70537a9f1ee9c8598dd449f4cd4dd03bc4ce95e416cbbe224711a17e70708a106f0432384542d6316cf232cf8757 SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666
 DIST spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 54615 BLAKE2B 62b707fef02c7876692f7cc67119ea2b1a712d005d5367e5afdc50f42d6762f370a463ca3194e6850c059c679aef0e908471e0362afa2dc44a8bf7aaf19af2b0 SHA512 5d9868de7968ecf2c17b5fbb1199e70b064551bc2474fe563770d1e8d4b5f6d46d371091284c3bd10b47b3c7e94b134252e16f26b1834eff4390896acd773ecb
 DIST spdlog-1.9.2.tar.gz 327799 BLAKE2B 8e4cce17887509512c0d3a63485f9271098bdf7f853c2a07adb8d46459c1039d93d16d05cb60963c1bbc754f6af6ba3af1a66c69bc421bf234f676231c8c1315 SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c
-EBUILD spdlog-1.8.2.ebuild 937 BLAKE2B a9db146ab6298a6e26f4766688f44698c0481d92fbbbe4dc55d8fa3e9d49f1daa0e8700f57aef54a1058b12a54f4d2e3c1aa043aa564ea40dd341e736c65cc8d SHA512 00b74e07d570faab50f7ddd15b974eeb555da6bd497872d1b29befc141d7c6bb19f31557def0dd45f7d79c11f56a4e6adb71666c3d75b85627013b766b6437de
-EBUILD spdlog-1.8.5-r1.ebuild 994 BLAKE2B 6ef1bcad152f806226fb961fa9b104b1b6eefa6125d32e417fea3897e6d956f4c8db9285f5af0e09fd496015cce771beee8477f5ee53937e19eb2102c3a921cc SHA512 1b2f31d7a7e3318426d6d40a74979bb089ac37a087e213cfa999642166d959e0b50f97acaec467a3991a174dc52253170e27e26164a70e7f005604f6f206afd1
-EBUILD spdlog-1.8.5.ebuild 943 BLAKE2B a71c7a4086fcd802596747a90a598d9c5007c42fbe0fb350217f8695a4f591b254e4108d93ebfe412ffd60586b0e03021eb15c58aadafea889302347899ead5e SHA512 b8a1ea0a002c2e66fe9617d8779c3df8f69820e9380275c91292e2d86a38cdbdcb74a84f411e08997542faa785e17d4727b06a3f5b46bb14f93b6c7e9d4ac43a
+EBUILD spdlog-1.10.0.ebuild 1050 BLAKE2B 5cb9a4362969dbefe0c79b704fc560bf0b2710b72faf0cf518b403b46db4199cf88b3998cd5717877dc3eff0595af8424b7d5e6ab8fc670f3996c20928bc6580 SHA512 cc3963d4c45e09788df6c8c341f8c70b514640574fffd70a63d4a82c2e001a1e20b447d03c15645ddf193ccfa258b7f0b49308140bf8548e368c9241862a91c9
 EBUILD spdlog-1.9.2-r1.ebuild 1259 BLAKE2B 6e7ba878d9ee9423170a9c2d3b97a279bb9717937fc1df6d0c7f1ed7a4591cb8c05b829a8da6e97b00b68d82252a9ab459e87fa0205ff99c8d08cfc7895d77a8 SHA512 c4c4bc1f648cb6ca7a716f9d88324cd38e753a1d006cc59483f541531be0ce2b5b83cea0b0f447d4c43ffae01472c673ced43f71043cf21c9633ae1965fbfdb3
 EBUILD spdlog-1.9.2.ebuild 1154 BLAKE2B c9d1a6441a46b9d945e5036734e2efab4551ab7712b6df7faf82c470b18db538eeb16067e186a351c9ba48480cfa9a8455cc5b333922f875567db633be04ef35 SHA512 4234dd4b5319e7932c4a17484411dd5104da67190d6a67cfadfa1b6d30d669d74f7f61b3358f19c1e1312634948715b548869e55f85667368263846c9563167d
 EBUILD spdlog-9999.ebuild 943 BLAKE2B 2648bd5446a12ed2e55af185461a42ce4a02ce83c6dcc97470fb2a4bf4a8fc20526a34773ae8499efb3886e974444e6e1e39785a5f200ce7611432d2ac82fb60 SHA512 e960e95684bcc5c8d73d9fdfd2d45348362fca6c4d991453a7ee64b6dd5014c158bdc3bef11d26ab4e8c68437f9ecd5d53b3e809765a5687a749330f516378fa
diff --git a/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch b/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch
deleted file mode 100644
index f59a9bca4b30..000000000000
--- a/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-See upstream https://github.com/gabime/spdlog/issues/1975
-
---- a/include/spdlog/common-inl.h	2021-06-21 17:15:26.695992698 -0600
-+++ b/include/spdlog/common-inl.h	2021-06-21 17:15:52.205992496 -0600
-@@ -60,7 +60,7 @@
- SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno)
- {
-     memory_buf_t outbuf;
--    fmt::format_system_error(outbuf, last_errno, msg);
-+    fmt::format_system_error(outbuf, last_errno, msg.c_str());
-     msg_ = fmt::to_string(outbuf);
- }
- 
diff --git a/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild b/dev-libs/spdlog/spdlog-1.10.0.ebuild
index 26e7cb42bce4..d260894f0598 100644
--- a/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,11 +25,14 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	>=dev-libs/libfmt-6.1.2:=
+	>=dev-libs/libfmt-8.0.0:=
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-libfmt-8-fix.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${PN}-1.9.2-fix-clone-test.patch"
+)
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/spdlog/spdlog-1.8.2.ebuild b/dev-libs/spdlog/spdlog-1.8.2.ebuild
deleted file mode 100644
index f1f85aae2ff3..000000000000
--- a/dev-libs/spdlog/spdlog-1.8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Very fast, header only, C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/${PN}"
-else
-	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-6.1.2:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.8.5.ebuild b/dev-libs/spdlog/spdlog-1.8.5.ebuild
deleted file mode 100644
index deb8aada3af3..000000000000
--- a/dev-libs/spdlog/spdlog-1.8.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Very fast, header only, C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/${PN}"
-else
-	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-6.1.2:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 305c0b9aab26..4a79cde7d69d 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,5 +1,5 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
 DIST starpu-1.3.9.tar.gz 12961635 BLAKE2B a6eede7c369cacaba5b7330bd6a003f624f58972432d43619aeaf47c1e9e16da871a18c24f8f511f002cb7667c247c13562b4fed2348e2af4f8e402418e1801d SHA512 7150fc11828e8f9ede036af782ff0f89946d9aaed341771436eb8cbb91be7b0faccb6280a5c3bd63800d1a73ec8518a45a02d9f3e137007751cf1c5979678295
-EBUILD starpu-1.2.6-r1.ebuild 2242 BLAKE2B feffccd34974b0ed015ca55a7a5fa655fab48f38909dc820e1dc5f5f3b39ae629578bc8be9441c763d1f28315950a7413e29a9a1f65f13f51c7ecf1aa1f5e1ef SHA512 fb93af293e078ce350635b4d72a0e0636c854bcdc915485fb017f23a63beb164502f11d85ea9985c816ca77fe05d2d9443b4e17ec270b6058643196d2a9ab3e7
-EBUILD starpu-1.3.9.ebuild 2721 BLAKE2B d0f9aa20ef267a088ec9d771b8758fbb0b08f9aa070c1ab0107645c84459178bfa093efb3e5b4290ddd0a2c9a23e23862e1e029880f2006beac4642760dcc330 SHA512 7b5d647b4a6fac538b558a9167376acf21232cfe7da522f414f056d7be52b5de39e85c699e8fb5eddbc4c04c62306fd92ede5bf02cdd8abb8cc753a62f76cc3d
+EBUILD starpu-1.2.6-r1.ebuild 2427 BLAKE2B 7a9303b80fdc4fac19b599f4c07c3bd39fbd4bc45bde598b9eba8a21abce8b5a46fd59ff5b3327cd52fcb55182424480d1044185fc8c2ba4b10c47968b6a4c3e SHA512 2482be5f4e4459718022b6a7b77d6c55bf087cc3a2bec11d531431ecac1c1990eb93029bd0d5a6dc154e36da9e164c38c9bf7e29f59cc358103d39f8f751dcb7
+EBUILD starpu-1.3.9.ebuild 2825 BLAKE2B 9310796bd2aa5b71982e1c729672d35b166f3096ce7bb967efdb6328e6e2b371ad29ea488b73e7b12f841e894ce47bfe08226d6921adc3cc2e9ca361531c9c53 SHA512 e1875048fd38ea2642003ac1f9ec53020c9a369c1dbcc1ae67a19dc1f80f2c491110e79e3412aa0553a9379938e3780fda935d866688f449d367e4deb805273b
 MISC metadata.xml 988 BLAKE2B bfede0842fa1b62f1d0d75100b4efdbaf79940933ef579d9f52344df20a9b235a9e2f77739f488cb1906a89349d470738636d17dd4e2083235c7a1cfb2b55afe SHA512 5755a2d92298f299a164b60d40040edac8eb6ac86205e214cc89bbd7a0c71aa097315a9a107b358a9e9238d7ebfbf57ef33168a368ec4a2cec970636b42e7838
diff --git a/dev-libs/starpu/starpu-1.2.6-r1.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index 1670ddc579cc..68d66beb7888 100644
--- a/dev-libs/starpu/starpu-1.2.6-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
@@ -40,6 +40,15 @@ BDEPEND="
 	test? ( gcc-plugin? ( dev-scheme/guile ) )
 "
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	fortran-2_pkg_setup
+}
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/starpu/starpu-1.3.9.ebuild b/dev-libs/starpu/starpu-1.3.9.ebuild
index c829323b7573..e66702bd813c 100644
--- a/dev-libs/starpu/starpu-1.3.9.ebuild
+++ b/dev-libs/starpu/starpu-1.3.9.ebuild
@@ -42,8 +42,13 @@ BDEPEND="
 	doc? ( app-doc/doxygen virtual/latex-base )
 "
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	fortran-2_pkg_setup
 }
 
 src_prepare() {
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index ab6b0100406d..fa35889954db 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -3,5 +3,5 @@ AUX stfl-0.22-pc-libdir.patch 866 BLAKE2B bdbc18572fd5104ee04af672b9d493bb3271a8
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
-EBUILD stfl-0.24-r4.ebuild 3137 BLAKE2B 63e9a0e0ba6caea6b0adb8987ea96a2ea65d13f26b47178fbbe0b3020ae249f2b7250f2e4b258fec2a16d12484a42064f5ad16437d1c9595a8551e7529ee3e2e SHA512 688d7d2d1d779e8e9ee52107038fbb7945bc7078345a8c571975a4cd39ab16f16140f58ca0572dece066eaf66b01218e66b91064eeb791e1f9c51d31baddfa05
+EBUILD stfl-0.24-r4.ebuild 3138 BLAKE2B 36f61529c1d0cc414066f61f74112f62ebed1b3f465e0bdb7103750afc199fc8ba9031400ba40bb815ccafd6542824dc147c7d31b3d40d9ef72bb6411d538fbc SHA512 d5c9868d4b2604d9920ec5ce0ba99493990e41cd5ec92285b6cc3311f53666a947ef03861908858133f924a23c82441e8011e280a26dc09265faee94bcb5926b
 MISC metadata.xml 884 BLAKE2B d1ee81a475935527af118da278c54f34a773dff1165c39ea2013135b767dbfe96972623d83833501d0531df78547c5d6040990039674832e9f5f701f915d3924 SHA512 55dc2b480ea7b0929be1e74d60d06ddc33ce977885969fdda332a6cb390c219cc13c017c0a56ed3594c475dcb9586b2d433c65fa200675de421e1aa4b22c7ce5
diff --git a/dev-libs/stfl/stfl-0.24-r4.ebuild b/dev-libs/stfl/stfl-0.24-r4.ebuild
index 5a3ba87236dc..bb88a64e8efc 100644
--- a/dev-libs/stfl/stfl-0.24-r4.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 GENTOO_DEPEND_ON_PERL=no
 inherit perl-module python-r1 toolchain-funcs
 
diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest
index 8921d4d9acca..8133f8787bdd 100644
--- a/dev-libs/template-glib/Manifest
+++ b/dev-libs/template-glib/Manifest
@@ -1,5 +1,3 @@
-DIST template-glib-3.34.0.tar.xz 55348 BLAKE2B f5aa2b2032dce87a3091a7314012779f789ca6e4b1a8c7406ae92deb8283c9024ef33cf8d657741dbb175816371dd8082b7f0a2fff47b58842573248c12dfd6a SHA512 b89cc9890fd80a6858b34139ce1cd2394a43f598629e59f224f4db798a17457be9a2aa8307828af3591108ed6e9a953936a74df15ed1c8c8af2100306db5a497
 DIST template-glib-3.34.1.tar.xz 57540 BLAKE2B 2ceff1ef04fe846d8b5a7c4b54d0bc572323e607fb72812bcc93152caf1d4e9de36a27705a53a0c1add924d95a92d597256bc5450f1ff598c1fd5b0157a87051 SHA512 9f518fa3331fdef808f219792e1664787150c9e4b1b1a43662badde4ba8cf6d49faf1f97f0f4faab9e31c86a3f65e637f62d752fa6725c052ae099f29f3999fc
-EBUILD template-glib-3.34.0.ebuild 1092 BLAKE2B b21750f52efc3ee82dc1c04edec5f3968fc0d8daafd116cbf9f34cef039c07dd822f4e49cd91b5ce2d14b842c2ac6ab4f8767770e2624e1d4b4215b481d596de SHA512 e3432ce2aa7dd4cae15915ff88fd61fb9705f7da929339b8e027f2f87b617527bee4062ede3216c1784e09e8aee9495060ef45b3744ea7e153469501edff1450
-EBUILD template-glib-3.34.1.ebuild 1076 BLAKE2B 7f88e8bd6a14b525468bbc64655e6458e2c2aab89e965846d9f265ca588472b558ddce886c0dc0d20b25e100bee6c0d6122e93395d327b3ee7ad92151aa6bfe0 SHA512 60fe0fd93c21dabcb64c7491a9cb168a4148901f7c2bb1715b7468381880552e8737b5eb2d16ecc9dcf81e39ad92e130a1fd0dae28f38b872601594f83236bfb
+EBUILD template-glib-3.34.1.ebuild 1074 BLAKE2B 18aa25536e22f1a06ce2befb35da18dcc2d9fa3e331ee7332abb8dd167d9bff25cd27b951c3b8a934f9abc46de06737d7b332ad79dcacb778e8f103061080083 SHA512 aaacbf9fc011aae02efce78b42a4ac5ab11b8ebeae8f2fc9592dda4be8b59d6529f2a5ec8dbef806836ccc0ff3e1d9dfe8fa1f8c4b86f3dc3c51764c4ab4ef9b
 MISC metadata.xml 645 BLAKE2B 805c0245f153163919a831b3921757814594cbfc70e47c6216ebf1f977180ce190e9ff3a0f78661c52f02fd33d7800aa3a5b96a5d281b3ece28a217086259045 SHA512 79eb403fc2f7b952885bfff1d94f0ff265a124e58bc00bdda1e533caf6c9eb1b3f3bf143d9f35ed7f9f1094d7f65fbcef60b516ae7581d6ca4ba4307ba4eab13
diff --git a/dev-libs/template-glib/template-glib-3.34.0.ebuild b/dev-libs/template-glib/template-glib-3.34.0.ebuild
deleted file mode 100644
index d8effd26ad25..000000000000
--- a/dev-libs/template-glib/template-glib-3.34.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala
-
-DESCRIPTION="Templating library for GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 x86"
-
-IUSE="gtk-doc +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection:=
-" # depends on go-i unconditionally for own functionality, USE flag controls GIR/typelib generation
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-util/glib-utils
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false # extra trace debugging that would make things slower
-		-Denable_profiling=false # -pg passing
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/template-glib/template-glib-3.34.1.ebuild b/dev-libs/template-glib/template-glib-3.34.1.ebuild
index 830385f79f8a..af4f286dc6d7 100644
--- a/dev-libs/template-glib/template-glib-3.34.1.ebuild
+++ b/dev-libs/template-glib/template-glib-3.34.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk-doc +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/thrift/Manifest b/dev-libs/thrift/Manifest
index 4220514578e7..70da1b6a7474 100644
--- a/dev-libs/thrift/Manifest
+++ b/dev-libs/thrift/Manifest
@@ -1,4 +1,4 @@
 AUX thrift-0.16.0-network-tests.patch 1184 BLAKE2B fc1737e6169a480718edeff366734a01cee43626f84a0785b0f7fe2cdad4ef964da5ef9c685d8c8fee32d8f719e1f4eb7c260a6c6a960e8fea89898a59cd6f16 SHA512 248de672f603c94919bf67890715a037030d378c80ec7dc849ee3677392353d89903e35ed3c0144ab3e1ff371bfb6eba861d11332844fec99b87bcb3476a1a7e
 DIST thrift-0.16.0.tar.gz 4085114 BLAKE2B 17c35096f6848fb0795e4cb125fed3068c8e1e53f67f404f4dcab67df7a42fc049a7d615591c861eb9e59e3333e21f185e8615663008bc7c846a03722ea8b834 SHA512 468fff6be2def85959fdf8adac92a0cfa7f786083b3bafb2c31427dfe5725f4d10962052d13ea960828f6a317778d35e66b602744a570212352bfc637ae586e0
 EBUILD thrift-0.16.0-r1.ebuild 943 BLAKE2B c71eb6f0d62c7c5a50eb42f27410706e84cfa12d374ff15343d5c0f189b9e0d92a742e824dd04b8fd0cb1c23dad884495538874cbd12644ea85734be2660179a SHA512 52985cc93cca5104a19dc20be727fbaebfb8a04ff1ba7957e53c95d3037f288b859ebb367f93673f4c93c97d909945f21ec67f835eb2b2ea63d1d9bc9e2115b4
-MISC metadata.xml 490 BLAKE2B 97d5f5a81f7532a4b8e0953c99ae0e702c0f68dd33f6d07df1e412e429be3ead863a06298a3caa50e5a627b5f78200f7d4421264ca0eaccbcbea312d951040a3 SHA512 dc6ba8af22bae65ee0dc0089075403663b0fe6e24c322d4527b3ddb3059b92c640f0c36c4ac47c0649c8365279184fbb0e44801749aee26d99be1ab282e927b0
+MISC metadata.xml 489 BLAKE2B 2b2c924951cd9c5dfa2a9d4f50f4a74b3f422d853fdf61248424500d792f87a9348335a80e54c2c110039274060ec8df87f3369c8ff81c3dc8d515cb7de58fa8 SHA512 f15102234cb9eb25272e4d1788b7cdd4274ef9c5ad0d2af3521533d86a4145b0f2789385ce9663f9d0aa9161c218d357cc76d56e5c47ed597c56f7ac35d8a373
diff --git a/dev-libs/thrift/metadata.xml b/dev-libs/thrift/metadata.xml
index e27373e1c1b8..b47179b672b5 100644
--- a/dev-libs/thrift/metadata.xml
+++ b/dev-libs/thrift/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="libevent">Build support for <pkg>dev-libs/libevent</pkg></flag>
 	</use>
 	<upstream>
-		<remote-id type="github">apache/thrift/</remote-id>
+		<remote-id type="github">apache/thrift</remote-id>
 		<bugs-to>https://issues.apache.org/jira/projects/THRIFT</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 328f4f6d408b..21a8dfca9b24 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -3,5 +3,5 @@ AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19
 AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef
 AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
-EBUILD tinyxml-2.6.2-r4.ebuild 1555 BLAKE2B 9d3b221461ca3a3af80110428dba1fb3133001d86b80bc7c4bc6cd5340f1e9b4a823436c4d52a1c5b8a580b9cca30f763afab76aad979559df7954373b61110a SHA512 a98ca3e566bc7b490098ee253f66a4c5fa4362cdc2c531fe754c51be44d6f7ab512f62dffe0344a4536e52f4595828f78b5e642ce8682650c03e8df45bcc9285
+EBUILD tinyxml-2.6.2-r4.ebuild 1562 BLAKE2B da540b4a34aceadf5d7d6cfd465d1b4902863cfc1337793b3fbb0eb0b35d78f51a64bef8d724b14661416d21017fe0702e2821f3f086fc608b7e4e5a74189e7d SHA512 7f3bf0d6033a5950ba5085ec2c292b70eda2050e632c4d0fd2fac51a1f1271fe787a99a5b304a3f657afa2890a34152cba0cf6dce773546e64b2097ac97adcc3
 MISC metadata.xml 406 BLAKE2B a9c50ef75e9049b1cc89df08b71e7640581c5f34fadcb0cd9fd9f29679bc3a1122db2e8fe8ad1ed738a9f4fe39771a8b4980fa4f2cb387e3e464c92a492b833c SHA512 b589dec8ab67f4e0aa9e073f55ed147ef22b08aa9adabb3270bb83d50a17da967e364ab131815c3a9ee32c8c61b0f3ec6ec6e3d7f4d8dd0fe5daaaa5420a89c0
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
index e11d76946f84..40b484dd5eac 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="debug doc static-libs +stl"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/tlsh/Manifest b/dev-libs/tlsh/Manifest
new file mode 100644
index 000000000000..7918f6b640e7
--- /dev/null
+++ b/dev-libs/tlsh/Manifest
@@ -0,0 +1,5 @@
+AUX tlsh-4.8.2-gnuinstalldirs.patch 1244 BLAKE2B 1369902e03db4837e02c01d63262545725b241a02f02462fd4fb41e7204dee9bae668bf16daf0990b083ced13d4234348ba3df220eab6d69fd77a1e3979b71f3 SHA512 68cf688a8587a301299efb5779ab47473a508e0f0cf6dc90e3ada21bda3cae25142da7d83b67098adef0f03cfbbea40952acffffcaf75c18842efeacb5bcfda8
+AUX tlsh-4.8.2-respect-flags.patch 820 BLAKE2B 9159f50d554168497ad9f416e4e002fd757a88543529fe6e2a180f6250399956bb6d967b06bc458e71b9dcf7f01cbb5d98d762ee65d9fd61392fd59b81dd25c4 SHA512 4b90021f2a01992d68d52f11b20a2ce9c4900216c8a6cd7c6fb95cfad20b44fbe37ab118ceee2811e65da7380e12960b5ddbf883198573491c2cf40f25b0fed1
+DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
+EBUILD tlsh-4.8.2.ebuild 701 BLAKE2B f9a25d4319bedf551fb642076d9b9b653fd0dbfac41736c43992f2e84939f3f25838b5358dd2e392c9cbce8e4c97fd9fc5c938ec882d9e4eb03fda0506ab7bc1 SHA512 3b845f43b55529379b39beaf7d0522067dc040cc0e15450781c5a15486cc65530ef9ead96b87f8cacc8c22d607bad504332ffb5b33eaec409d189bf6e455437e
+MISC metadata.xml 471 BLAKE2B 2e17c59829f15d1439933fef59fd14a8525723aae1de1c640c8a83a9df612776ff33d24904a30ffcf27eddcd9c778af09d6d65c3b4e66542288810f416ca0ec4 SHA512 e8a8759d526e1d0b9607f84df503440a650f5835c864c0c5c89c5f978b58839620e2ed7e0bc39af51e38e1da1fe86fac1a398394069f4b3820219db40254a284
diff --git a/dev-libs/tlsh/files/tlsh-4.8.2-gnuinstalldirs.patch b/dev-libs/tlsh/files/tlsh-4.8.2-gnuinstalldirs.patch
new file mode 100644
index 000000000000..d30363de6d74
--- /dev/null
+++ b/dev-libs/tlsh/files/tlsh-4.8.2-gnuinstalldirs.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,7 @@
+ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ # OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ project(TLSH)
+ 
+@@ -133,6 +133,8 @@ else(CMAKE_BUILD_TYPE STREQUAL Debug)
+     endif()
+ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+ 
++include(GNUInstallDirs)
++
+ if(MSVC)
+     add_definitions(-DWINDOWS -DTLSH_LIB)
+     include_directories(Windows)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -78,10 +78,10 @@ if(TLSH_SHARED_LIBRARY EQUAL 1)
+ endif()
+ 
+ if(TLSH_SHARED_LIBRARY)
+-    install(TARGETS tlsh_static tlsh_shared DESTINATION lib)
++    install(TARGETS tlsh_static tlsh_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ else()
+-    install(TARGETS tlsh_static             DESTINATION lib)
++    install(TARGETS tlsh_static             DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+-install(FILES ../include/tlsh.h DESTINATION include/tlsh)
+-install(FILES ../include/tlsh_version.h DESTINATION include/tlsh)
++install(FILES ../include/tlsh.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tlsh)
++install(FILES ../include/tlsh_version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tlsh)
diff --git a/dev-libs/tlsh/files/tlsh-4.8.2-respect-flags.patch b/dev-libs/tlsh/files/tlsh-4.8.2-respect-flags.patch
new file mode 100644
index 000000000000..fc22b9a1d521
--- /dev/null
+++ b/dev-libs/tlsh/files/tlsh-4.8.2-respect-flags.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,7 +126,7 @@ if (CMAKE_BUILD_TYPE STREQUAL Debug)
+     endif()
+ else(CMAKE_BUILD_TYPE STREQUAL Debug)
+     if(CMAKE_COMPILER_IS_GNUCXX)
+-        set(CMAKE_CXX_FLAGS "-O2 -fvisibility=internal")  ## Remove TlshImpl symbols
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=internal")  ## Remove TlshImpl symbols
+     endif()
+     if(MSVC)
+         set(CMAKE_CXX_FLAGS "/O2")        ## Optimize
+@@ -142,8 +142,7 @@ endif()
+ 
+ # user can override CXX; make sure tests link and load properly regardless of LD_LIBRARY_PATH
+ if(CMAKE_COMPILER_IS_GNUCXX)
+-    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc")
+-    set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++")
++    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++")
+ endif()
+ 
+ enable_testing()
diff --git a/dev-libs/tlsh/metadata.xml b/dev-libs/tlsh/metadata.xml
new file mode 100644
index 000000000000..8ffb367f45ce
--- /dev/null
+++ b/dev-libs/tlsh/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>t@laumann.xyz</email>
+		<name>Thomas Bracht Laumann Jespersen</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">trendmicro/tlsh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tlsh/tlsh-4.8.2.ebuild b/dev-libs/tlsh/tlsh-4.8.2.ebuild
new file mode 100644
index 000000000000..e6fb73d50849
--- /dev/null
+++ b/dev-libs/tlsh/tlsh-4.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake
+
+DESCRIPTION="Fuzzy matching library"
+HOMEPAGE="https://github.com/trendmicro/tlsh"
+SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gnuinstalldirs.patch
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DTLSH_CHECKSUM_1B=1
+		-DTLSH_SHARED_LIBRARY=1
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	find "${ED}" -name '*.a' -delete || die # Remove the static lib
+}
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index cc47d746a57a..f7e4330802c5 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -10,5 +10,6 @@ AUX tre-tests.patch 235 BLAKE2B 11c601f9b352dee9e2d36e60c537a4c2969beefd04bdab21
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
 DIST tre-0.8.0_p20210321.tar.gz 146294 BLAKE2B d740bd0e99f50f5e4d8105f5260e43a81b6af9857a21e386e437ab8d48a9e0de23eae03e96cf6b9f4d2d37f72d0fa73ef7343086271ea80f166bdba3f04475a9 SHA512 950c81f681970fc737cfdd6815445f05a018fc742b964cea3ce19f0249c677dd715ece4ff8e543fa9f3fd23b503eafa00aea00dbae063af9bc7e08dc1bc33aed
 EBUILD tre-0.8.0-r2.ebuild 1461 BLAKE2B bf3725fde8e7a6c740d958956ab2b8789abee70619576a41c863b8e7be744cdfd879b598a545f287613e241f21fb96b5e5397d3ae9dc4f287895b37e2a4acb47 SHA512 2a33c2871e81f7671d10aa6b2cb2de9397ea8d8e9ea9ec419c9450208124aa153e64cdb2c3b88e20aa128b2580b777c130ebcb5c88ee830416d8e745243dbda4
-EBUILD tre-0.8.0_p20210321.ebuild 2421 BLAKE2B 04e71a47dfef4b1a1bf9f70dcfdc4fb60ebccb76c0ac189e1136dc2d1e5eb4d7fedbd1c619ddd1f0e49c1617bdaaeec63da734422bbb5352e60b4544cb3b5852 SHA512 8e90ee8be6884c50c794ed85fd8b440ce5faeb7f69d357d05335eed31653ccfcc0bf7d4f20dd46145cf55a5418daeee67118a08c77f73d2b20903da155f013fe
+EBUILD tre-0.8.0_p20210321-r1.ebuild 2384 BLAKE2B 71455f86ea9d2729ae120af4694d294c330f8612b23d7b7bd4c7baad76cafded9ce5e0fa3e7e4b3ac3415aa632d296cf90a05d8495ce7f1f5044a7108749dcc0 SHA512 7ae52af0db7a2fd2a537b2b4b14a2f9ff53338d799d739f47d92e79aef6d7d8dc0934d5b5b8baf1f7def2f305fd563083945730a53e3933400d7e4df84035b52
+EBUILD tre-0.8.0_p20210321.ebuild 2420 BLAKE2B 51ac2ef53355f730e18a51dc7e2d61a835b8f14cf165dd452426b557d17f40190a6aceb0d06bead1e3f42ce303be47d199e3bd05cad437e9dad546f660ad4426 SHA512 fe2b7d1b57f1231bfa310e821e3ff0811c3b8a6adc2089f7f35a702565dd9600a0347972a28dfe158cb10f063bd468a9174d91fc1b898ae3a8c535e8500e016c
 MISC metadata.xml 638 BLAKE2B 4e02f7673a19acc091ee21459551e6d40f6a78d5a25cbbffe877d46f0a181067e2163d1ac79d0f7d38ff383b8775abf6f69309ad97b25fd2af55b0ac2223ab40 SHA512 9f725eebbee4753cb05b0adcda1edec2aa50265257db359ca0ec4596761072ec335fffb5a5035cf5ec43c13b8c8a7dd7ed916bbf82acd57c6d8ee5e4c89cb622
diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
new file mode 100644
index 000000000000..7ad484a2dea8
--- /dev/null
+++ b/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="6092368aabdd0dbb0fbceb2766a37b98e0ff6911"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit autotools distutils-r1
+
+DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library"
+HOMEPAGE="
+	https://laurikari.net/tre/
+	https://github.com/laurikari/tre
+"
+SRC_URI="https://github.com/laurikari/tre/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+agrep +alloca +approx debug nls profile python"
+
+RDEPEND="
+	agrep? (
+		!app-text/agrep
+		!dev-ruby/amatch
+		!app-misc/glimpse
+	)
+	python?	( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	agrep? ( approx )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}/0.8.0-pkgcfg.patch"
+	"${FILESDIR}/0.8.0-CVE-2016-8559.patch"
+	"${FILESDIR}/${PN}-chicken.patch"
+	"${FILESDIR}/${PN}-issue37.patch"
+	"${FILESDIR}/${PN}-issue50.patch"
+	"${FILESDIR}/${PN}-issue55-part1.patch"
+	"${FILESDIR}/${PN}-issue55-part2.patch"
+	"${FILESDIR}/${PN}-python3.patch"
+	"${FILESDIR}/${PN}-tests.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-system-abi
+		--enable-multibyte
+		--enable-wchar
+		$(use_enable agrep)
+		$(use_enable approx)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable profile)
+		$(use_with alloca)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	if locale -a | grep -iq en_US.iso88591; then
+		emake -j1 check
+	else
+		ewarn "If you like to run the test,"
+		ewarn "please make sure en_US.ISO-8859-1 is installed."
+		die "en_US.ISO-8859-1 locale is missing"
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd python || die
+		distutils-r1_src_compile
+		popd || die
+	fi
+}
+
+src_install() {
+	local HTML_DOCS=( doc/*.{css,html} )
+
+	default
+
+	use python && distutils-r1_src_install
+}
+
+python_install() {
+	pushd "python" || die
+	distutils-r1_python_install
+	popd || die
+}
+
+pkg_postinst() {
+	ewarn "app-misc/glimpse, app-text/agrep and this package all provide agrep."
+	ewarn "If this causes any unforeseen incompatibilities please file a bug"
+	ewarn "on https://bugs.gentoo.org."
+}
diff --git a/dev-libs/tre/tre-0.8.0_p20210321.ebuild b/dev-libs/tre/tre-0.8.0_p20210321.ebuild
index 6db320c1bc40..f45acf24a58f 100644
--- a/dev-libs/tre/tre-0.8.0_p20210321.ebuild
+++ b/dev-libs/tre/tre-0.8.0_p20210321.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+agrep +alloca +approx debug nls profile python"
 
 RDEPEND="
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index 6de417312f5f..e69c94055eae 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-bash-0.19.0.tar.gz 187286 BLAKE2B 8812a593366a65a9cae3eaac5bb81c71e95f4abe8558a01b908333e471f05714b1c768b71e66d3890d1e63202819290813e499a5e8ba49e72bb466b9b0f245f8 SHA512 62bc8bc25c999f9c79632bd6b236edd21ef15b14365dd1a956237b11a32f5e60a2f420ec67b60d46203699b7841d4bc10978fc0307d0c4013b376c6c024d89ae
-EBUILD tree-sitter-bash-0.19.0.ebuild 286 BLAKE2B 8b459c593b349ce49613db0f1322f0385296f5851ff1ffacef1c2c4f6d2126d264ddba863966c830cbf0983c3d02a81a74151289d2eb8304744f036722ac336a SHA512 7a5a5ebebd7e062353f448bee5fb7952e8952339f24411e7582ef863d746864f7722736409e5c16b90ee85754c6553d47307eb076444c1de60f19823427d8187
+EBUILD tree-sitter-bash-0.19.0.ebuild 354 BLAKE2B fb70ddad7d900e727855803ee5485776cea2df096b431c07cc1bf039c6250885cc09272471b7018bc0d802cf8511129ae23b42aff4ee562d5153bd4f476eb1aa SHA512 64cd58254997d9ece4be5bb90fede6de4726bcad0cd88c6ac3c295fa21ab629a599cab611899a5dd7cb8afdcedd4cc924e8d793d0c29f89a20eabe7b41b908e1
 MISC metadata.xml 446 BLAKE2B 60052c2b380610a7baea0e630cbe82709976827341183e1a1a7c846913f3fb0ae8ad85c40701ec827685592e326405a9b2cab1674d015c7111c1df90ad8a162f SHA512 e845bf4cd56026aec1b531cd23ea6bf5eed38ac0d3f91dedead87907e4708bac82db87b3c7ccaa1135a4c25911f2b369836c2689faac9ad54782978dd2c8f95b
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
index 11a9c28e22fc..d3caafe0dedb 100644
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/udis86/Manifest b/dev-libs/udis86/Manifest
index 5f88b2db41a3..f9a6f63cb7d1 100644
--- a/dev-libs/udis86/Manifest
+++ b/dev-libs/udis86/Manifest
@@ -2,5 +2,5 @@ AUX udis86-1.7.2-docdir.patch 644 BLAKE2B 7929a12d9dcc43035b3ed0ec6da5dc54e7a51c
 AUX udis86-1.7.2-python3.patch 1543 BLAKE2B c2bcd32c934e2a3ae5232ab6cf2516ae0598a3f8dfc02dcbdbcd2d217728ed5a707c8f328eb9047199f293e4b7aa66898c6e288a91c2bd5b538217c3df691424 SHA512 8075f31c778b962952e8feabafe76b984d037ee482c3cce633cf46ad15baff42d15af0061fab3dcadbae3e3b4f19bda07f7cbc3d7a9482b5b48c46fcea70023b
 AUX udis86-1.7.2-uninitialized-variable.patch 590 BLAKE2B afba36f587b9ac4e09d79aab081092dbae8640c8ad2e533019d22bb69b4fb38d36a5d43c390cb2201c3081ecc63037b099fd61e38fb307c4dcb632a67567d8ef SHA512 7c55fd11b296dfeee4bd13e1dbcc7880eec3d0653408ad2e71c71feb3b9b7546d7c814d27e53663b7e94a284aeff0563e8fb577794eaa629f24cbc63ce7d54d6
 DIST udis86-1.7.2.tar.gz 445085 BLAKE2B 0e67a1ae28688a5febdb4502714a6d99b1fda9028470bac1ecf9314d33c2f081726e3706e9616f352fbf1561283429cb96b92ea4a88e454ec21eadc84bb336d8 SHA512 8cb35d70ac020cd74ced22252aa735a266e5db98d89df565a560baa4ace0cd730e9db838241b70c3b93c27d6b2c75a88edf9c357c864d0f0104323925371c96f
-EBUILD udis86-1.7.2-r1.ebuild 996 BLAKE2B 5e1b7c89bdcfd15c934324aa10b4a78d9ead950bc6581e45272c9354e7d7de730d39b25cfd76d218358e7d603e38f14fbf7d0097649c7c375bfd7b0ce136052e SHA512 1250ae69965141e99b8aa7cfa9774d17637321fd8362d0d75516b4e42fe235e2a3b11f18bf9ebba66a32394ba33b83cb6acf5f09c8bc5c5cefca16fad9c8d7c3
+EBUILD udis86-1.7.2-r1.ebuild 1020 BLAKE2B 96fb418f6536e1da11a23a63d89ac87d1bff7107aa81877fe68ee5a1dc2fbe6cc635a7e7fbe952f85fcd44944839cd634157d56364fbe9f2ac1f7dcb040e827f SHA512 be71da9660888b102a661c14c80f8746cb2d608bc81595eb8cf35070f2d024dfeb95a2ae0991f94d26c1bd0f0e6b00fd8139d17ab9ed483592f96a6dd23f2116
 MISC metadata.xml 393 BLAKE2B 988770bea966c57021cfe642fbc3a0562aaedc7378b7c9a59e80b71924818afefcc8365eb53b4733a230a2fe93ede7d330b6c3c5d3963a2fc89d630a2a851d20 SHA512 49384d8f1ce17fdde210e54f91d852c845715e34daca5b5220bf5fc5da5da68629bbc72c0013476c264d1d89d3aa37cb98227fa2fb9d9780a164797269ff6ba1
diff --git a/dev-libs/udis86/udis86-1.7.2-r1.ebuild b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
index 26852a3b26ce..ef2c02b2e24b 100644
--- a/dev-libs/udis86/udis86-1.7.2-r1.ebuild
+++ b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
 
 inherit autotools multilib-minimal python-any-r1
 
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index 64b046f78142..0ed67bebec4a 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -1,8 +1,6 @@
 AUX unibilium-2.1.0-no-compress-man.patch 576 BLAKE2B a99123e8be6e229c0661b2ca9df0a56c5280e9f0a3f1e2fffae10537f5dfcd1e6ba5b35a78ceda8b52437b42442e30d1793c5a79ade78bbe2755e2d17c84d505 SHA512 501f93e537dcf8e2b5cd03e63d6c03b91c422bea52a4f615fbdd0acd64ba839d95dcf2f209ca28dcdeece902445a19d5777329a40af7b795529ea8cd9755ce53
-DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a0988f05bde785d03dac338d9f18fc65324f5ccc402723c9fabe2990083ce260d8fa57129591a1b2a1f8405eff9d SHA512 e93f319b7a85a4441c7f4e30d12d906805f066b14bff03331e48b6257da893f6447e257c8ba731077ad4b54d82d3ebf1ccf1fcf2d864273e0d4321a26ef7c172
-DIST unibilium-2.1.0.tar.gz 121971 BLAKE2B e035eab4343ee779218c302b3cae3ff5d443fc9bd723cade53a3d38dde3d66ee3d7374f7c69b85508a59d44d936601b24f33b01d923e55677d2bac71bd520fea SHA512 c0074ff8431f82c92072b8c0c9d3cf38d759b4de996b168c6ab00e475b0a6204d9c29b0a6e48e62dd4fa4898f82246150ef7cd5e246893d2c225c50ec4d4ac68
+AUX unibilium-2.1.1-libtool.patch 2273 BLAKE2B f6104f56510f2b876bf05f6985f1d8c8d0cf4282329999c3c2b911549f46bc4c4dc2a3b1e503dfa3146c8c1cb43f22f724a8dc4235a9a8d7a268c4ecbd8b18ab SHA512 8229eac14a6cf7859a08fd12eca00a2849a1872564d4313a751c4d618e1c784ff4ecb31f5a92c103c84a0ba9c96b98c7d73f30006ed51754170fdfd8cf23fa87
 DIST unibilium-2.1.1.tar.gz 121998 BLAKE2B 0bd032d0cc32011fa66604b39412116824b79aeb3cebb394efcad7591d5bd18031d465f7736ff1e65914f2fcf7beca1cbee4c7ad07426cdbf45e1c82e1894d94 SHA512 ebcdcddc6c3a540d086b113bb83470c1c17cf59056b28308a484b20dc3df71de0f5d6e5bf105f9e4a8347c78500c65ae46c2b53ec87692a898c321a047664ee2
-EBUILD unibilium-2.0.0.ebuild 784 BLAKE2B f8decdab42671f3f9891ae9f019692f0c658c527c902ee2499395c1b0ec34b49f0056deec87396ed439ea1cb0a25d12b50d7727da739d4db5f4d9d11add57d43 SHA512 2c1f1edc2b1e0ace8f7dc54840636558873004f44d68ce0f434cfc403437d9fe5873ca1a66841febcaf4923bff2c82ac9d0c7937c180f11cddc721783d6eef66
-EBUILD unibilium-2.1.0.ebuild 879 BLAKE2B 03c1096e39a86fbd1a5da4f5cce318008e40fad7006de440a22a44a22412bc780253c2d4474ff5b2b2cce43d8fe2fc69bd5429e14c844a87d7c08ec673f580f4 SHA512 8a9d47758dd30e851575e487797ac435b94c57e01730710ee09d6ea10d0bfda0a613167be5554bad6dc390c36fef0cce77078dbb32d2e072b211c5c881447527
-EBUILD unibilium-2.1.1.ebuild 887 BLAKE2B a7fe78c7a903fd9c4526ddfdb7a6c64abc7c5adf75d6191e5a5104d7b37a8e0ad2716e6c3a8370b4380bda1c5e8429c1f6159bf7e6a5a07b84a776d077449ea2 SHA512 1feccff6e13f7743074228a929947ed4c804a7998e16c6f978a6b0d73fbbc164068248d4602d444c1f76d4969291d5ef0cc1e68a1138e7797e155b10c896f9be
+EBUILD unibilium-2.1.1-r1.ebuild 651 BLAKE2B 5273545f3c0ed05837ebe803eecdc87f4e02a83d6df4193c9e598d81a5ddd5419877821efbd2c151a60ef357b4a10c852557222927764d57fdad994002eb7a1c SHA512 c2e62a9855b1366decd890b2975c11c2217e5612d6a31292c5c93d32549f14b02b17f0ee6e39d52c647dba874531eeb30dd9d2c27b5b518a103252b84095c535
+EBUILD unibilium-2.1.1.ebuild 884 BLAKE2B 69f4bc4fac965583f21ba8ab1930caf70dce012a2070dca7a1e6d98d1282536042318c6e36f626b1474a272a2e022f2747dbb2958f2a48d35375fff5da7ce048 SHA512 b899ae21426d72f9ca53e210e232d5d21df9dbd2b0ab42029af9a32af8254a89fa08ce12aeed98d06ed46d7411c1b2d021db0c0973f499a1a9a698436298a919
 MISC metadata.xml 340 BLAKE2B fbc2fee17ce03a1aafb74a76eee00909ec9d6ab01a62bb0fc0fbf7a9e0e30fab6390ab964d908b9d3b3c22400e5720856da6aac6a3c5ac77a0f3c8e1493f7316 SHA512 bb01973af5dc1a5240f268e62428a227fc4f575bb2d359c4b1f9d129d5c5693a17054aca080a72dcb938b325c493d9690bcfc5e15feab675f02c50bc855f8dc9
diff --git a/dev-libs/unibilium/files/unibilium-2.1.1-libtool.patch b/dev-libs/unibilium/files/unibilium-2.1.1-libtool.patch
new file mode 100644
index 000000000000..b9715edfb449
--- /dev/null
+++ b/dev-libs/unibilium/files/unibilium-2.1.1-libtool.patch
@@ -0,0 +1,101 @@
+Upstream-PR: https://github.com/neovim/unibilium/pull/21
+
+From 8447cc364ac9f42745fdabba54fa8e628451f33b Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 20 Jun 2022 14:52:04 -0700
+Subject: [PATCH] build: Add a minimal configure.ac
+
+When building with slibtool using the rlibtool symlink the build will
+fail when it fails to find the generated libtool. This is required so
+rlibtool can determine if it should build shared or static libraries.
+
+This can be fixed by adding a minimal configure.ac that can generate the
+required files with autoreconf.
+
+Gentoo Bug: https://bugs.gentoo.org/828492
+---
+ Makefile => Makefile.in | 31 +++++++++++++++++--------------
+ configure.ac            | 16 ++++++++++++++++
+ 2 files changed, 33 insertions(+), 14 deletions(-)
+ rename Makefile => Makefile.in (92%)
+ create mode 100644 configure.ac
+
+diff --git a/Makefile b/Makefile.in
+similarity index 92%
+rename from Makefile
+rename to Makefile.in
+index 6060ee6..d97e222 100644
+--- a/Makefile
++++ b/Makefile.in
+@@ -2,21 +2,19 @@ ifneq ($(wildcard .maint),)
+   include maint.mk
+ endif
+ 
+-ifeq ($(shell uname),Darwin)
+-  LIBTOOL?=glibtool
+-else
+-  LIBTOOL?=libtool
+-endif
++CC=@CC@
++LIBTOOL=@LIBTOOL@
+ 
+-CFLAGS?=-O2
++CFLAGS=@CFLAGS@
++LDFLAGS=@LDFLAGS@
+ 
+ CFLAGS_DEBUG=
+ 
+-PACKAGE=unibilium
++PACKAGE=@PACKAGE_NAME@
+ 
+-PKG_MAJOR=2
+-PKG_MINOR=1
+-PKG_REVISION=1
++PKG_MAJOR=@MAJOR@
++PKG_MINOR=@MINOR@
++PKG_REVISION=@PATCH@
+ 
+ PKG_VERSION=$(PKG_MAJOR).$(PKG_MINOR).$(PKG_REVISION)
+ 
+@@ -26,10 +24,15 @@ LT_REVISION=1
+ LT_CURRENT=4
+ LT_AGE=0
+ 
+-PREFIX=/usr/local
+-LIBDIR=$(PREFIX)/lib
+-INCDIR=$(PREFIX)/include
+-MANDIR=$(PREFIX)/share/man
++top_builddir=@top_builddir@
++
++prefix=@prefix@
++exec_prefix=@prefix@
++datarootdir=@datarootdir@
++
++LIBDIR=@libdir@
++INCDIR=@includedir@
++MANDIR=@mandir@
+ MAN3DIR=$(MANDIR)/man3
+ 
+ ifneq ($(OS),Windows_NT)
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..13cb888
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,16 @@
++m4_define([MAJOR], [2])
++m4_define([MINOR], [1])
++m4_define([PATCH], [1])
++
++AC_INIT([unibilium], [MAJOR.MINOR.PATCH])
++AC_CONFIG_FILES([Makefile])
++
++LT_INIT
++
++AC_SUBST([top_builddir], [$abs_builddir])
++
++AC_SUBST([MAJOR], [MAJOR])
++AC_SUBST([MINOR], [MINOR])
++AC_SUBST([PATCH], [PATCH])
++
++AC_OUTPUT
diff --git a/dev-libs/unibilium/unibilium-2.0.0.ebuild b/dev-libs/unibilium/unibilium-2.0.0.ebuild
deleted file mode 100644
index 22b6e120a8d1..000000000000
--- a/dev-libs/unibilium/unibilium-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="A very basic terminfo library"
-HOMEPAGE="https://github.com/mauke/unibilium/"
-SRC_URI="https://github.com/mauke/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+ MIT"
-SLOT="0/4"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND=""
-
-src_compile() {
-	append-flags -fPIC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die
-	rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die
-}
diff --git a/dev-libs/unibilium/unibilium-2.1.0.ebuild b/dev-libs/unibilium/unibilium-2.1.0.ebuild
deleted file mode 100644
index 38287f93cf52..000000000000
--- a/dev-libs/unibilium/unibilium-2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A very basic terminfo library"
-HOMEPAGE="https://github.com/neovim/unibilium/"
-SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+ MIT"
-SLOT="0/4"
-KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos"
-IUSE="static-libs"
-
-BDEPEND="
-	dev-lang/perl
-	sys-devel/libtool"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-no-compress-man.patch"
-)
-
-src_compile() {
-	append-flags -fPIC
-	tc-export CC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die
-	rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die
-}
diff --git a/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild b/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..361950435198
--- /dev/null
+++ b/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A very basic terminfo library"
+HOMEPAGE="https://github.com/neovim/unibilium/"
+SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+ MIT"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0-no-compress-man.patch"
+	"${FILESDIR}/${P}-libtool.patch" # 828492
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/unibilium/unibilium-2.1.1.ebuild b/dev-libs/unibilium/unibilium-2.1.1.ebuild
index d2448195ad85..a506295cb055 100644
--- a/dev-libs/unibilium/unibilium-2.1.1.ebuild
+++ b/dev-libs/unibilium/unibilium-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~x64-macos"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl
diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index 87b5a78a8bd3..d54dc9abf8e3 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -2,5 +2,5 @@ AUX unittest++-2.0.0-Add-support-for-LIB_SUFFIX.patch 2311 BLAKE2B c7d8511fbf097
 AUX unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch 999 BLAKE2B 02ac677273d5b2c52e23683b878df04095ddfdc294c87778da71e1e3f4a2c0b2012f9ffb78f92f43a5667b8c76426abf094b8048c76283f69951f3e8e3fbb104 SHA512 089ab6aa6b68f52ba7d61a4b7929cfefe4feb25b73ff6ab0f05e9a8fec29e502bc2bf5c16cd620808e24267f04b3330572baf232d8ce78e459d439c22b22d0b2
 AUX unittest++-2.0.0-fix-tests-with-clang.patch 1018 BLAKE2B 5913b010ceae5975b8cdcfe7656c137cfe47845ae92815d3b7fa66f429a712e686cb7accb400c43149458b6716020c7ff48f0a673a7c2b7bcc36f5cf0fcd40ae SHA512 dd77794e8c22e168235f14c3c00381bf7439bfe60a700ae038290c93e2f6faa276d4f45de17a159d7a1edbb182a40b078b7751a25e1dcf646e7d311fd33e31cf
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
-EBUILD unittest++-2.0.0-r2.ebuild 1260 BLAKE2B 16b520c9aa6a576b062326514293ee3bfad50236ac041aa7ee6b7e88b6527f8812466c6dfe365044e7f4e867e919894034468e018fae71e1e9e36d7662d3d1f8 SHA512 0cd33763054d968c9c7503dc04c18e7bf5eba406f5c028c3d7647305ae1b0b803808c26894de977597b783f4f94622de07133a0a78dc473bfa2f044bd7ffde8c
+EBUILD unittest++-2.0.0-r2.ebuild 1267 BLAKE2B e7a2550ee7f3ffe2f19f5f993a24a68aa84631699a5a95dfd9bb6ce064285396346f2226534c5110aec853a0c26b4ef62cb9ba7215f0cd75131805563d50355b SHA512 d9c404bc7277e1f395283b8e1f6fed6da54e084ccfbbd7ae66a2280ed8a6c70ee41d5f0c1d4b1c67743e094e6167527f28b2350463843b44df4910522e298c86
 MISC metadata.xml 409 BLAKE2B edb3811be0aa57e581bc2d4597ef3e106c81fa5cd37855da621cc0094a359ecc8308ca8f58603aa2292b84fcdfc66e6cca2020462a774a56375192cdf93134b9 SHA512 226ff58d03787c5bf67786de6999bc5a45c793ba2326223d24024695de42ad168fcc51f5c1a0c08e9d5f63a14cd7f25464360febfe6a4c4ad47b70621c656b50
diff --git a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
index f2f646d68e0d..f7450bcb036f 100644
--- a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index e4f8701bc274..9bd44f48da10 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,7 +1,5 @@
 AUX userspace-rcu-0.13.1-loong.patch 5308 BLAKE2B 94ca49f47c68efb8e368033ee77eeeba0484735d7bef2ea15bc1956a9c05c8f5d275f521412aa3bcaeb4221e86240b6d42b04112d8a3565fc4074b84059d460f SHA512 32fc545a8201cc8a8db4d38c4fc3ec93c0717e23a87cd0533be0e60ef47027d8442547cd0cd46e4e99d235efcf8045eb8c106fde1e3389256fd80114b20df5a6
 AUX userspace-rcu-0.13.1-tests-no-benchmark.patch 441 BLAKE2B 8e5737b349d21ae4cdc87b821027bd500f35921afbc1d506977038a79b14e468ea3dfbf7f2d301e905217b3454641ab81c3eceae7a597dc777967133f66b7c20 SHA512 a1749498e1b038b003502d1c40aa664fea36558f403229bb7c28a0540ef341fc578dcc46985a45a8dcd59c3a7e035efd205c40288d58c0e5866af019b65e0d82
-DIST userspace-rcu-0.13.0.tar.bz2 608434 BLAKE2B 11b5d13f4e1a577cc33ad430eb387b26cc2db2ba9ff32c7a09f9cb6c8a418548cd87c198ab4b63be3df884d8e3878046ba817106ff2f07cbab86dd60c9bb1d34 SHA512 7288b5a4a2dca6a75ecaa8553b942b9e7be9cae25776d2448fb0b0c950af9919c369791839607c6c1e6cbd32bbd1e1cafc18ee753f0e3bdc2ed7b65488612580
 DIST userspace-rcu-0.13.1.tar.bz2 609961 BLAKE2B 96581fb3e90764870d2eb3eff6999e3c20bf206e3a0d5c910acfe693d55e0cb389fa5126a74d175f3c46655e740ecf1c1426c367eb3c28f3ef3a634848e51e83 SHA512 c86f2eb260cccb3cb6bd54ddbc0b46e60083fc99423e9403242ebed7f39a2a49c68af933ea6f373e2a9d4f9dc56f5befe030740891e28cf2fabe927a48ff8182
-EBUILD userspace-rcu-0.13.0.ebuild 921 BLAKE2B 978ef09483a3e55f0531bd053ae90e19b325f0ea8e1d6779c103a92ce69979bd61bb968327b2857c21cad1079758f343857d2855939e2b6a11cacfc32cabe542 SHA512 c36757747954a8f77102fbf5ba9ad02e3536af0441298422cd5cd5e909158568abe69a1e57362ff05507988be35b13496e170c7157c6b11e1d67fcd63d405a27
-EBUILD userspace-rcu-0.13.1.ebuild 1107 BLAKE2B 61c0c14360074e58b4da252c2085c0792abe3e94eb246c45c9874b96dcd5b2284428b00f353de79cf1a7839c3068aa118f638739d9a0b44812ecc6bfaacd39c1 SHA512 2dfff6046662954d59d978032e7a599adfa38bb1ccaf6a4b5688c6cb116c548d7cdfe7baf5eea6be98c294c9126b145babdae9d80b2f6bc0a3adc9c970e23321
-MISC metadata.xml 357 BLAKE2B 11e5edf30ea2771ab569b3353e6bd726f3d925347cd4c1f601b4c57b03ff9ae4c68a5a338b4cdf101060af34f4f13e3fe1a7cc8ac5a7b7218bd16ceab2ca048a SHA512 640a8b8fe2188028e7c0da0aba2069167d8799faa37b66c0bed3636c386e9e250865453b3f370a0123f713f72ef35e0a1ee54e7df66a56985e8e42f6816025a0
+EBUILD userspace-rcu-0.13.1.ebuild 1106 BLAKE2B 178a7101a35c4ac47d1ec5522b59d23cf0f1a0a15f569a1b3fb6846a720f92bafc7fc6b90398b3e11f8b5f98e1a16690b707b94ec869ce32b910e4ac132a0b66 SHA512 79ff76ca5bc0dc71a9548d927e61d64afde3232fa1bc5a64391252386d183a51c3a55546b138626eb526c630f68efe0cc28ff0e266c825247ce38c7573e1a221
+MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/userspace-rcu/metadata.xml b/dev-libs/userspace-rcu/metadata.xml
index dce48a4a9489..b0d83aa2e489 100644
--- a/dev-libs/userspace-rcu/metadata.xml
+++ b/dev-libs/userspace-rcu/metadata.xml
@@ -5,7 +5,4 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<use>
-		<flag name="regression-test">Run regression tests (requires FEATURES=test)</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
deleted file mode 100644
index 0e94ce6b9ec3..000000000000
--- a/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="userspace RCU (read-copy-update) library"
-HOMEPAGE="https://liburcu.org/"
-SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/8" # subslot = soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="static-libs regression-test test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-process/time )"
-
-src_prepare() {
-	default
-
-	# Refresh libtool (see https://github.com/gentoo/gentoo/pull/23973)
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-src_test() {
-	default
-	if use regression-test ; then
-		emake -C tests/regression regtest
-	fi
-}
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
index ab5f96219bd5..a534a4ce7d3f 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index be63b2b655e9..83e86ce04433 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,4 +1,4 @@
 AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f727546d7c1c62f72c6d85a38c477c7a439d1924188f046ac263f21153f5499a1aa29aa0b9061b0e683f101951f1b53 SHA512 046e619a75a8ef28c7c18d078ffba1653971536a287ded36b22c6700358351fd95b2709318ed05d68e81edc13a8f7abdb03d0c5616a01817752fec45605215c1
 DIST uthash-2.3.0.tar.gz 191291 BLAKE2B 473e263df9f3555c9ef41c2b39cf2ed33a4624ce7325bbe52db805ac741b8383e64f84a9e249f96faf40e0b94fa4a7fc6c0e83bebe8b3677a90cdca82a4e3f51 SHA512 3b01f1074790fb242900411cb16eb82c1a9afcf58e3196a0f4611d9d7ef94690ad38c0a500e7783d3efa20328aa8d6ab14f246be63b3b3d385502ba2b6b2a294
-EBUILD uthash-2.3.0.ebuild 682 BLAKE2B efa59e549fd23a68f9c7378d5ee403702660be1d2109bc52cca542952a67d9ee8638119be99178998671de130c63bd8ca583a8917f3ff18e3f63db873421e7e1 SHA512 bd8fce2fc9fd0296fec3313442bb2714ff4b95759786a61398ab9636d31c6cc1b53333a7ac48b6d401676213d5eb8fb53e96ebfc6b891c828f395b95a67a77cc
+EBUILD uthash-2.3.0.ebuild 679 BLAKE2B d52d1efc1804d73b01421637d03d751a80c3640ee0775710e3a29768cff67068c7b5735b3782f033acb9e42b082f5e471114f4cf4ee035e607f976ddb49eb14e SHA512 ed7dcf6580986d2df09b20ca83676dc42d0bca0550be85943019c7c6715854dad60c1468abae91bd08038c85f78b6383203352b44479dab0fa660ac7df42c374
 MISC metadata.xml 333 BLAKE2B 3c81a1a696bb53654558b17bb88f9b1c7c5086a07ec61148924b4ce062846233d5642304cb770b51d823de1d1bf86de538009d66099302d0a3a62e25b1db172c SHA512 bb882dac43b09c488ee541c90b05e8a4c62aa8700d3b85c3c491a2e5bb918b7b6032a018ed5a23f6e5c093c8e2b32bae8c7416119f12243e7a1700e83febc900
diff --git a/dev-libs/uthash/uthash-2.3.0.ebuild b/dev-libs/uthash/uthash-2.3.0.ebuild
index 41f2591d79e4..0092575fb688 100644
--- a/dev-libs/uthash/uthash-2.3.0.ebuild
+++ b/dev-libs/uthash/uthash-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index d735b3053a0e..a2cae91b91cc 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,9 +1,3 @@
-DIST vala-0.52.10.tar.xz 3598676 BLAKE2B f1d54634ffb8a152e5672badc912338a2982a81f5ee998b05212de807197d3f5cdd5b08ec9b521a004933fa6585b24b1e45a9cbc1a375c9863460350d3d3749b SHA512 d7517c25228db9c69bc68e16ed3903ea5dda016d5e84183491fef0b65edbbaf34065e785b0e0dc48f3af2460dc9ac6c435436f460b01929b2403ef0b9a2ad2d8
-DIST vala-0.54.7.tar.xz 3916868 BLAKE2B 0e9f1e20f7f2dc2e1b024baba6e64e9d192de7d9978c6f9b2ed37e5fff9e95e31718e7a44761c98e8fe2aa790e9464259df004610d4cf863ef39afe45cedd37d SHA512 7d3345984c496e9fe6324fea6c4fd8d2887102b271d825740b0f5812538dbdabe9c88ec4022d25c34121df686200cce48d4678ec6a00b2a002b9e74242475440
-DIST vala-0.56.0.tar.xz 3958820 BLAKE2B dc4ac5ad65fd2650eb2ecf1cc8e7ed177a64ae7d93120793941760417b6d8d5992cef1a557a7de3f39cf1e646d00fa853ccfac7414c742d9cfcf313945cbd356 SHA512 dfaad6fc143835d601c586b270e7ee63309341fb9b7f023541bac75e96759d0eb9c563c67aa26acdcd1fb89a4a08759107f8a6c8e887f7d402fa2aa50a2e4038
 DIST vala-0.56.1.tar.xz 3960476 BLAKE2B a78786c51ce35735aa42e5e22a09bd29f98b19608651843c32c84ca6901a22971a2128a85a1e1e110d0b7d14cb89d4164688c289090a4299bb11540180548cf7 SHA512 83c34ab0497a9b7a627db8c1dbfea9e76c94b902e298afb2c30ba9824717f2fe3b0e26b987feb93cd4ff0ce211d0ecd9a746cc18c00e41c4c6fd01d05947902f
-EBUILD vala-common-0.52.10.ebuild 645 BLAKE2B 83357d9b5e013241456d8afa2caa3078a652686f76ececd9d5c7b85f0f7d0da13b7ff48f797db27419811ee15ed94e0e7ff2717587ff8eeb4ed2beafca6832a3 SHA512 ee301c5563e517cb3f194d58418353cb95fbc493c4125c1caede2b7f91beb8b56d31285eed240ef8e27fa5361f8de18540cd775e97c7ef097308ca206e4732f4
-EBUILD vala-common-0.54.7.ebuild 653 BLAKE2B 01e790e858e3e4f602c15f208309927cda5ef9c2a808ba7c524198e9ded3746017dc2dc37740a413a4dc41873cc2e197736348802099165c11272e64447709fa SHA512 ae5cac34fb4d0f7bbcebe84ab30378cce75749d593848991856aca9990143e5213cfc124b2a4eeeb96d30230efefc6219d17335057d9c5c6d4ab44efb29b4708
-EBUILD vala-common-0.56.0.ebuild 653 BLAKE2B 01e790e858e3e4f602c15f208309927cda5ef9c2a808ba7c524198e9ded3746017dc2dc37740a413a4dc41873cc2e197736348802099165c11272e64447709fa SHA512 ae5cac34fb4d0f7bbcebe84ab30378cce75749d593848991856aca9990143e5213cfc124b2a4eeeb96d30230efefc6219d17335057d9c5c6d4ab44efb29b4708
-EBUILD vala-common-0.56.1.ebuild 660 BLAKE2B 827860dd4d4fadd7f5ec558554a5241682abc3d68656c2fd955e99d04305c82ab79aa269e3edf7994353a2dbd255ef6404f15da8b4c2666cc66820c5007f7075 SHA512 cecf8ea28e0dbd898864f210198d6e65cf4467971dcb74a33bf1cb384a528eaae4f65e6a427f160fe77feb57a333e34d48e637af05854d24f0551da27cd9a0a6
+EBUILD vala-common-0.56.1.ebuild 652 BLAKE2B a6f3cd9df801208cec45606af33db763d5abdee123bbbbb89399f510b2bcfbeaf9cb345530787d997eacc1367f97ccb93471e6a8aa154b4911768b180a45a0c4 SHA512 3c92712b742cc3f84cbf16f5851260287a42a9fb7eab5110223e30fe30be2a43a8f76f7d452ebe70e9c8adb0f8b29fc17c18d8fe0f08d7dbedf100f660166dcf
 MISC metadata.xml 326 BLAKE2B cd8c49993b750ebef93c620f819f42b858431d1aab4d2066a124a5118d5d18f4970b9d1eccb77121089264db7cfbe69ca06fb2fc2d2c4db98047629af9878db5 SHA512 52854d43fb74af5402cb1855409ab25d6741ea6fe48ae50416044d7b518745b02752e69cb9680e9c132e3a2f65ae29d92e9e771ac883e2ef01ae91effdf1097f
diff --git a/dev-libs/vala-common/vala-common-0.52.10.ebuild b/dev-libs/vala-common/vala-common-0.52.10.ebuild
deleted file mode 100644
index b607b6d6c6e8..000000000000
--- a/dev-libs/vala-common/vala-common-0.52.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.54.7.ebuild b/dev-libs/vala-common/vala-common-0.54.7.ebuild
deleted file mode 100644
index 40415607535f..000000000000
--- a/dev-libs/vala-common/vala-common-0.54.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.56.0.ebuild b/dev-libs/vala-common/vala-common-0.56.0.ebuild
deleted file mode 100644
index 40415607535f..000000000000
--- a/dev-libs/vala-common/vala-common-0.56.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.56.1.ebuild b/dev-libs/vala-common/vala-common-0.56.1.ebuild
index 6e33fdc86430..1459956c9ae4 100644
--- a/dev-libs/vala-common/vala-common-0.56.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.56.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/vc/Manifest b/dev-libs/vc/Manifest
index 6e4801afda8c..3d691ef7d878 100644
--- a/dev-libs/vc/Manifest
+++ b/dev-libs/vc/Manifest
@@ -1,6 +1,8 @@
 AUX vc-1.4.1-missing-include.patch 417 BLAKE2B 97bc99422cf68cd2aad45bb15f8314bf0fbc23d671134facddb79e1a37417c08472618496195fe014b0ec63e1a35d9a8a389b626d6beb199d6c03adf516f4813 SHA512 6bd54e083f560d1ad14ea88ed96937b91132138a62fff8a43a23a72eafd12b520e4419899da46918ca47dd172872e515075c28a053b834ee7f5899537d79698c
 DIST vc-1.4.1.tar.gz 638797 BLAKE2B 38feab898a4ce2b15c4db508369426a6b470f24b81e6676ad0e667cc08efaf30e96ed1455c667372104192fe6eb2340fdbd367298fa68e3168350c2e134cc0b8 SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
 DIST vc-1.4.2.tar.gz 639711 BLAKE2B e8ef5c1249f1d5bff26997dd2b9e7e5923682a5251119b23fe4e7d4f9a166b4f9bfa0f5599d1fc4fd6ca390515e51039051c2afb17aece4c2c40a3cbd6ab630e SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf
+DIST vc-1.4.3.tar.gz 640398 BLAKE2B 18a5bf346b433c08b565fe4e39395f2126fff47561651d5adba677de40c50e1f1d26cef2ae6ee7f9e18f4334116aa1ad3c0bff923c61494a4ccac4d7ac2d1991 SHA512 7c0c4ccf8c7c4585334482135f2daf1a5bc088114b880093893583bdcea1fbfcec02485da6059304c510c8b1bb1b768ef04fd7ac8ccb21b9ebbad5d0d5babaef
 EBUILD vc-1.4.1-r1.ebuild 458 BLAKE2B 9b13a354a7ee8d0b39bec13dfbf56444d792e951206bb38f830d69da503b6770403d3126e16bc7535eed3143fea589ae73146cdbb93a35290022cf66a814a4a6 SHA512 823fef7d55cf03bcee0ec4b0fd33a9563962c420ecc2f559a763b1f8d540d066c842f88a15d645bb8962fb8a65864aba1590fe8a49982dd183a082c450c4dcba
 EBUILD vc-1.4.2.ebuild 408 BLAKE2B de20c658fbfe1047354a258de32f66a7d74511079ff7349e21fbfc4483cc1772b268f1ca45983d0bf3a98fc8d3a25237464dce0b402119edff6f4cc3d5310c7d SHA512 1c7656f430a7fa55eb62bddfcbc5d30609a89f880e1db5cfa6e2588d0f13aed8be1864712da16b944bae4eb411b373671479d3fc4e2ef6e12d803d9da5de15e4
+EBUILD vc-1.4.3.ebuild 411 BLAKE2B b05ad44538efb9380afae1a9a7986ce9c1721cabd016883c66b1b8c0200df5ae4289c7bc9fd2ecb7a749dcfb5a73e10717f195b4e8cc34207f07a07f51c48c43 SHA512 60a063125bf11068dce100a500aed5828ec5c51412f2b3be384ff88d02a4fcb44b122a77064dfdeaf4a21f30556957caf5d6bc328d688227e3a8a7c1133ee921
 MISC metadata.xml 293 BLAKE2B 26e0cf3e09132dad5bb15a404c6e05ad3daa89e93cbe81aac804cb3d1b3f2d963b2beacf6582ea1f797bef623bdef8335ea3d4773bbb3fc69e99f0223b61d254 SHA512 36dd5362844c25d6be6d7d3133dd24c5a3b7831c0dd5e73b7e2c7474a492cba5944e4c0182efb2fddde170e196b47725bb0c3c541f8c2dc4861389f6752cf651
diff --git a/dev-libs/vc/vc-1.4.3.ebuild b/dev-libs/vc/vc-1.4.3.ebuild
new file mode 100644
index 000000000000..8a6631c0494f
--- /dev/null
+++ b/dev-libs/vc/vc-1.4.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="SIMD Vector Class Library for C++"
+HOMEPAGE="https://github.com/VcDevel/Vc"
+SRC_URI="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Vc-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index b83f655aaa55..116e3c93e959 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,4 +1,4 @@
 DIST voikko-fi-2.5.tar.gz 703898 BLAKE2B 596425311bcdbbf8af97bc32cd69c59cdfa56300afbce22501f084b138ffbd7a915f08628e40a832110e9d366d128747d7e7a0ebdfa38a7734c4f1c1cb303997 SHA512 6de3c6c13a9fb05a463a55177dc1707d5e4ca01c7ccf08e0f8ab73cb3a353ee4935adc23a1b5f6c5da568dbb075c081a700d8d46eb99b6bcbed0efb4d977f59a
 DIST voikko-fi-2.5.tar.gz.asc 833 BLAKE2B 329d442064adee3967b703e19edcdfb20a03e3337751282129e2816f265fcd4ada9c2ce82c146bcde8a644e47b462404ce9abf99f5bc6d2fe2f986f83b73d1e1 SHA512 ccdaa4e76b81f8ee8fcc20c1d870200a1255f9aa84c8dae139f343e8b2cc9ecefb38a16af8653e9c94a1e5cba25c850b8309d406e3d5b323864c8c0ad38979eb
-EBUILD voikko-fi-2.5.ebuild 868 BLAKE2B 9797e4c2f23e4311049b8ac2c3d90a0314c05c80cff1ed588d48959ec1967a30feded1b48296539294f26cdadc6acebb2d93acf5fdd3f3c00fb6f303886c7c3c SHA512 de14f929ef2bbd6f555abe3eba0ba19fb6dd01f4c2a4285ea98f198419a628765c4e059bb856ae3c97b19bd9cddb09f039bd065530822e72f55f0fd463474c82
+EBUILD voikko-fi-2.5.ebuild 871 BLAKE2B 99b3b6a84fac386874178d02d491dc024f06167fba19bfce81f2789743b83f7ce1faf9afe3bc408f7af5dfd246db07175ca1cb372cb3ef7e1e504c759903b187 SHA512 4a42ae789bea826b95e546f9a1ecb6eb3ccaad270462cc00434c2c2b374b1211b94b721665dc3c2c497e4e0e26f3dde49ae31e0fe7035861457793b6c8a98031
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild b/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
index 2701c83b09d3..24cce961816d 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
 
 inherit python-any-r1 verify-sig
 
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index d11061f02733..b7bbbf1064d0 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -2,4 +2,4 @@ AUX volume_key-0.3.12-find_python3.patch 894 BLAKE2B 7173a00937a78c2b883d554e7c1
 AUX volume_key-0.3.12-support_higher_LUKS_versions.patch 917 BLAKE2B a637ba7d7761032bbbae34378a1cd8da57cd96c762ebeb50fce0ca28b7b154df11bda89af203d18833e7841fbd9181c01ee5fcb11d80d765fd147e82440becca SHA512 e784115d85f782db46dbd67c40c3a6b0864b69ce8d13b6a67d70471d39079e9fc0d9d263bd543556d645d7dc922ef22f641491051dd736128cdaecd63df2ff22
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
 EBUILD volume_key-0.3.12-r4.ebuild 1167 BLAKE2B 519192b1d7bbce5578629b58b4e518ece4b752945509c42c21a703dbe7d2a055a10c719dfc2da07ad0d63f2ff64dbca42fe1c688443012334807b7aae874073b SHA512 bf8c4dedf6ec1e816f3ee68e21a427b5fa648fb893a3d670bc9d9a5808ba496e40fa929162232d0044195b797075d4fcac576db72f07856742eebec6b205d949
-MISC metadata.xml 258 BLAKE2B bd458e931e669f3599d041086b28cb8e05f9daca13a17504ca4bdf6a19f9e0e0bce389981d9b65875a04e7a6e068aab4d7f92819a6c545638a1e37ed462866ac SHA512 f3d8019f0e5fb12b60d75645d9d8468cc5ca283d1df19b23604a58221cf08b7a5b63744e4e99f26c80b798e2caf52c5a69f8d383c3aed06f7a1996e72f7f36bc
+MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/dev-libs/volume_key/metadata.xml b/dev-libs/volume_key/metadata.xml
index 2ac0eef8d76b..bef24d2c2337 100644
--- a/dev-libs/volume_key/metadata.xml
+++ b/dev-libs/volume_key/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 24376672894b..cbbebe2c83b7 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-protocols-1.24.tar.xz 77120 BLAKE2B 912132cb2b65b99184f25942e02000444ce5d37b60f33363999e8431db5835d3c0dab41dae312f0dbb02d03ab7e4f3f588e7b507e767ec132a82fd816700b09a SHA512 4b1122517db56f48a5fafd4bd0cb7f94faef6fdd2d80e6cec17e5a6bafbaf2f5a71b958ed12e6d13965494885c209b2fb6dd8331487b39c6f251e71f1e770a15
 DIST wayland-protocols-1.25.tar.xz 79784 BLAKE2B 6ca7fdc910bfd70ee5c3bb192bcf1c79c66c4bb713531b2d1d493bd3ec8509e1231176144d75f4e97a4c6ccc4ee1d836a7ac1cfeaaa59e927f10fa4a40cf023a SHA512 8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f
-EBUILD wayland-protocols-1.24.ebuild 748 BLAKE2B 8b993cf653000a28fb907eca38e142b92a78d91f3e8a57bdf77650b3310b9c8fab3e5445e3daabe6fd11af00d2ced745e00ab0cf4b5a84086a6425107b65d891 SHA512 dc0b169ce9c4ad4fc89f47d0a09cdea9217046d0dc40cf6d79cf1b8f780cf5f9b94ff05d2d278cb53c798cdf265198db836bc4da4367e8d5943c5d26a6802434
-EBUILD wayland-protocols-1.25.ebuild 757 BLAKE2B 4b28432a643348de6d4c8592be6f337eb6e753b1a7020172a59680deef861275fa99052be3c6d89b8d74f4fb266919cc6ba5626423d85a531da0b61a89cdc46e SHA512 eed46d6d89fc8791649e8884228da28a8a32758d6c8a2e4a4a991f8578b76bb8cf7496d55dff2a1d126a9a00e3de93bcb6c6885e0b0b5df639023b590263b169
+EBUILD wayland-protocols-1.25.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
 EBUILD wayland-protocols-9999.ebuild 762 BLAKE2B 4f80b6c474c0ea97061ef6fb7703479bb82831a9a25450269356f967855e5b2d255d09a55db9a876ff7789dd8eab5d32c875c3947bf6e64c8eeabeb4c3faed4d SHA512 09dab59db34d5361d9630dc45c7728cf20c5f4491f6022093062b37756b776404964031664dd97efaaa878eb6fc850ce861b32d8e764173ecb28d432452ed719
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild
deleted file mode 100644
index 5e506be1a991..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-libs/wayland )
-"
-RDEPEND=""
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
index 242f37338ccf..873c3dfde4c1 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 7194a6b97dc6..5f9d4d077fac 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,10 +1,9 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 AUX weston-10.0.0-backend-default.patch 828 BLAKE2B 2c6712737bc6e2d1a37d89b5ba4ea93fb30d137b8d76b77496f82503892bc295d19e97d8de223377328f8aa32721544f7a67f904c22bd1f1483fa99bf6c5f15e SHA512 e3cf66567ed8878ceeb0cde40f3c3aac8d20a04ce501d4fba8429f9d7552dc53ef4eec0cf103bf7e1e93fc9bdf224b20c628c9dede3e545455735fd95ae5dfea
 AUX weston-10.0.0-test-deps.patch 1052 BLAKE2B eaa6d9950a7a932686d11d9b9efb9ebfc602ac82db14348d4c1701a0420a85469e05c5af76568a6189546f4d8b5f05bac85c64e7168522af4cc0a5a3d31a8050 SHA512 7f59b5da1ec7a885d53bf48c12a13cceed6e7306c018e9921d64ec1856b8d125421f7af0aa227785d794924c6f035bc79a681eb9331adb17fb790f82c28d0f10
-AUX weston-pipewire-0.3.patch 11856 BLAKE2B aebe0f4859a0ac3144d8f631fd8b5e35c02f62217ad94106c138aa6095430a2aff7aedf88d67f95991d32e9c728b6704746fedc9858e41e5d99900722b6617ec SHA512 f3e028df4967672c58e1cac66fc8b7781252f15094439dca399d820d945156a15f1e420a8ed062584dcdd7c9577849127aa52974639877796ce91231123bf50d
 DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4
-DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
-EBUILD weston-10.0.0.ebuild 3928 BLAKE2B 89db5149bd38321adcbe6b60ff883f5d4cc0497c3b18372c1e3121f0b005de5b9f4d1c09ce66df9b7c2ec77a929608d84ff8e3b663e44454ba8f161ac45a0902 SHA512 ba9b3cab6756f694b5af29c0a3bfc2227fa4469a6b13dd8e82e3c9fa10afa95a18b00ad7c7e6b0f30cd1df742d8bb2d37dd3b2d5ffbe69b206dc886f9ddd2b03
-EBUILD weston-9.0.0-r2.ebuild 3807 BLAKE2B 7a8728b739b34c50c1f864d15acb1394b40783a2ac6161f5035faee9ca360777ea6efcbc0c1826e3a60ce7f53d3a05b6bb4b391e1b33727c95b538ea6d80f12f SHA512 fbbab98f6735ebd5b4d9427d9ddb481e09ef37c85199a22a68b066ef93a88d92bfe1d95f72c95d3335f614e4d4bb91de00f40a209713576c3d0f87e3be498a1e
-EBUILD weston-9999.ebuild 3815 BLAKE2B ffd80f511c1e14766f6a8f68ece3392aa1e0a1d2ac6e11732f98914656bd5075a09c55f73e8ff0a0453b481e4c067d9557335755c55ab2376302079372e6b7bc SHA512 b14628f84f9f71e6c0a26c94814bb4c22634a8f80c3bd12cca4916504d0f081eb2863a1f5843ff2456a52af24b5bae85fb3fb2bf0a62157e59202b30abe9c9ee
-MISC metadata.xml 1578 BLAKE2B 302ecc49dda1f6327a73d7dfcae61accf15323cf19e2d4dd322ae54612fa738331614efd044ec148a6bdb3d85895d789c962fad224a5fa88f45f2228421ef089 SHA512 104a8c428651e8c7e4ccdf8332be0af8bf00f3cd36afff301bf5fbd2f446fcc64e9b9ccf3acd636f4e4357a4d4d1ecac0cc747bdfb7089508900abdca5d96bea
+DIST weston-10.0.1.tar.xz 1776740 BLAKE2B e672d3d7d87782162fd79778fb7dab1e81de688d33bc470bb3d151da991ac94e680903781a9d7d8130df6136931d0d2badacc6aede09c96094f9fc2698ea4545 SHA512 688d843096a95b463161b98e85ca3443b31ba2ee49fc8d456a2780cc96f576e9d097054e9f361997a66e9cc8373cf29e406a742dae3884b3b50b26acf1710c8c
+EBUILD weston-10.0.0.ebuild 3934 BLAKE2B fd140a51aeceac3251a2f5f0878cb5f4e37b630c4ad7807873ac041c863f490bb7845d29086dc17d169856dc8e9dd9a1e87c042b94c6e46ef2b5ae0810412ef1 SHA512 f48f41f7fdf96d2b1a9842150d57e1fd394b7e86725318aabb8bc472d7fab2483e1e4654c37271f13dc92efc92139e58c12bf8972d250028d9f7dc7dfd469921
+EBUILD weston-10.0.1.ebuild 3872 BLAKE2B 1375a741be055b8d4a107a4e1d340053bfa2d8e792efecb0a40728bae205124e02bdd34d7a8db5d190b9d85022030f7117f068c225a8492f4328f5eaecee73da SHA512 9f948f3bc883290e058244149c9de0e0c11132fceb9f8c142003765d4d7a16f438994ca8423c2dd2c1f060b9dcdacc516b3672d9dbf9c790dca817850fc5eacd
+EBUILD weston-9999.ebuild 3736 BLAKE2B 9529febf4619e0464c7e479a2c064ea3811c18a2dbe750656efd4459f666bf6f81669c1f3e62b82a9d10fe6e04b3f424251ff063209aefa7408d81aa0e6a2948 SHA512 fea8d317c942d84333ffa7456f78eef654a0127c94fca386ca2402234d156a919f2223fc0daf2b2879f33c17c930f3f3e31c46df98d3a2c6f7a3cc8e5d20dbbe
+MISC metadata.xml 1520 BLAKE2B ac2338fd000b3549fa197f281e439a09974d1bfd13afa766f255727a58a793fc8b4a6bac2237afb59029d11b02fc7d1dfb69072d9db227dd6f7db783fd842fad SHA512 434b1fa93ce9e1b8329301333ea47b73def8377c068735ad12d57bd5fd2ebdb5fc9e778b8df04bc4ac7b71dc7cc004fd8750581a17624d3cb3d2ff6faf81218d
diff --git a/dev-libs/weston/files/weston-pipewire-0.3.patch b/dev-libs/weston/files/weston-pipewire-0.3.patch
deleted file mode 100644
index a38250d8c8f2..000000000000
--- a/dev-libs/weston/files/weston-pipewire-0.3.patch
+++ /dev/null
@@ -1,373 +0,0 @@
-https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/456
-
-diff --git a/pipewire/meson.build b/pipewire/meson.build
-index 67db61f0777325695864db2bc6cf94145ed5564d..944b2259f146e07abdbd4773223f4bdb76dfa45a 100644
---- a/pipewire/meson.build
-+++ b/pipewire/meson.build
-@@ -5,17 +5,25 @@ if get_option('pipewire')
- 		error('Attempting to build the pipewire plugin without the required DRM backend. ' + user_hint)
- 	endif
- 
--	depnames = [
--		'libpipewire-0.2', 'libspa-0.1'
--	]
- 	deps_pipewire = [ dep_libweston_private ]
--	foreach depname : depnames
--		dep = dependency(depname, required: false)
--		if not dep.found()
--			error('Pipewire plugin requires @0@ which was not found. '.format(depname) + user_hint)
--		endif
--		deps_pipewire += dep
--	endforeach
-+
-+	dep_libpipewire = dependency('libpipewire-0.3', required: false)
-+	if not dep_libpipewire.found()
-+		dep_libpipewire = dependency('libpipewire-0.2', required: false)
-+	endif
-+	if not dep_libpipewire.found()
-+		error('Pipewire plugin requires libpipewire which was not found. ' + user_hint)
-+	endif
-+	deps_pipewire += dep_libpipewire
-+
-+	dep_libspa = dependency('libspa-0.2', required: false)
-+	if not dep_libspa.found()
-+		dep_libspa = dependency('libspa-0.1', required: false)
-+	endif
-+	if not dep_libspa.found()
-+		error('Pipewire plugin requires libspa which was not found. ' + user_hint)
-+	endif
-+	deps_pipewire += dep_libspa
- 
- 	plugin_pipewire = shared_library(
- 		'pipewire-plugin',
-diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c
-index fe7eb1d654d5ec67f7a3287532bb21c19ad9eac5..2c65f502c2917c23290a51bf1c24eac8d50129f1 100644
---- a/pipewire/pipewire-plugin.c
-+++ b/pipewire/pipewire-plugin.c
-@@ -34,20 +34,27 @@
- #include <errno.h>
- #include <unistd.h>
- 
-+#include <pipewire/pipewire.h>
-+
- #include <spa/param/format-utils.h>
- #include <spa/param/video/format-utils.h>
- #include <spa/utils/defs.h>
- 
--#include <pipewire/pipewire.h>
-+#if PW_CHECK_VERSION(0, 2, 90)
-+#include <spa/buffer/meta.h>
-+#include <spa/utils/result.h>
-+#endif
- 
- #define PROP_RANGE(min, max) 2, (min), (max)
- 
-+#if !PW_CHECK_VERSION(0, 2, 90)
- struct type {
- 	struct spa_type_media_type media_type;
- 	struct spa_type_media_subtype media_subtype;
- 	struct spa_type_format_video format_video;
- 	struct spa_type_video_format video_format;
- };
-+#endif
- 
- struct weston_pipewire {
- 	struct weston_compositor *compositor;
-@@ -60,12 +67,19 @@ struct weston_pipewire {
- 	struct pw_loop *loop;
- 	struct wl_event_source *loop_source;
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	struct pw_context *context;
-+#endif
- 	struct pw_core *core;
- 	struct pw_type *t;
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	struct spa_hook core_listener;
-+#else
- 	struct type type;
- 
- 	struct pw_remote *remote;
- 	struct spa_hook remote_listener;
-+#endif
- };
- 
- struct pipewire_output {
-@@ -100,6 +114,7 @@ struct pipewire_frame_data {
- 	struct wl_event_source *fence_sync_event_source;
- };
- 
-+#if !PW_CHECK_VERSION(0, 2, 90)
- static inline void init_type(struct type *type, struct spa_type_map *map)
- {
- 	spa_type_media_type_map(map, &type->media_type);
-@@ -107,6 +122,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
- 	spa_type_format_video_map(map, &type->format_video);
- 	spa_type_video_format_map(map, &type->video_format);
- }
-+#endif
- 
- static void
- pipewire_debug_impl(struct weston_pipewire *pipewire,
-@@ -141,6 +157,7 @@ pipewire_debug_impl(struct weston_pipewire *pipewire,
- 	free(logstr);
- }
- 
-+#if !PW_CHECK_VERSION(0, 2, 90)
- static void
- pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...)
- {
-@@ -150,6 +167,7 @@ pipewire_debug(struct weston_pipewire *pipewire, const char *fmt, ...)
- 	pipewire_debug_impl(pipewire, NULL, fmt, ap);
- 	va_end(ap);
- }
-+#endif
- 
- static void
- pipewire_output_debug(struct pipewire_output *output, const char *fmt, ...)
-@@ -185,7 +203,9 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd,
- 	const struct weston_drm_virtual_output_api *api =
- 		output->pipewire->virtual_output_api;
- 	size_t size = output->output->height * stride;
-+#if !PW_CHECK_VERSION(0, 2, 90)
- 	struct pw_type *t = output->pipewire->t;
-+#endif
- 	struct pw_buffer *buffer;
- 	struct spa_buffer *spa_buffer;
- 	struct spa_meta_header *h;
-@@ -203,7 +223,12 @@ pipewire_output_handle_frame(struct pipewire_output *output, int fd,
- 
- 	spa_buffer = buffer->buffer;
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	if ((h = spa_buffer_find_meta_data(spa_buffer, SPA_META_Header,
-+				     sizeof(struct spa_meta_header)))) {
-+#else
- 	if ((h = spa_buffer_find_meta(spa_buffer, t->meta.Header))) {
-+#endif
- 		h->pts = -1;
- 		h->flags = 0;
- 		h->seq = output->seq++;
-@@ -375,18 +400,40 @@ pipewire_set_dpms(struct weston_output *base_output, enum dpms_enum level)
- static int
- pipewire_output_connect(struct pipewire_output *output)
- {
-+#if !PW_CHECK_VERSION(0, 2, 90)
- 	struct weston_pipewire *pipewire = output->pipewire;
- 	struct type *type = &pipewire->type;
-+#endif
- 	uint8_t buffer[1024];
- 	struct spa_pod_builder builder =
- 		SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
- 	const struct spa_pod *params[1];
-+#if !PW_CHECK_VERSION(0, 2, 90)
- 	struct pw_type *t = pipewire->t;
-+#endif
- 	int frame_rate = output->output->current_mode->refresh / 1000;
- 	int width = output->output->width;
- 	int height = output->output->height;
- 	int ret;
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	params[0] = spa_pod_builder_add_object(&builder,
-+		SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-+		SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
-+		SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
-+		SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_BGRx),
-+		SPA_FORMAT_VIDEO_size, SPA_POD_Rectangle(&SPA_RECTANGLE(width, height)),
-+		SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction(&SPA_FRACTION (0, 1)),
-+		SPA_FORMAT_VIDEO_maxFramerate,
-+		SPA_POD_CHOICE_RANGE_Fraction(&SPA_FRACTION(frame_rate, 1),
-+			&SPA_FRACTION(1, 1),
-+			&SPA_FRACTION(frame_rate, 1)));
-+
-+	ret = pw_stream_connect(output->stream, PW_DIRECTION_OUTPUT, SPA_ID_INVALID,
-+				(PW_STREAM_FLAG_DRIVER |
-+				 PW_STREAM_FLAG_MAP_BUFFERS),
-+				params, 1);
-+#else
- 	params[0] = spa_pod_builder_object(&builder,
- 		t->param.idEnumFormat, t->spa_format,
- 		"I", type->media_type.video,
-@@ -406,6 +453,7 @@ pipewire_output_connect(struct pipewire_output *output)
- 				(PW_STREAM_FLAG_DRIVER |
- 				 PW_STREAM_FLAG_MAP_BUFFERS),
- 				params, 1);
-+#endif
- 	if (ret != 0) {
- 		weston_log("Failed to connect pipewire stream: %s",
- 			   spa_strerror(ret));
-@@ -482,26 +530,42 @@ pipewire_output_stream_state_changed(void *data, enum pw_stream_state old,
- }
- 
- static void
-+#if PW_CHECK_VERSION(0, 2, 90)
-+pipewire_output_stream_param_changed(void *data, uint32_t id, const struct spa_pod *format)
-+#else
- pipewire_output_stream_format_changed(void *data, const struct spa_pod *format)
-+#endif
- {
- 	struct pipewire_output *output = data;
-+#if !PW_CHECK_VERSION(0, 2, 90)
- 	struct weston_pipewire *pipewire = output->pipewire;
-+#endif
- 	uint8_t buffer[1024];
- 	struct spa_pod_builder builder =
- 		SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
- 	const struct spa_pod *params[2];
-+#if !PW_CHECK_VERSION(0, 2, 90)
- 	struct pw_type *t = pipewire->t;
-+#endif
- 	int32_t width, height, stride, size;
- 	const int bpp = 4;
- 
- 	if (!format) {
- 		pipewire_output_debug(output, "format = None");
-+#if PW_CHECK_VERSION(0, 2, 90)
-+		pw_stream_update_params(output->stream, NULL, 0);
-+#else
- 		pw_stream_finish_format(output->stream, 0, NULL, 0);
-+#endif
- 		return;
- 	}
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	spa_format_video_raw_parse(format, &output->video_format);
-+#else
- 	spa_format_video_raw_parse(format, &output->video_format,
- 				   &pipewire->type.format_video);
-+#endif
- 
- 	width = output->video_format.size.width;
- 	height = output->video_format.size.height;
-@@ -510,6 +574,21 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format)
- 
- 	pipewire_output_debug(output, "format = %dx%d", width, height);
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	params[0] = spa_pod_builder_add_object(&builder,
-+		SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
-+		SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
-+		SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
-+		SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(4, 2, 8),
-+		SPA_PARAM_BUFFERS_align, SPA_POD_Int(16));
-+
-+	params[1] = spa_pod_builder_add_object(&builder,
-+		SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
-+		SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
-+		SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header)));
-+
-+	pw_stream_update_params(output->stream, params, 2);
-+#else
- 	params[0] = spa_pod_builder_object(&builder,
- 		t->param.idBuffers, t->param_buffers.Buffers,
- 		":", t->param_buffers.size,
-@@ -527,12 +606,17 @@ pipewire_output_stream_format_changed(void *data, const struct spa_pod *format)
- 		":", t->param_meta.size, "i", sizeof(struct spa_meta_header));
- 
- 	pw_stream_finish_format(output->stream, 0, params, 2);
-+#endif
- }
- 
- static const struct pw_stream_events stream_events = {
- 	PW_VERSION_STREAM_EVENTS,
- 	.state_changed = pipewire_output_stream_state_changed,
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	.param_changed = pipewire_output_stream_param_changed,
-+#else
- 	.format_changed = pipewire_output_stream_format_changed,
-+#endif
- };
- 
- static struct weston_output *
-@@ -560,7 +644,11 @@ pipewire_output_create(struct weston_compositor *c, char *name)
- 	if (!head)
- 		goto err;
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	output->stream = pw_stream_new(pipewire->core, name, NULL);
-+#else
- 	output->stream = pw_stream_new(pipewire->remote, name, NULL);
-+#endif
- 	if (!output->stream) {
- 		weston_log("Cannot initialize pipewire stream\n");
- 		goto err;
-@@ -704,6 +792,14 @@ weston_pipewire_loop_handler(int fd, uint32_t mask, void *data)
- 	return 0;
- }
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+static void
-+weston_pipewire_error(void *data, uint32_t id, int seq, int res,
-+			      const char *error)
-+{
-+	weston_log("pipewire remote error: %s\n", error);
-+}
-+#else
- static void
- weston_pipewire_state_changed(void *data, enum pw_remote_state old,
- 			      enum pw_remote_state state, const char *error)
-@@ -725,12 +821,20 @@ weston_pipewire_state_changed(void *data, enum pw_remote_state old,
- 		break;
- 	}
- }
-+#endif
- 
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+static const struct pw_core_events core_events = {
-+	PW_VERSION_CORE_EVENTS,
-+	.error = weston_pipewire_error,
-+};
-+#else
- static const struct pw_remote_events remote_events = {
- 	PW_VERSION_REMOTE_EVENTS,
- 	.state_changed = weston_pipewire_state_changed,
- };
-+#endif
- 
- static int
- weston_pipewire_init(struct weston_pipewire *pipewire)
-@@ -745,10 +849,19 @@ weston_pipewire_init(struct weston_pipewire *pipewire)
- 
- 	pw_loop_enter(pipewire->loop);
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	pipewire->context = pw_context_new(pipewire->loop, NULL, 0);
-+#else
- 	pipewire->core = pw_core_new(pipewire->loop, NULL);
- 	pipewire->t = pw_core_get_type(pipewire->core);
- 	init_type(&pipewire->type, pipewire->t->map);
-+#endif
- 
-+#if PW_CHECK_VERSION(0, 2, 90)
-+	pw_core_add_listener(pipewire->core,
-+			       &pipewire->core_listener,
-+			       &core_events, pipewire);
-+#else
- 	pipewire->remote = pw_remote_new(pipewire->core, NULL, 0);
- 	pw_remote_add_listener(pipewire->remote,
- 			       &pipewire->remote_listener,
-@@ -777,6 +890,7 @@ weston_pipewire_init(struct weston_pipewire *pipewire)
- 			goto err;
- 		}
- 	}
-+#endif
- 
- 	loop = wl_display_get_event_loop(pipewire->compositor->wl_display);
- 	pipewire->loop_source =
-@@ -786,12 +900,14 @@ weston_pipewire_init(struct weston_pipewire *pipewire)
- 				     pipewire);
- 
- 	return 0;
-+#if !PW_CHECK_VERSION(0, 2, 90)
- err:
- 	if (pipewire->remote)
- 		pw_remote_destroy(pipewire->remote);
- 	pw_loop_leave(pipewire->loop);
- 	pw_loop_destroy(pipewire->loop);
- 	return -1;
-+#endif
- }
- 
- static const struct weston_pipewire_api pipewire_api = {
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 6b247269bc8e..a1da27e3da2e 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -15,7 +15,6 @@
 	<flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
 	<flag name="ivi">Enable the IVI shell</flag>
 	<flag name="kiosk">Enable the kiosk shell</flag>
-	<flag name="launch">Install weston-launch utility</flag>
 	<flag name="pipewire">Enable virtual remote output with Pipewire on DRM backend</flag>
 	<flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
 	<flag name="remoting">Enable plugin to stream output to remote hosts using <pkg>media-libs/gstreamer</pkg></flag>
diff --git a/dev-libs/weston/weston-10.0.0.ebuild b/dev-libs/weston/weston-10.0.0.ebuild
index 365970dd5399..d5a772f0976e 100644
--- a/dev-libs/weston/weston-10.0.0.ebuild
+++ b/dev-libs/weston/weston-10.0.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-libs/weston/weston-9.0.0-r2.ebuild b/dev-libs/weston/weston-10.0.1.ebuild
index 27fdbecfc4af..8e4f335e1688 100644
--- a/dev-libs/weston/weston-9.0.0-r2.ebuild
+++ b/dev-libs/weston/weston-10.0.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
@@ -9,7 +9,8 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-inherit meson readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+PYTHON_COMPAT=( python3_{9..11} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
@@ -17,14 +18,14 @@ HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/waylan
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -40,14 +41,14 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.17.0
-	>=dev-libs/wayland-protocols-1.18
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.24
 	lcms? ( media-libs/lcms:2 )
 	media-libs/libpng:0=
 	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.68
+	>=x11-libs/libdrm-2.4.95
 	>=x11-libs/libxkbcommon-0.5.0
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
@@ -66,18 +67,18 @@ RDEPEND="
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)
-	pipewire? ( >=media-video/pipewire-0.2:= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.2.0:= )
 	remoting? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
+	seatd? ( sys-auth/seatd:= )
 	systemd? (
 		sys-auth/pambase[systemd]
 		>=sys-apps/dbus-1.6
 		>=sys-apps/systemd-209[pam]
 	)
-	launch? ( sys-auth/pambase )
 	X? (
 		>=x11-libs/libxcb-1.9
 		x11-libs/libX11
@@ -91,13 +92,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-pipewire-0.3.patch
-)
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use drm backend-drm)
@@ -107,11 +105,11 @@ src_configure() {
 		$(meson_use screen-sharing screenshare)
 		$(meson_use wayland-compositor backend-wayland)
 		$(meson_use X backend-x11)
-		$(meson_use fbdev backend-fbdev)
+		$(meson_use fbdev deprecated-backend-fbdev)
 		-Dbackend-default=auto
 		$(meson_use gles2 renderer-gl)
-		$(meson_use launch weston-launch)
 		$(meson_use xwayland)
+		$(meson_use seatd launcher-libseat)
 		$(meson_use systemd)
 		$(meson_use remoting)
 		$(meson_use pipewire)
@@ -139,14 +137,12 @@ src_test() {
 	xdg_environment_reset
 
 	# devices test usually fails.
+	# xwayland test can fail if X11 socket already exists.
 	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Fxv devices) || die
+	meson test $(meson test --list | grep -Exv "devices|xwayland") || die
 }
 
 src_install() {
 	meson_src_install
-	if use launch && use suid; then
-		chmod u+s "${ED}"/usr/bin/weston-launch || die
-	fi
 	readme.gentoo_create_doc
 }
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 38b24ee38007..2056e5ec50fa 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
@@ -18,14 +18,14 @@ HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/waylan
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -36,7 +36,7 @@ REQUIRED_USE="
 	screen-sharing? ( rdp )
 	test? ( desktop headless xwayland )
 	wayland-compositor? ( gles2 )
-	|| ( drm fbdev headless rdp wayland-compositor X )
+	|| ( drm headless rdp wayland-compositor X )
 "
 
 RDEPEND="
@@ -46,16 +46,12 @@ RDEPEND="
 	lcms? ( media-libs/lcms:2 )
 	media-libs/libpng:0=
 	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	>=x11-libs/cairo-1.11.3
 	>=x11-libs/libdrm-2.4.95
 	>=x11-libs/libxkbcommon-0.5.0
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
 	colord? ( >=x11-misc/colord-0.1.27 )
 	drm? (
 		>=media-libs/mesa-17.1[gbm(+)]
@@ -68,7 +64,7 @@ RDEPEND="
 		media-libs/mesa[gles2,wayland]
 	)
 	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	rdp? ( >=net-misc/freerdp-2.3.0:=[server] )
 	remoting? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -105,7 +101,6 @@ src_configure() {
 		$(meson_use screen-sharing screenshare)
 		$(meson_use wayland-compositor backend-wayland)
 		$(meson_use X backend-x11)
-		$(meson_use fbdev deprecated-backend-fbdev)
 		-Dbackend-default=auto
 		$(meson_use gles2 renderer-gl)
 		$(meson_use xwayland)
@@ -127,7 +122,6 @@ src_configure() {
 		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
 		$(meson_use resize-optimization resize-pool)
 		-Dtest-junit-xml=false
-		-Dtest-gl-renderer=false
 		"${myconf[@]}"
 	)
 	meson_src_configure
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 7ce2065737a1..4133aadae69f 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
 DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
 EBUILD xapian-bindings-1.4.18-r1.ebuild 7061 BLAKE2B 8ab8e0fa2a6ab5bd3bf0298e2afd9dad783abb9660ac104a16046922838b23592c6b7099a47d113039d60be14ab549aace5da5ff602284e48242c4a027429a3d SHA512 57ff3aaa344665e81859569e5d9db86d5efe5c901ddc4c2f5f2970fea0ebe60f62252db1428b74c613da3acfa3f193f45ed66f655b29a562e82c37960fac32d7
-EBUILD xapian-bindings-1.4.19.ebuild 7064 BLAKE2B 408f2d342ab62066908adba9e9569dc13dd218305df9fcc95c6a2fe4b9c0d1114a6b024865a78c469b7f0866b2b3a0b8680e4875bfc270da3129d088bfda778d SHA512 74c71589d1ca899c0472c5ae25f30b860fdd76a7bd6ce49f63250ccc7b96df8586e4514789bc15cc8efd0896f42ce5eee360fa904c62e58d484b5111d5cc3e97
+EBUILD xapian-bindings-1.4.19.ebuild 7130 BLAKE2B 760bfeddcc51ba39adfe4d9fd3971112eb18579aac39325ed3f9312ca9f540618e91cf713e1cca682385c2752a0135bcd4d8addf04367cf664ff2a53fff62efb SHA512 84d63be294b40765318e1488d475d7479824891362c7d8bc07ee6c77ccefc0dcae6a36bde11929be9511454abea4c9e10ddc2b0f396db268822bc10dc063856f
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
index a22b427d3f7b..13c86dc69e06 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -120,6 +120,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Needed to get e.g. test failure details
+	MAKEOPTS+=" VERBOSE=1"
+
 	if has_basic_bindings ; then
 		local conf=(
 			--disable-documentation
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 877d35f3318a..74d9b95ac0ec 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -6,5 +6,5 @@ DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68
 EBUILD xapian-1.2.25-r1.ebuild 2035 BLAKE2B 0bd199c71ce17e0c01eb702679a3e356d35fe8150c3aec92cbddc1127487638443aacc19d6cd0b1cd84725a044e61ceff288f331efeb2ea581e48d12e38a336a SHA512 2155f4652a2f6581aef65bf635aedcce76b7d3746cdcb270c97a34d3e5c6c386900d168fd2880b31fe50f1be2751df3e8b5f25ee74de3c1fea1e259deee190b8
 EBUILD xapian-1.4.17-r1.ebuild 1941 BLAKE2B 2cd45961ad77e56c60f906e7e49afc5287452a2b5f0e8abc51e5c0740ade9eb5ac5978e9ca9394af7b418e8a03eff83d482278bc64780957cbc8879198c49c7f SHA512 cc0aec3d3d555d28cba486f92d5bf8bf00fcd7b52c890ed6d3af11c8e9f8e0ec403dab41364a22f841953a554c40b58f0825808a04a48f1e34cdf9833f223141
 EBUILD xapian-1.4.18-r1.ebuild 1878 BLAKE2B 9f2ace2f966a2f129094b0f9efedf5e998eeb14bf0afad044988d951ef79eeebf56888a2ea108021449705c33eb1b466307fe0c73302b3397b2e5024386913be SHA512 74d0b7b8ed3dbf8c82de3f39e13d1e4720fe346efe5c0e6218805a9fcca59708b19f083056e089b1b33124bfc9f0fc9b0399a2b7aa2e10951f1f3fdefe1806bd
-EBUILD xapian-1.4.19.ebuild 1885 BLAKE2B 8c19f9d88ce9ab515d68fca6297483313b463770954919c7309da5867e028c93f16bb6799420a01e053381b46ad63b108911c3282aa1190e2c267ab42a3d9e05 SHA512 00235915eaf4c295f481c07253e96e1dcbaad4efe894b1a0bf2b994abb039ad47dcd6e8e1421c7f64807f71abe202ca78074220850badfc551428aec983a5fd1
+EBUILD xapian-1.4.19.ebuild 1889 BLAKE2B fc1465ea2b1a8fc785d8e2e47b5a1348bd2871df3acddbf7c31f9c174aac05b58e0d8786f8d0370c988557374783c3cf9f75ae6c54d32303efddd7f2c5b5b6bb SHA512 8fe630c4329d7006cf07c9e8eac90a92118eb54ca7c9098da2b8a5610cfb9be9a7ed907707018aa2b3c2bb689b883cd4fea2f412c89f5ebcb488a448d7fac0e1
 MISC metadata.xml 935 BLAKE2B beadb37293a033eafd108c3c81738866565c127813d860c6014fb75a97edb89117c29bc513a623c47be7270936e0e9e5f28f8a8f7ad3fad6630c896337cd627e SHA512 bd4020e6f4505cb25848c5cddefd2ce9d7a2e6f625ef622b220b510d65e083eda255f00154da26174b998a91082118cba8c25f1ee92df46d2442d1ace3b0b1d5
diff --git a/dev-libs/xapian/xapian-1.4.19.ebuild b/dev-libs/xapian/xapian-1.4.19.ebuild
index 8e92d1d7fa29..31a1758add25 100644
--- a/dev-libs/xapian/xapian-1.4.19.ebuild
+++ b/dev-libs/xapian/xapian-1.4.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 87911d513a65..19c4176f7735 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -1,6 +1,8 @@
 AUX yaz-3.0.47-icu-automagic.patch 804 BLAKE2B 37016fbe77f2f611f4118ee5995b6f9050cc6e47bd8546bf8b681084a6844b888e084d567f943b5734a0c33cd12918ae5cec5c6b7ab19dc169d8e9950792cb1d SHA512 b0b38a85342045ef68e0b866a6f15f30605e246c7f795402238e68e70aec26ad7b985257879cbba2698d6f0c40a8373b522dd7fbea9253dbd6d2ceed2a0d4dcf
 DIST yaz-3.0.53.tar.gz 2164681 BLAKE2B e42a97d63e031f14234258c7c44735a615ebc83774c1532d7e1b50f1f231dc933168e41a1b35a139ec193e694f6253336a666daad627a4aae9a0c7ffe34ca360 SHA512 537d54757e401c1b29ad2120209b2cd038f26ff7f43ffc3c1e22808e12a1580aedee3880478e951fd4b3057ca9af4a34afa2a64c0b8ffcbec24f76deb83ddc89
 DIST yaz-5.31.0.tar.gz 2599598 BLAKE2B d56b3ccd3981d406bc09aeb7c9619e23f6c322cd80bf01db3a0621a40922dbbf32be34e69990eea0f8abbad84ed66d086d883db22693f3aab596c17001b4355b SHA512 93fe2320e474e3874704b9a899aed789e6128b5c626bb0c49bf650fd9ce0c107af4da6a13e5d1a56c98d018bfbb6cb918b53b6ce93e42bfeb8da0dfacbdb6667
+DIST yaz-5.32.0.tar.gz 2607933 BLAKE2B 9119b77a262ef2d6f0b1140425384575218a5b93cbe50a716bb254b07e2427eaad55de3c4590d0d6843af31b987b201fa733fdf010e463648a35b5600d055d5a SHA512 a4d40b5c20b1d4acab0e687235eda361fe0550c00396f6aa26d1965d2ecdd217433ba65160eda07fcc4c263d9e2e47b607e4b668412f81123b2904b9deece763
 EBUILD yaz-3.0.53.ebuild 1505 BLAKE2B b810f7445c4580f824eed4613a50df7de3c57110126d3a6a6c903b225c71e2de7401bff616bc7a29fef3fe837a6cb481faf7a10549d3cd484c51957ce26ee462 SHA512 66b03d37d144c635621782a9fad5e43481c31ff58aa81dcb4e32aa1b726d2813387dc317c6f7ffc0f40c26aa7fbcccaa4e8624d3cf17daf87ddc6fc0585e48ae
 EBUILD yaz-5.31.0.ebuild 1373 BLAKE2B 8bda15894165d1b03c8964ea9e25cbba1a6bf3181fb9a33fa90ce9fea13f08e4147dbb3ef7dfb98d5a433aa061a95b44c55fee9aaed4cbeee1a5047efc551f03 SHA512 81f994fec38ef3e7db0802b0778e9aaf34689efd78f92f5bb2719cb50bcf9a5366e2380e437985e205629a98f3e57b48e3b6b80a2016d278a46f86b853dd7729
-MISC metadata.xml 338 BLAKE2B 693e0c670d6743738015c3012d35cdd7a814429731c7233167dfa34b0de0226ce18a63d69c15ab01efe9e6b072e050863ec69beb095599a3c3ffaa7612c061a5 SHA512 9887a1010de64eac3786d1b78e37319922546e1d03aa5fdfeced4314b6fa57f31cd116e472295bff9308e52c58483e47dacd0255ef06de8bf10c4c114c2bb599
+EBUILD yaz-5.32.0.ebuild 1488 BLAKE2B c83b39e47db293f4e0d479ee3c37a379cd12b4fb39d2308dbea5277dea5f9f33774fcba9e1119ddb252eba8168d339b30915c206d5b2f85eabcfae85931fa6bd SHA512 2ec32c20d229c4caee753b40914df6428ffa3572bce3baec9703eb03ac53a5ba4cf39b3586ab6ea896b4465882401f140dc82aa6b703d8ef18a971cc669bc5eb
+MISC metadata.xml 589 BLAKE2B 0f7b9c9202bef67d51672bb242235d2d7d9c3004078e1b07d6042a844cf7c22c12651893fd3335dbb127a98a64524994805eacbf9214e1e5489ca852c86e7e7d SHA512 c71ddd32d9ec508272488d7dd744d4e6c74ff2fc5b342883bd50411112d3a0b06d7d2d1e93f17fc9245114ad3996e7dd7047504faaa3fbf0a3cd435e535e90e2
diff --git a/dev-libs/yaz/metadata.xml b/dev-libs/yaz/metadata.xml
index ef72ab976355..dd5ca33bbe8c 100644
--- a/dev-libs/yaz/metadata.xml
+++ b/dev-libs/yaz/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="ziffy">Install ziffy, a promiscuous Z39.50 APDU sniffer</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">indexdata/yaz</remote-id>
-	</upstream>
+  <maintainer type="person" proxied="yes">
+    <name>Thamognya Kodi</name>
+    <email>contact@thamognya.com</email>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">indexdata/yaz</remote-id>
+  </upstream>
+  <use>
+    <flag name="ziffy">Install ziffy, a promiscuous Z39.50 APDU sniffer</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-libs/yaz/yaz-5.32.0.ebuild b/dev-libs/yaz/yaz-5.32.0.ebuild
new file mode 100644
index 000000000000..f5d980d94e6a
--- /dev/null
+++ b/dev-libs/yaz/yaz-5.32.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C/C++ toolkit for Z39.50v3 clients and servers"
+HOMEPAGE="http://www.indexdata.dk/yaz"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/indexdata/yaz.git"
+else
+	SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD GPL-2"
+SLOT="0/5"
+IUSE="gnutls tcpd ziffy"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/libxslt
+	sys-libs/readline:=
+	sys-libs/ncurses:=
+	virtual/libintl
+	!gnutls? ( dev-libs/openssl:0= )
+	gnutls? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ziffy? ( net-libs/libpcap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/tcl:0
+	sys-devel/bison
+	>=sys-devel/libtool-2
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_with gnutls) \
+		$(use_enable tcpd tcpd /usr)
+}
+
+src_install() {
+	local docdir="/usr/share/doc/${PF}"
+	emake DESTDIR="${D}" docdir="${EPREFIX}/${docdir}" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	dodir "${docdir}"/html
+	mv -f "${ED}"/${docdir}/*.{html,png} "${ED}"/${docdir}/html/ || die "Failed to move HTML docs"
+	mv -f "${ED}"/usr/share/doc/${PN}/common "${ED}"/${docdir}/html/ || die "Failed to move HTML docs"
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+
+	dodoc ChangeLog NEWS
+}
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index c38c469d51a6..84fcf6844b33 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,4 +1,4 @@
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
-EBUILD zziplib-0.13.72-r1.ebuild 1275 BLAKE2B c63ad088360e7f0dc55c39324a36b7b47f3b5077f759d9f2270023e365a1ac0a3571ba047ec4d3ae6db28ed4fccb6347ed2cc7027a6d4ce42056c0eabec5919c SHA512 b8cad421ef427d959c44500effef18ac15f4bcaacc1273f294a2c92c3f5a6115e1c591d516887214cf04a45a50e7d453d0bd16cd43e8107e429df61a23d778ec
+EBUILD zziplib-0.13.72-r1.ebuild 1274 BLAKE2B fb487d5a3a285c3d84f449c786279f8c76f7b15e0ab0ffdf9d3213522d0be452f5c4eabba9c0522648f629c6fa533a543884725bf26222f86ec64ed1495255d2 SHA512 f7419a179fd1b42dbdfff01cca9008a583e60892479954044fe72cb18329766a4c104215688b79b448db477bb8d8c3dd8ebb370610f0365995910cd3cf1e6367
 EBUILD zziplib-0.13.72.ebuild 1266 BLAKE2B d481c3cc8ce2bf1c410684815b31b77e00c7f8f1771c7fa0bb6fa3476af9eb3e38d77b24d2f592e52cd66077caa2415897d278a131648110077b40da5630711c SHA512 3a5c1d92c211138d653197683734f6fbf774a9bc629ed53d1dfa182ea63f0a733fee7069e57e77fb1fd97043a3f8732503fbe81ae6b831f07608eb2d47340b74
 MISC metadata.xml 300 BLAKE2B 5bd0efee346b2d954d36b1dd83e1d8ef54944ec7f7fb3a88bdcba73b2f85d0236cd638f763388ed43a30c44f9db5b83223310d66232731e6d37ef57315c04129 SHA512 0a233cbfe081cd55c76d8229261f1d8d8a8bf1435886c36e938a3a059a2db9b44bed165b7aeddbe568756a3e19e3cbd12dbee659a5a8eb2feea21c5f2ab35d22
diff --git a/dev-libs/zziplib/zziplib-0.13.72-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.72-r1.ebuild
index 40f017c176cd..1feec01a800e 100644
--- a/dev-libs/zziplib/zziplib-0.13.72-r1.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.72-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="sdl static-libs"
 
 # Tests require internet access
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-libs
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)