gentoo resync : 25.03.2022

126 files changed, 1991 insertions, 593 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 700d4eece106..df61e3e0e75c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index c0f8c834d36c..2b3d2ddcba46 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-r7.ebuild 3798 BLAKE2B 110e252f13b93491bbaf30dbc9d92630b9adf454d4158ac526d7c94df94346b071ac1a0fd54343fd443c15e81091d3257cfd81ade6b7d318afcbaea25a327927 SHA512 1bb1759caa441c3230ae7e4539d6197381164ad50b6bdb8cbe1fc395e3a0f93b4ff0242ce7cbc5271cd1842422dbb6391a894c50e293fdd2568fb565aee9fa66
+EBUILD apr-util-1.6.1-r8.ebuild 3796 BLAKE2B a00b353eacdf6bc150e8083d5359135e8aab9c070f31a3258d2dc066798a5bc81185c31f06e46768bfe72b2927ed2ad5ccf1bf3339eaa27946db6d1fca88e0b6 SHA512 77eb8e7ad7e916c4c4f67dc8f35ac31565aa2c29f26423bfc4b91ee7a779a8d4708be8a43931d3fe13a01f3033100be163ba4d760ae98135ddbcdc9a80006110
 MISC metadata.xml 387 BLAKE2B 0f74d66e71f89de83335d9885cfe4ea84a408f208ede8ce3cbe67627868f7895a9a33bc844c5d732a02ed3fd7b4f727bf719eecfcacd6dfdd1262d3ea78bcae4 SHA512 068b8833328d94e22ffcedfd2d7c9cd740b937f991bd986dff6b37a38f2b04d3a137b539c99c81f02c4a041dba11983cba0306ce700072193bce3e059b13633d
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r7.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
index 5b5a167a75f1..74595ea262dc 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r7.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r8.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,7 +25,7 @@ RDEPEND="
 	virtual/libcrypt:=
 	berkdb? ( >=sys-libs/db-4:= )
 	gdbm? ( sys-libs/gdbm:= )
-	ldap? ( =net-nds/openldap-2* )
+	ldap? ( net-nds/openldap:= )
 	mysql? ( || (
 		dev-db/mariadb-connector-c
 		>=dev-db/mysql-connector-c-8
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index cd8d11290614..301ae0cb6553 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -1,8 +1,5 @@
-DIST cudnn-10.2-linux-x64-v8.3.0.98.tgz 742140405 BLAKE2B 648849c041e2e7d87a8d804a35d9e0fa1d9a454977aaec4545386ee0c8b57c502b98583a357a70b7096905f82c2a8dadc252f8b363a7975d572167f4f7f2f121 SHA512 e0c6967663bdaf0e7539b550f1aa84aaf35efe6192fc524d78f6a1bc980a79b05eeb0693e9548f4d3433864f88137ce2ff1489d7dd0e8cf883000d6c7b9a62bb
-DIST cudnn-11.5-linux-x64-v8.3.0.98.tgz 1477554466 BLAKE2B cd8b7bdca8ef08af971d56b43b80f0fe721f76cb744bfef43a9369f81a2533b00651f2c89e9084026991a1cc1c6db13b55914d966b723edbfc104c3e7626a087 SHA512 46af7d47b40a2c0ee8d5b893514755f803b5a0c7426b8d88b258e71ae6312cb553cba7dd68f63e2060849c70713330d52f93f56121f663213c16030d39b2fc1d
 DIST cudnn-linux-x86_64-8.3.1.22_cuda11.5-archive.tar.xz 856769204 BLAKE2B 375021592470b1f17d7a69701f1ac3289ceb8ddbbdacf577fa51abfdad263102d3c6cedb24ac829c49e033300532e77b6064835a8ae1e05377e375f4320c9a15 SHA512 815ef678b7510e014181f3bf782e627771e8d00d218b34f2af11436b8a49331400269f98448854353c12721468365b71a8483eb7631777f0d628982e81942a8b
 DIST cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive.tar.xz 857894928 BLAKE2B 7f0f4fe4d8ccd2e7385d5c4535f4543b3d8e80f65caa5a4d5fdaa1b386a76fe16d8d9e32745a098954eda8d0b803af6146c1ffc5b46c838ea0ccecd5923984cf SHA512 4f2159e48685613b436adb3995aa80cf6d5b395c146059ccc15ef2f5f7e47c94bfeebd14b09d8832f7df76d2379829aa32edb7b69852e17a8e7036084265ed39
-EBUILD cudnn-8.3.0.98.ebuild 832 BLAKE2B 70584e11eebea6788dfb5f1d9586810e85cbcd93f128546fe926ca39ad23a29c2eae24fdd78d7cb178de195982ced709d768358173b343a3fca6f870bb25c73e SHA512 16af64f86ac442b3ab5adf62fbc1e4da5ccb8d20b656125edb8b1de0bee29b197c48215af1d00ba00c50141f9e355a2d4194523d5778cdfe2b45a93399139fe4
 EBUILD cudnn-8.3.1.22.ebuild 700 BLAKE2B 7c3095b585ad73f24ea12fcb5dc580a648c634c8662c5fb3558bfbf66e08b3c3e6cc75d4cda856b44d2f7187ecff078c1b1a2ebfe1b74c78038184f3cc94feef SHA512 95b4da813d90fd828afefac712d4da9c5eea12445ce2fec8c0c7bc05a5f493428360b34da558610878d4c83b4dc5d8bd5d79c6bc17a367d52a5ee20e67db4835
 EBUILD cudnn-8.3.2.44.ebuild 700 BLAKE2B 7c3095b585ad73f24ea12fcb5dc580a648c634c8662c5fb3558bfbf66e08b3c3e6cc75d4cda856b44d2f7187ecff078c1b1a2ebfe1b74c78038184f3cc94feef SHA512 95b4da813d90fd828afefac712d4da9c5eea12445ce2fec8c0c7bc05a5f493428360b34da558610878d4c83b4dc5d8bd5d79c6bc17a367d52a5ee20e67db4835
-MISC metadata.xml 371 BLAKE2B 07b65e38f232d9b70e9769516ee4e535b2ad6a1d0deb1d6103c503aa0bccf34d1171e1d66a5c7415dd2be3cbbf33619486b18dfd69cefe8c3e5a3bac4387bf1e SHA512 c811a6d843e7c24a2c6c0763db24ede4562e33d797ae8d531b9dee890cfa3acc0f46f58fa595d92bc862a58a930023456e1fbdc31c63d5411bbd688f7ad0bf54
+MISC metadata.xml 320 BLAKE2B 81dc88c34d1976ea918fd6b4b96743d157fe540455b9a1873c8e4e156a3d72dcf44c03cc642bcd10a202ba66a747bcdd5c5b290e9b30cdfacfbd32a2f1d99549 SHA512 3b837ea9aa38041bdd68cc03ad699a140bdadd353e355977a0a1865c8ed46491fe1f3e2778c66432ea43275c5017e684db45947671acc0db7db0ae75afa808a6
diff --git a/dev-libs/cudnn/cudnn-8.3.0.98.ebuild b/dev-libs/cudnn/cudnn-8.3.0.98.ebuild
deleted file mode 100644
index 1d429b598bfd..000000000000
--- a/dev-libs/cudnn/cudnn-8.3.0.98.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-SRC_URI="
-	cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )
-	cuda11-5? ( cudnn-11.5-linux-x64-v${PV}.tgz )"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-cuDNN"
-SLOT="0/8"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="cuda10-2 +cuda11-5"
-REQUIRED_USE="^^ ( cuda10-2 cuda11-5 )"
-RESTRICT="fetch"
-
-RDEPEND="
-	cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )
-	cuda11-5? ( =dev-util/nvidia-cuda-toolkit-11.5* )"
-
-QA_PREBUILT="*"
-
-src_install() {
-	insinto /opt/cuda
-	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
-
-	insinto /opt/cuda/targets/x86_64-linux
-	doins -r cuda/include
-
-	insinto /opt/cuda/targets/x86_64-linux/lib
-	doins -r cuda/lib64/.
-}
diff --git a/dev-libs/cudnn/metadata.xml b/dev-libs/cudnn/metadata.xml
index 410aa3e4aeb9..7e420583aa25 100644
--- a/dev-libs/cudnn/metadata.xml
+++ b/dev-libs/cudnn/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<use>
-		<flag name="cuda10-2">On Nvidia CUDA 10.2</flag>
 		<flag name="cuda11-5">On Nvidia CUDA 11.5</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index f5d8e3e6389f..edf1f3c8088b 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -10,6 +10,6 @@ AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb42
 DIST cyrus-sasl-2.1.27-r6-patches.tar.bz2 5169 BLAKE2B 43a2f0db4a8589ec1cde7807b31a93459eacb04d27ba36751a69dd5f4e669d1b28342194b0e1a5382e281a52a35e88168877b54065cfba01b9bd33e87fbd23f1 SHA512 41c4ca7c8f7b79e03faf5d826a6ff0ed398137239b93fb0046ccbf385f6ddeab2b9fb2f51d7a263dc74626e5fdbefb28615a1ee22aabe57ed57f10a52d382797
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
 DIST cyrus-sasl-2.1.28.tar.gz 4034803 BLAKE2B 6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823 SHA512 db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78
-EBUILD cyrus-sasl-2.1.27-r6.ebuild 7969 BLAKE2B 1b01b3022944d482d250795af83404b3678267ce150d9ac4f67bacc26c623e95b721a81e29d5d0018087987356dba430d3a32857bd5191b92a0247675df27b17 SHA512 d8f8cd1234860cd75cf5b5dbee19683a37887fd3e292ffa28d6c11bc2416120ad72a4726c91016a87dfc2406aa2bad318b6a1812c2db64d1c6ee041e252c8409
-EBUILD cyrus-sasl-2.1.28-r1.ebuild 7155 BLAKE2B 2236c85cc6fdcf024a1585d16cd17efc465ce8f2e0b6973a5fcbed748c67067a3af16b42c526ea69cac6dd4158c7096a6bc96e29e1b7840ca740f53f0e6ac9b6 SHA512 2c4aa24d278f2777e6e0f1d88679847eeb716022f6b727e880a6121af07ca6574a238cd147fdc25a91325d2ae16e708b78bfe1a4413615358e3e9e60ed5194d2
+EBUILD cyrus-sasl-2.1.27-r7.ebuild 7971 BLAKE2B f773f52bbcce6e1cd2582e61277e946af2d181773f6050bf2e0c083dc5beb4c5deb75024195142a9dcd2fb05ecccf6f4f5175a1d39ea05ca96944b48b63a87c1 SHA512 ecc03c246acda209f10c1aff99e52c7202c1c7b1e8ee85d33f02ca773e85e068474cce3de9b58d0cbfb2afdb5f7eef41449b5c6e6cd8ed1da9f74c969a897e0e
+EBUILD cyrus-sasl-2.1.28-r2.ebuild 7155 BLAKE2B 7378e30c3d061c24cffecf2143e0fe2ea97ac2582d4ba5ffceefd074f85d15515ff90fe6f9417ce6b97d4ce0344d622f37b17b846d224734be65059b0f62544a SHA512 997d9ec0b7bc2b938ef4126afe6ac86e53a12dfd757374eb9776426e112938b8e51f7422bc85224b06fbea8fa35d23f7f4be507b2310873f2251240579740d20
 MISC metadata.xml 721 BLAKE2B 23da714758f539942c45bd8f04fa0f435f0e1a4770c258ca4a1e73f89a627335d6804f636dc38d8b356968bb859ca7a65ca428e24e8eb0e64ed7f666d2c7f3b6 SHA512 388ec91796dfa0eed11200822ff521e5094a072c56469adf20f2a1a18c6e4501e73f8182a1372f7d301b28aecf755d81e330f7cfeb6b742c894c7b7750bbf7dd
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r7.ebuild
index 8f8d05f0c9d3..cd797a5afd90 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r7.ebuild
@@ -25,7 +25,7 @@ CDEPEND="
 	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}] )
+	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:* )
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild
index 034e9ed863fe..9bfbd7ab2cb4 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VE
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 REQUIRED_USE="ldapdb? ( openldap )"
 
@@ -25,7 +25,7 @@ DEPEND="net-mail/mailbase
 	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}] )
+	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:* )
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index 9ceaeb4f0af6..60fb5829c9c6 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,3 +1,3 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
-EBUILD dotconf-1.3-r1.ebuild 646 BLAKE2B 4d4ebfcfc52ae4a09f4fe1476f2346422320d2148caa80d83715fd07424f9d1609e8f10e7b1591ddac07089474079a50aca2f81ffe696fed9d8efd0e879e54b2 SHA512 58dcb2b3cb5a8a4f5b49b901aa3d8240e7d67112023c6fd0522507057a98ac9f78c9274e24d609fb83a24020063c543911e6a13da5b452aaf953acca700375fb
+EBUILD dotconf-1.3-r1.ebuild 648 BLAKE2B ba6a92aa94c89a3ed304aed18475d9d417bb680b658e9a67c7de6b005fa35438c1fa83990a0b3031a3f9b72f43254607649b7ac581180123b5666f85246678ec SHA512 b138e5343c0a2046c2551f9c9f71b13eb691dbfa1f040e637e446ee74f54786e55da03710cb4390b726edbf8fc19f8d7f0fb8c0014e221d05498c3f070b1a980
 MISC metadata.xml 445 BLAKE2B 2c3daf69f3893a6cef9c473c24b8a998fc566c1e0fff66ce5e9d780859bd1cdae789616b443f007903e6dd1372fd8494307680fbcf775863adcab5437b933b0f SHA512 46c77d13292b855f78b096d42406733af924d90ed8687ea4fa541902084367d1c830ee4500f03bc1662c545922c32ac136d4f08ec06d51da05dc88ef7689459d
diff --git a/dev-libs/dotconf/dotconf-1.3-r1.ebuild b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
index c0e1eb1fac7b..8aee7539c6b2 100644
--- a/dev-libs/dotconf/dotconf-1.3-r1.ebuild
+++ b/dev-libs/dotconf/dotconf-1.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=6
@@ -22,7 +22,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 pkg_postinst() {
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index be2fb6428b26..48a71caa03a4 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,5 +1,5 @@
 DIST dqlite-1.9.0.tar.gz 160222 BLAKE2B 7a6179e87ff8e37d19ab28a11bcd02531297095f83fffc936aa8b719be737cbba359b62daeea8de6d4bc599a4bf579a3471ab632fae27186d5f2358324b518df SHA512 eeb759cdca6ef44d3c8d7d032b277dab57c24acfab29ead218aecf826c71631fad22244cadcea7337002049857a8b5cb3b5dcd39d611e41a463128e1e09472e3
 DIST dqlite-1.9.1.tar.gz 165507 BLAKE2B 275ad91e99335c311c55a51a2228d5674fe79ba2e0b4d1fbb00b62134cd2130c1131fefcde71985cb2a4c90b706ba7f9048818f0711e762f1437f0c263ed1927 SHA512 996767bfdcc4dd5f360b71b16c99b16c6dd3c630cc87746de2df6fc6e74dcdd4ecb8223097f5d85b9c78a4856440c83d3b067f6681f26487a88bb4f511cfe41c
 EBUILD dqlite-1.9.0.ebuild 832 BLAKE2B 89907060fb4691d7303b578dbe83333a18212222479282accfa70e320c91f05630be252ad328a8e8f93d23a2bfb949465f0b0110089da04f953e08646200ddc9 SHA512 73d0734783f7b28957e800c763a0f2ddcbb9bffa95b821efcae55d4d917752f70ea77180443b8f2f56b2b14e9da68f81b03c8ed41598c289188ff04ee0eaeecb
-EBUILD dqlite-1.9.1.ebuild 833 BLAKE2B 6fb476a089394d3fdc670cd07543c521fed6063c7ff85fbdff177182e14b1d282bcff488cba2dbdb94931bcdb3fa92b1a92c65dafa647d563cf710d9db7cec58 SHA512 94efd0efbad2e347391df3abe531c5089ef9eb0584149e2aa30c4fa5035b58c207bc8f8169a8dc78047b446c47f3d861569cdcd142edf8ce6936fdf151b2a722
+EBUILD dqlite-1.9.1.ebuild 832 BLAKE2B 81a66a66456fe95fddfc5902d2dbe2e49f88780d00793b8de55cf1c36ae03a4d2d54d85e716445a58961bd26c4f6968c9e42610a5b4ef2b0ea28f7c1a7f9e234 SHA512 11686a22ca5f38b772915c623d5c962fca66a39daf4012f13e5dab7574830895993de13e2c957f1f7c4dedcc42f658d67d6574637224203fd751f229e476d00e
 MISC metadata.xml 865 BLAKE2B 3489de10f0de21d57146940eed0f4b69e637b0226b4be0127f33232dc6d8648ca4c169451948c31296ac5c41d163c8e65e983992f5baeb24db7d1b5dedfa4d22 SHA512 fc5c1fec36820bb855569c5e8bf7bfc3b522f00892489b20062e95121e6bd4e45f6b87a2d7c6d7a2e6b6c92e3dfd39b66705c58920207cf601e029d330b580ce
diff --git a/dev-libs/dqlite/dqlite-1.9.1.ebuild b/dev-libs/dqlite/dqlite-1.9.1.ebuild
index 67f811b7c29d..395d8b3d6964 100644
--- a/dev-libs/dqlite/dqlite-1.9.1.ebuild
+++ b/dev-libs/dqlite/dqlite-1.9.1.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/gjs/Manifest b/dev-libs/gjs/Manifest
index 87f670cfbff0..9bb10acc5114 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,9 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
 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
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.72.0.ebuild b/dev-libs/gjs/gjs-1.72.0.ebuild
new file mode 100644
index 000000000000..35fcadb1f5d4
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.72.0.ebuild
@@ -0,0 +1,51 @@
+# 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-91.3.0:91
+	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/glib/Manifest b/dev-libs/glib/Manifest
index cb65e2950157..50e8aab05742 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,4 +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
 EBUILD glib-2.70.4.ebuild 10120 BLAKE2B 9bac993665ff720a570c18e4eb71ad256f2906f903fa4887deddc80f75ac311854fcc555afe1c053e96df649eae3dc7b6a461ba2afbc3dd0aaba5915f6553bc6 SHA512 cd2348fbfa1087494d57f711483db6a91939438b396eebee128363a3eb46c145713b52aa3a4154b260377f0c520011e90334727b60e87eab554850fa2e0315aa
+EBUILD glib-2.72.0.ebuild 10128 BLAKE2B c6b75fb3b147ef69a9b0df00b83a768f0c5ca900627d7f985f76567e173d820a20aed6ddddea06961d8c046444850cd34cf1a7afdcd228ff16179c1a90322149 SHA512 78a350e8d9bdfc0cbae09bbf04642d5915caa6d228b790731ae86dc1835d8685792748fa7249d1290f00550a44af59a79c453c8d46eda27729695287808012ba
 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
new file mode 100644
index 000000000000..49fab3db4863
--- /dev/null
+++ b/dev-libs/glib/glib-2.72.0.ebuild
@@ -0,0 +1,283 @@
+# 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
+
+	# 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/gmime/Manifest b/dev-libs/gmime/Manifest
index d3720e19bef0..c50c972cfd1e 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD gmime-2.6.23-r1.ebuild 1446 BLAKE2B 2f33b0c77267916299e67120a5bcc2009917ae3adcea844d6e066d0901e1241455e1f26cc72fdbd5db400b8b08344d267450664a380fd1b2be1d57fd4c4824a5 SHA512 33a21fae9e9cadb9a7de26a593ce4b684bf605812ff280d3b1a933953cfefe0a07d93061427ecb5d943962ff8f3de783d2211208a41b5b2d4b429076ee5bf8e8
+EBUILD gmime-3.2.11.ebuild 1643 BLAKE2B a7673007086416b8c927306a22a667f0e88e0e6ced815c87896c2ce654cd77f8d778d8bc32e973f223f9d965cdf0e857e4ecc0459df1c62bf939a88a97357ee7 SHA512 cfbc8018fd2a07d014bfa475d687ffb9bce7332a5bc66d4bc6133a93bb639a6ad1d0d3d80dc937bb9bd963b80ba5c1576c3b41bba8df008ab36f9c58a621d5b6
 EBUILD gmime-3.2.7.ebuild 1578 BLAKE2B 0296a81dba65f0e16229ecde33060b905279c716684925eaf94d87b0d736658c9fb7a22039177dbeb3ef75ae40da6d718efae5fedbf621d7e4123458714f08fc SHA512 ae274233dfb71264e83d1a9c432ccc6cdaaea26fb375ab69be1998e24b232a76772658857cebeaa190ee87789744d493e7fdef6ed16693415b1c7cea8a912a91
 EBUILD gmime-3.2.9.ebuild 1643 BLAKE2B a7673007086416b8c927306a22a667f0e88e0e6ced815c87896c2ce654cd77f8d778d8bc32e973f223f9d965cdf0e857e4ecc0459df1c62bf939a88a97357ee7 SHA512 cfbc8018fd2a07d014bfa475d687ffb9bce7332a5bc66d4bc6133a93bb639a6ad1d0d3d80dc937bb9bd963b80ba5c1576c3b41bba8df008ab36f9c58a621d5b6
 MISC metadata.xml 408 BLAKE2B e340c8e376fb1fe428478c937d8e018f5b8c475cde16e947467434a7f86227d07ec0d1f9d61226e7f88c763a1d292f39cf4886569d218b4107bbe0b8465b35f6 SHA512 b75375be09c0f37a41d0a1f1ef0abde6880fce81e8318c480df27b954e39aa5fbb69826ff9243f029af2eb959d50641330f31f4bbdfaa6531e031326099cfcc0
diff --git a/dev-libs/gmime/gmime-3.2.11.ebuild b/dev-libs/gmime/gmime-3.2.11.ebuild
new file mode 100644
index 000000000000..ccc807d2d80a
--- /dev/null
+++ b/dev-libs/gmime/gmime-3.2.11.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gnome2 vala
+
+DESCRIPTION="A C/C++ MIME creation and parser library with support for S/MIME, PGP, and Unix mbox spools"
+HOMEPAGE="https://github.com/jstedfast/gmime http://spruce.sourceforge.net/gmime/"
+SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+SLOT="3.0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="crypt doc idn test +vala"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.58.0:2
+	sys-libs/zlib
+	crypt? ( >=app-crypt/gpgme-1.8.0:= )
+	idn? ( net-dns/libidn2:= )
+	vala? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	virtual/libiconv
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	test? ( app-crypt/gnupg )
+"
+# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_setup
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# bug #???, why not use --with-libiconv
+		append-libs iconv
+	fi
+
+	gnome2_src_configure \
+		--enable-largefile \
+		$(use_enable crypt crypto) \
+		$(use_enable vala) \
+		$(use_with idn libidn) \
+		$(usex doc "" DB2HTML=)
+}
+
+src_compile() {
+	gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc ; then
+		docinto tutorial
+		dodoc -r docs/tutorial/html/
+	fi
+}
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index a2d0a3927a0a..33f56ba8e1e8 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,3 +1,5 @@
 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 942 BLAKE2B 5ff6fdc3a9dcf3e729c9c7f6f6392468d740594fe2bee317301d904960b692a76942d6a9bf1656b2d03faf7d676d7d8d94bd5f333fedadc944b68857bc8e5fdc SHA512 d31af35be3c5624dc61244ea7aa59ff5280b8380f30e922f8e80a2d95d0ac451e7497a6138a7a967a280cdedcce88765e427cfd32ca238b0a22f95b3d63f3a83
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
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
new file mode 100644
index 000000000000..6e2f4ec5082e
--- /dev/null
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
@@ -0,0 +1,31 @@
+# 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/Manifest b/dev-libs/gobject-introspection/Manifest
index e61fb894b018..50baf9366a63 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,4 +1,6 @@
 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 1975 BLAKE2B d4aecffc43f25a2b8353d58180d4e9a3b9c75011bfa061473f4f048af40f18cb638689ca0f1f726c6151b6a286901ef458d845b63d9c21ad36c695c72a359601 SHA512 62d4bf0eeccfe920667eb7bacec4660e922fd608b437993df2fa76ea18dc910239b9a94f91abcdc20ac11b32c901b6afb603b79ec9d2fc850585e64a07f69279
 MISC metadata.xml 368 BLAKE2B 5734e81d2929cef33ae5a3e57d48717f2079944a26a34206d0c674a607068047e24c17e76435683dd6f9b369ba8abcbd6ff98037ba219e7f4ea8225d3980a3eb SHA512 e8a3b181add420cbfbffa78ba6a8bf7d7b82593ba9a54e89e52a9d0eb3a7c92f577d71080912067c16364e267bb1438ba1c8839ed62af24da39cc9e1b6f7d864
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
new file mode 100644
index 000000000000..7f94660fce13
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
@@ -0,0 +1,77 @@
+# 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"
+
+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}]
+		')
+	)
+"
+
+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/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index 956b815d1eb6..f3e0fd3d6ec4 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 506 BLAKE2B 21d02bfa7d40b0c215817396da945211436ee9e021d40696efbe4c091cd0e3d2f4621ba97fcc9aa1c96c3bf0f40707b0af95571ddf8edd16ab01c00f4c76cb6d SHA512 af3d14d9201d2fc7530d661edff7f7b714d8dba4342a4695a8edd540da266b52583d35a6280595b98918b913734a19a07d613b240f673120cbb27f643cb18f45
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
new file mode 100644
index 000000000000..9285abade7fb
--- /dev/null
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson 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="
+	gtk-doc? ( introspection )
+	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/gi-docgen )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+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
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest
index bfb56022fbd9..3f42b979dcdd 100644
--- a/dev-libs/kuserfeedback/Manifest
+++ b/dev-libs/kuserfeedback/Manifest
@@ -3,5 +3,5 @@ AUX kuserfeedback-1.2.0-enable_docs.patch 1776 BLAKE2B 6eab84c4ea3d678911ea6ab73
 DIST kuserfeedback-1.0.0.tar.xz 187784 BLAKE2B 24acb6c1f143a0811a84c7d4f5ffe923df2fe94b0d13e361870d308b65ee8be747cef1a2ab719c6023b4f5885fb9970620a2a5da0d073e70b1e4912c6f64c5d1 SHA512 d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7
 DIST kuserfeedback-1.2.0.tar.xz 206364 BLAKE2B 4ae1683f8a3470ee3db7b3039c27ebd7bc210afd5cd8cdd992a107e541971f4778d7add3fb330befbfd7d62e04d9d2aba8fc22eab5a368f4b92e98f7baa1ec41 SHA512 0152233c741a287b623256cac6d109d405441f17dec68c5782d900ddb9ca5a93614d46ea112e1be9e64913cc3f46d107bec64cad4579b766919439b0ed88a470
 EBUILD kuserfeedback-1.0.0-r1.ebuild 1332 BLAKE2B 53cb13e2a7d21a6d64241b16d0311d78770f171abd09d8ba4b315c79f3f8ad2abf91f31501c5ffd613a71dfdeebec3602f014854257707b7975c3814d29ca05c SHA512 a078b5a6a4a3050cdbee78224549759d38d0dd35fa36628ee114b75966b521991c67d99b319a5c9717d23c79f5b1a203fdfac8600bc620f8426522b92fc9d63f
-EBUILD kuserfeedback-1.2.0.ebuild 1422 BLAKE2B cf3a08771d740484b475eaff0b51095b4ae079e22e6c9af709741b979395beba100c357e00a61d5375100d808fed92936b71759c1b5a3b720b6ce35102158ee6 SHA512 6474a37d6b3b8288d6131c6fd8a19ad944a4887c1c8aa61f6bb0b808399c2967beb0677c5091830ad7c1026577fdbb4dddaf7c0ae0092b0782f085643eb96b11
+EBUILD kuserfeedback-1.2.0.ebuild 1421 BLAKE2B 4c1c16ddfa81a14eb27835e4eaa3ef2d58898ba1605161a7724faa8141cba5e1798027fb44096656bd8ec0d70f8e84a4e464fb0176b1c5d7e5791906d8d81e46 SHA512 419b2717419142b99caa568f69da0c4dcb37912393d36ee33d9c720881ee2906e8c37182db5ae8b0bcc7068581f970e29e1b08baa536f47e34cfeb872b3c0fab
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild
index ff6e5c22bb87..16eb367d08cc 100644
--- a/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild
+++ b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Framework to collect user feedback for applications via telemetry a
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 LICENSE="MIT"
 SLOT="5"
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 401771b9f1e9..447225a8fb6c 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,9 +1,9 @@
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
+DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999
 EBUILD libclc-13.0.0.ebuild 1431 BLAKE2B 023945ee57d09ff8763d18d0076733f929d7d0834757e9c7bcc02398512899a3c004a5c79d25f3c33418114824d03e78d904022f889cd7420eafb95a1d3543a0 SHA512 536fea5a39a795ea8984cafd271617291c6da14ebb39214a448a835e62e80fcd1ce004e69b770a22c78e1660209f76efd4fd2e6dc90b0b431b710dadb7f9824b
 EBUILD libclc-13.0.1.ebuild 1432 BLAKE2B 59269e3486b7baf86062f3734ba52750acbce0a8d93b6a925e5654f24611c2d9055306518b60a271857d9735591c102f86501b21f034135ab6afb98183a2bc45 SHA512 948fc251abdd2ade60a4b0fb57cb9c9a365c3c0082535e00c24c54c489aeb15e33735099c76054b8c71873eb0953910b12cfc883203538b8514dc34a3437e865
 EBUILD libclc-14.0.0.9999.ebuild 1443 BLAKE2B a1074740140a14cd68ee7491b4d1dc3d296accaa269a82cb4f98f8a3c49935a43a61e43bcd9c8da4435040117fdc170dd153771d5581f765f9375be98fb72ded SHA512 540a4bbfed08807ae4fda13516126d85c4fa5e0756d2143a2bd2b4c61d9c0cc538ff34a77d7147bd54ed315af9739b273d0b5f63921496bb8f99dba5b014d6a0
-EBUILD libclc-14.0.0_rc4.ebuild 1443 BLAKE2B 96d9dc2863ff6e20917576d1775b8e30d6a36dd25b35582e75d9f05d7771507d76f35ef31c75ffb95f38c30ffdb740189e84901809ffa6f8853acf700959bac4 SHA512 a0424e1b83d6af76f4e3d4d51b1c25bfe62841cbdc849fcc7841db1b9cc91c85a24efefed00d34d2c2e6bb66b93090917f8734ba00615fd8aafeb7902d4a04e4
+EBUILD libclc-14.0.0.ebuild 1454 BLAKE2B 54132208e71e9b4493ef2d96019beadc96766ab66e94647b9fd8a8948ac51fea34a0652aa88b045a8426c6fca7f5e68ced700e61ccc270d5951cf54af31c4264 SHA512 6b077e52f4ce6beaebf5f450ad200e6cb74784e97773efb7fbefaa9189bf03d73ee9eabf21f6b7743a6645915e06e5381e2c1461451507738cd2d2e5dd4e12af
 EBUILD libclc-15.0.0.9999.ebuild 1464 BLAKE2B eb3defea1ec4f77f431b772f9fc0f8695344e4d80a0a42a9620e983bf12fe6c965380fd26bfc6b17bef66ae26893cd2d63df948dee58981492c1e4731e3fb838 SHA512 6c06c48e42969f10cff381407be3d8d1e02752529ea8dc9944fb11d97f680a687951f83900225585d8df0a37d1341c33c18f3f3a082119e8b8b9045b411040cf
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
diff --git a/dev-libs/libclc/libclc-14.0.0_rc4.ebuild b/dev-libs/libclc/libclc-14.0.0.ebuild
index 36da442fa39d..e9e381d23b12 100644
--- a/dev-libs/libclc/libclc-14.0.0_rc4.ebuild
+++ b/dev-libs/libclc/libclc-14.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 8f7df8d929a8..8d5234f3226d 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,3 +1,3 @@
 DIST libcss-0.9.1-src.tar.gz 522715 BLAKE2B 32206403f77997e6692eed00c9233e6f49f08efc2515901a8bef7590883e44ef320511368fe5a67968102911d849696a4419735c7f6691f0f272fcc3b9a000d8 SHA512 069b30e74ff03fc91666dd16f22a38effbb3e29f066fd0fbc09efdc26dd8678e3f31adeaf918c5596fb962c56335fb2ecdbde1aa6704fcbdec3c2f97d03e5bbe
-EBUILD libcss-0.9.1-r1.ebuild 1096 BLAKE2B 74af0ccf17cf180d8fe18b0998ec302f5da3befe22aa6651737082d48a9849983ff4c928d085566593c643ebeec415bbac09053ee2daea82eaa59d661781dd35 SHA512 ffc849df7aee07a4f285f46f01323ab66985972436dbbbb050520dd27234902e33f58d0ff02364e2be05ff28955050905657c113079bb0b120422c459eea5a27
+EBUILD libcss-0.9.1-r1.ebuild 1103 BLAKE2B 67815f850ff4e450a4fa3da6e65554620aa64c06c132c40a997095006d63e46070615625fe533b6db72bb97b27082a30476af9f4adde2ebbe3d5ae9929b87c66 SHA512 648d01854d148e6ca7be7a631bd3324e0e8d19532eae1807d7da803ecaae4e1ddfbe457e3c743c63978ca36d383364b24e4ca0a4210f93f433c57b8316fc17a7
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/libcss/libcss-0.9.1-r1.ebuild b/dev-libs/libcss/libcss-0.9.1-r1.ebuild
index 45f4fdb3e481..dd714b5212c8 100644
--- a/dev-libs/libcss/libcss-0.9.1-r1.ebuild
+++ b/dev-libs/libcss/libcss-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index f78bc62c81a3..532f5db749a9 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 562 BLAKE2B d07bb8d5805ff6659c6984057084cc5daa294cd33d87ba9f152aeab79b425626673c83e2cd5046914381a8c0432cfd34994fd61aadc1c9263367ba9c9506903f SHA512 be5ed6332538f24044008dcb91b93771ff7afb73e5e7d2351474b6a9d3dca57a790cb27831ca869057ece03989c49d7e49213240cb1c1f0c5c93346a4a157710
diff --git a/dev-libs/libdazzle/libdazzle-3.44.0.ebuild b/dev-libs/libdazzle/libdazzle-3.44.0.ebuild
new file mode 100644
index 000000000000..e2f4a4679d48
--- /dev/null
+++ b/dev-libs/libdazzle/libdazzle-3.44.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson 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() {
+	default
+	use vala && vala_setup
+}
+
+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/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index ad99f0ac9e49..8eb10a49aca3 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..da8a1d932f7a
--- /dev/null
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library for code common to GNOME games"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
+
+LICENSE="LGPL-3+"
+SLOT="2/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+# glib dep in meson is 2.40, but vala is passed 2.44 target
+RDEPEND="
+	>=dev-libs/libgee-0.14.0:0.8=
+	>=dev-libs/glib-2.44:2
+	>=gui-libs/gtk-4.2:4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index a39e6b7b9758..f3d9ffd590dc 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,6 +1,10 @@
+AUX 4.0.0-autoskip-network-test.patch 976 BLAKE2B ce6866636be48e553621a18dcda5ca122f204ad074d7472c740ea8db8cb283fe8f6ab63e2bc3862fd2c0725446c7c2969bc2f431bd175d9d2b96f68c401f3e0b SHA512 6f47d66e243dac3162b3e89e5fe893de7d87cc8dce9893534a12e76f1e9b830a18cdf3a9f6a26de89094841d1874843da301ed10f35e0b7e6d9ae4b2bca07f54
+AUX 4.0.0-vapigen.patch 1153 BLAKE2B 1462b72ad3d25d4d5eac255d49217d74ef2cab67c740dc1feaaafa671977eaa92557c623c4f37f8cc4f76ee05018f040dd3604b6eb413bdc46830f77e2aff8c0 SHA512 0aae04a26f68e63b30911d3a76dd0569823ea11e247c14a34f81a15686caf33ea2834368e8b545faa1d0bd5f66e749916722e2cd77feef151c5cebd6d0fec1dd
 AUX 40.0-autoskip-network-test.patch 1038 BLAKE2B c233294ad5a301e8a7b6b96e606124a5440cc93507f291147acc6f8178341b1ce4ce292250d56467364bfadc2d28d49f02e5f3aa8f4cddac7dc621621a57d93c SHA512 fe2ff110863627e61454d1583d155b9f73c7c64814a77736783eaa533e50bbacc61065eb66a84af20f83323f0b66a1a38c70af26a1f7ef5a559865dc885c786d
 AUX 40.0-meson-tweaks.patch 3192 BLAKE2B e30f8f47beaa9683b6709389a0c603b28bbf160a1391dfead3d9bc1117bc3d811ac5cad4706bc85720f330ff5b22d5cd276947ee9bbe0f8911073a0e9a0b35be SHA512 c135d708154060d84023f2e33d16bd5a6a798311b858d0ebd15a9a51a1bf69c33ab93ef02bd8b6b65c5cfaf071af4a7a154630e3fed0767173cdfa576e554d1d
 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-40.0.ebuild 2116 BLAKE2B 2faac8e29708c643ff2e7086294871bede550d97bea1429af2cc64a1216c2fc9d9a66534bc36227cc5586a5618336fff3bfb25d43350d3e92c53fe123d7e40b6 SHA512 55a446794a6ffafff387f2254b550a5045a3f94bb740443aa33a37db32f02e094915c8e3204d77fa66e10125797215dc06ea34c59d8f1637de8361f8ac47f4c0
 MISC metadata.xml 350 BLAKE2B cba370b67a1b0ecfa341989e9590fe3c5dfb165349c5a874bc968ed5d3f2e42185f2872034dc8d847f878b68f6bef6d40a19883868945834bbab18edc6fe028f SHA512 3f2b10a36dd71f822b9cf2c799832c8725778c918c4a83e80431443b2c4ae3fc8a5d36071e0b02549fcde4f11aa8f38297fa7394363182abf0ab1a06639f92a2
diff --git a/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch b/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch
new file mode 100644
index 000000000000..3f27906de012
--- /dev/null
+++ b/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch
@@ -0,0 +1,29 @@
+From 87c0d202977c212a6b7fd360ceaa295e422de87d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 30 Aug 2020 10:35:13 +0300
+Subject: [PATCH] tests: Skip metar tests when METAR_SOURCES couldn't be
+ resolved
+
+---
+ libgweather/tests/metar.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c
+index 7d6c7c04..0b3025a2 100644
+--- a/libgweather/tests/metar.c
++++ b/libgweather/tests/metar.c
+@@ -142,6 +142,11 @@ test_metar_weather_stations (void)
+         g_test_message ("SSL/TLS failure, please check your glib-networking installation");
+         g_test_failed ();
+         return;
++    } else if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) {
++        g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?");
++        g_object_unref (session);
++        g_object_unref (msg);
++        return;
+     }
+ #if SOUP_CHECK_VERSION(2, 99, 2)
+     g_assert_no_error (error);
+-- 
+2.34.1
+
diff --git a/dev-libs/libgweather/files/4.0.0-vapigen.patch b/dev-libs/libgweather/files/4.0.0-vapigen.patch
new file mode 100644
index 000000000000..d5c4ca12623e
--- /dev/null
+++ b/dev-libs/libgweather/files/4.0.0-vapigen.patch
@@ -0,0 +1,29 @@
+https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/176
+
+From 98b505675f631c1fabbbcbcee2523f8dde8e7e3d Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 12:19:59 -0700
+Subject: [PATCH] meson: Use dependency() for finding vapigen
+
+This allows the vapigen binary to be chosen by overriding the VAPIGEN
+environment variable.
+---
+ libgweather/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgweather/meson.build b/libgweather/meson.build
+index 08311af4..7148f5ca 100644
+--- a/libgweather/meson.build
++++ b/libgweather/meson.build
+@@ -211,7 +211,7 @@ g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection'
+ build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build()
+
+ enable_vala = get_option('enable_vala')
+-vapigen = find_program('vapigen', required: enable_vala == 'true')
++vapigen = dependency('vapigen', required: enable_vala == 'true')
+ if enable_vala == 'auto' or enable_vala == 'true'
+   build_vapi = vapigen.found() and get_option('introspection')
+   if enable_vala == 'true' and not build_vapi
+--
+2.34.1
+
diff --git a/dev-libs/libgweather/libgweather-4.0.0.ebuild b/dev-libs/libgweather/libgweather-4.0.0.ebuild
new file mode 100644
index 000000000000..daa592786342
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-4.0.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Location and timezone database and weather-lookup library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="4/4-0" # subslot = 4-(libgweather-4 soname suffix)
+
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.68.0:2
+	>=net-libs/libsoup-2.44:2.4
+	>=dev-libs/libxml2-2.6.0:2
+	sci-geosciences/geocode-glib
+
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.6
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/4.0.0-autoskip-network-test.patch
+	"${FILESDIR}"/4.0.0-vapigen.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/pygobject[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use vala enable_vala)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use test tests)
+		-Dsoup2=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index c12afe196c78..95ec2ef217e8 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..ebd30c0d96b3
--- /dev/null
+++ b/dev-libs/libmateweather/libmateweather-1.26.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="MATE library to access weather information from online services"
+LICENSE="LGPL-2.1+ GPL-2+"
+SLOT="0"
+
+IUSE="debug"
+
+COMMON_DEPEND=">=dev-libs/glib-2.56:2
+	>=dev-libs/libxml2-2.6:2
+	>=net-libs/libsoup-2.54:2.4
+	>=sys-libs/timezone-data-2010k:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--enable-locations-compression \
+		--disable-all-translations-in-one-xml \
+		--disable-icon-update
+}
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index eb249325f404..53b32bdee795 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,4 +1,4 @@
 AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
 DIST libnsfb-0.2.2-src.tar.gz 82594 BLAKE2B 6deb775e77df71fbcefac6ef8755484bed476b652ae5dc3fe8914b859262ea1f6ee49da9d27a5a1bf34256481c58dd98339f0eb96511dcdc44cff2bef9ef6a7a SHA512 8cd16c0ca974aad8105dc32c8ebd627cf24f6d3bd81360515c2e0159e35328920e91039bb06ab4f52c93264c2112d0e130761e3837ba26fc703caeb52bf27b66
-EBUILD libnsfb-0.2.2-r1.ebuild 1122 BLAKE2B 55f5cc8c647f55734b0469e2b829bdbd33e12f38f27966e7f5e5b7bea7974545250e8bd27a5f836a34da663b196a9f8893edd855e28458b70c1f21e14367c51b SHA512 61239679519f9a2e510732c019ca8856fcfc84d004c3272d3daa038b947efc3344e288d0a5229f20fc44d199811986f74d279f5ecc035fba72a3b0c1bcb14d32
+EBUILD libnsfb-0.2.2-r1.ebuild 1129 BLAKE2B 7fdb35e19b7ac1e74c6def71207569bf9fa7e457ee1d0f576eba2deff02a73b273cc0bfc14e901c97b9f133aa257967a9f8d6e867f3f5e6f23d7927e3cb649ba SHA512 03e5059ff8e90b25349a1c0d1f8f87cc5a0716b8dfc6904fd7df82770d40de1f0d24e5fbcb6905f7f9f70859f38a083fa362e2702a2f7f2f3e5f4ebeadd67690
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild
index d37ff45a58e6..054cc665c4a5 100644
--- a/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.2.2-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://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="sdl test vnc wayland X"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest
index 6b33eae3b650..97a6873a9922 100644
--- a/dev-libs/libnsutils/Manifest
+++ b/dev-libs/libnsutils/Manifest
@@ -1,3 +1,3 @@
 DIST libnsutils-0.1.0-src.tar.gz 8840 BLAKE2B 9f25763b945a96d89ba33959caf676b09964da096a9e969396f3b0ba0f6b4bd6bfb52a61bdcc222432463f2bc0f6bc148bc754200fb80a9ab521c5d64638bba7 SHA512 82d75e799b21484120b9711c853075a07990aa4d5ac5bb0574683bd1fd59eef547d9b78333eeb2da9d96c2132b4e7c32510cf690c80cef291cce8ef2eb44198e
-EBUILD libnsutils-0.1.0-r1.ebuild 596 BLAKE2B 78379ebada23f2d407616efc0e7c1b602003ee2aa6e66386ac40bb1d13797d5c137e5f080f585ed5cb626fa335c6a184c77fe1cdd31dfcf81ea8bdf98a6b6de4 SHA512 e24ebc4fcc0e6ad8de6f3259c7b563da682f45a08544ca41616b8715be7ca8cebbbc0811e30c26065b21f3a9b8ae9ba4340f0c9cb82efb5c0a336cbe27748646
+EBUILD libnsutils-0.1.0-r1.ebuild 603 BLAKE2B a8ec975c0a8a81407f84a3880d30b5c2fab86c0efaeb81538df3ef1d5a2355324ea86d85b0f2055fdf4ad745eae12862af538cd964f56b30df2bfe667b004dd6 SHA512 722479bec80d9d4251c03751a06b6e9e54a7b4ab5d6f3dd8d00e7f9cdb7526bb91180d80c6d3ae6418fd0c159d42f56b99221dd64b851717a7d403522c042d5c
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild b/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild
index ba9b4b767085..38f54257b76b 100644
--- a/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild
+++ b/dev-libs/libnsutils/libnsutils-0.1.0-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://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="dev-util/netsurf-buildsystem"
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 0302110e1a6b..0a50253afbe8 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,6 +1,6 @@
 AUX libowfat-0.32-ar.patch 1564 BLAKE2B 43477182d5ea37327376511ff1f6a4db9ac117a11a6246be1e016b6b6e363432d959d2a986a604cce15a2a6d58558dc4627b0824624aae707f127dbfd43e5da8 SHA512 9945333b6cb9bf68242e6053a8634595e226031557309e190ac9ada860019daac8f11c562a661a60ec1cfd91d0502416006d13e877f8429acb0b653a6cccfa98
 AUX libowfat-0.32-gcc10.patch 633 BLAKE2B fdafa991694156b4c9bd93a6ad1a77b8673c9b176735da0bf525faf2549336121e4ca6a17dd7a35e58292ed6fc66ea176656b7cb97884f1fff3400194de3ef00 SHA512 ba3eef982f8345a96b2612bfbb8a97dc6477b21a58a35cda513ecdcd346b0cbf752574d565003f1d6887cda4467d8efc5777aa4d80fd50f731d35387028cda84
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
-EBUILD libowfat-0.32-r1.ebuild 1039 BLAKE2B 534907ee194eff327e07f903df0f5dc5728572b013fca29e583aa3df3e852db91c3145f2f2d604b0017963d8423a0c946c2eaeff93da0785f486da939e055047 SHA512 71e1d1a579943fe2b1d53c22ed23c579745ab3d4d058033d7a789563ac0ead400039232472a116ae9abb7ee83df3421d7a43dadbca187567bd8fdac2157b3e86
-EBUILD libowfat-0.32-r5.ebuild 1567 BLAKE2B 48b00e2eee504790d5700a00c06359f1f75e733ab3cc701a00c80f0d9385e6dcba892df641316405f40fe605658979d08d7d1969b86f4774e6a3525ec4bfef07 SHA512 7c6fc464cbbb41f4aa374553bc2dc14d8dbe3e35efe9c7ebc3b164b50e3a0c9846081145e826220b39c85476c45d68703e92cd1881e6aa6aa4de0d651050eb56
+EBUILD libowfat-0.32-r1.ebuild 1041 BLAKE2B cd184f6303790a883e32e6d706534f3c9324bbb910f4439e54c3ef8d283f7ed36cfd49ec3289b66096ed41d89dfabb8ea61d9e96080d1192ec19a4fd09ad77c6 SHA512 02239d59b02d21f23e6d2aefd915a86b968189e557e271711db93c4b4334f2ceb0fc6e0370709412331aa7190fef05d6006d2d1b3c92f7e9385a8051b1ad2985
+EBUILD libowfat-0.32-r5.ebuild 1573 BLAKE2B dfb20c55e2d648ff60d21791d5f63a79b26ac551eb0c4680c21f5a7648b9927398b3b74df1d79f26ee480126f92085aa1758ab31031bad9c569c7b9503cd7fe2 SHA512 9b392da8307d3be8115ddaf97a53d42a815893732972b8743297e4e718fbcb9a55fbb5185a85fe62c321a2a8e81814e348105dfd5b29bfca4e5af49d0e5e2167
 MISC metadata.xml 480 BLAKE2B 49c7453e40ab25a232a9c3c107e81d96a1a320fc550ae0855deccdba949747c5eb42119302e21abefe2233308f43a65221e1ce57dd60484790e0224ef64e011f SHA512 54c8b37a53ee832a917721328b30277847e4e8c8562c186edef8f0c28f3b50fb9fbf5745617d051b92c0f99f9a62f81a510ee256d9107a2149a00bfc807356d8
diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
index 77774d4f7f6d..c1eedcac7645 100644
--- a/dev-libs/libowfat/libowfat-0.32-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -25,7 +25,7 @@ pkg_setup() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		CFLAGS="-I. ${CFLAGS}" \
 		DIET="${EPREFIX}/usr/bin/diet -Os" \
 		prefix="${EPREFIX}/usr" \
diff --git a/dev-libs/libowfat/libowfat-0.32-r5.ebuild b/dev-libs/libowfat/libowfat-0.32-r5.ebuild
index 6dbdd3e205c5..da8af4daacc6 100644
--- a/dev-libs/libowfat/libowfat-0.32-r5.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r5.ebuild
@@ -39,9 +39,9 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB) \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
 		CFLAGS="-I. ${CFLAGS}" \
 		DIET="${EPREFIX}/usr/bin/diet -Os" \
 		prefix="${EPREFIX}/usr" \
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 2247efeea1d8..3f3f1e879f32 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,3 +1,3 @@
 DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
-EBUILD libparserutils-0.2.4-r3.ebuild 849 BLAKE2B 1049681266cbb3d1610883b0c3429dc71d1182c6624011d44b04a4afd9fa053ad2b2d00c1934c87c4969cb04994f75c83c799a7400345da8d136159eae0954fa SHA512 584f01ff041938d5c538cb7b28473ed29cbaaf1cb0364f0d6768a46633cd6f591dc0f1b171fc91da89284916f9d43f7ec46e2fa0aaddfaa3d101f79058dc2120
+EBUILD libparserutils-0.2.4-r3.ebuild 856 BLAKE2B 2dbfd6614b4ac7cc2762f100ab5d16c919c7dcb43f1323a4aaed9305e3a8cc2d524aa0829e126006c592874f0ceac300375836524467c1c7e9ce3387a8b8d5dd SHA512 60d4b0fe28cf4d8ace9e5cc20f21b847da623c246d53ea6f4d56e05e2e57b468eb3827a902204a486243493ed523e82f762f1982f48717db718d91113a86fe19
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
index d851e35b45c7..1e777ae69ee8 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-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="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="iconv test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 7f45b086a5e2..de9d937f63df 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,4 +1,4 @@
 AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f829ff2086d93041dfc872e301a19a234c8da3b834fb5c0da3b510b0f63fff7fc07c1d6680ebfb964ba3dbf1a58b302abb14a393da36a4 SHA512 ac9f6155d055b25bcde26bf11450cb07618d7194e0a2c28e0c38dca4190b3319fbfdb85c97f01210dc7540a708fd4f8879853350d66ae382b54c4704e2e7028b
 DIST pcre-8.45.tar.bz2 1578809 BLAKE2B 3954e08cf3c67a5e2249bf72f8d4c1a90fe7a098fffa5a0a06d0d665d07899027cfd632eab2757fcf2b1b9b413a43d5c484c8e52d05b7ca113b3bbbc4dd3bb29 SHA512 91bff52eed4a2dfc3f3bfdc9c672b88e7e2ffcf3c4b121540af8a4ae8c1ce05178430aa6b8000658b9bb7b4252239357250890e20ceb84b79cdfcde05154061a
-EBUILD libpcre-8.45.ebuild 2585 BLAKE2B da24c06e5f48336fc1662ced48e3b6bd37a51935906d99461c225a6b5616b439b5d7a79a0648bb804fff038551b4ae396322a3c2b8de7ade9359e02bf7105d22 SHA512 c1e1a2de0e5a425bc600dc2f8535a9303460e7e8aebbf9c523045cfbe4dcafe25ee5b4ea57aaa5b34238c4466828c23c57b2259e6697004aed94c44a6a6b5312
-MISC metadata.xml 1220 BLAKE2B b3ec4a4b694861f05697992104fcbf0a635bfd5e54114daa35c91e10a745a78b139298ba9ce8ceabd6484be597e8c11b535c68a004523b7b22d7ef563bbcfbcd SHA512 1de359eb39d4e1e1333925279845960dfc6e0cc07e8b987a71a790d6c22453d774182e050950c955084f4130299c33ddd66e9a5cff4466a500fd02efe4ac7bbb
+EBUILD libpcre-8.45-r1.ebuild 2496 BLAKE2B 01f340ed6f04581eeb1a875e0b128d7c835728bf924ffb9c6ddc7143709861c9e1a63b24c032b79223e85837e0d2c612938bcf4f9a54ce53f0b88ae5cd2764a3 SHA512 22eabb3f90688c2272a79c0a07b403d6ce71673305b3bcf0743f08208d523efd1cc754d06b93dc1ee89ce26e7ab1955d451484afcb98e7217b20c8fef4afdd0b
+MISC metadata.xml 1063 BLAKE2B c20c54462582bcffd5927643186e1ffbf49679a49490a53970f236f0bcd74fc8813233425ad4a642933ce60d224bb93457cb55fd12106b660a78902c45e11563 SHA512 8c2239d0176c9b79c162538824edead567ba4b51b9567c6edaa01af6ab1d4b2162867e134b40cc10c6c4d599e72c362beed3f9f6ed2a837a13a57cecff2f987a
diff --git a/dev-libs/libpcre/libpcre-8.45.ebuild b/dev-libs/libpcre/libpcre-8.45-r1.ebuild
index 0adbaa5d98d3..a28f218327e9 100644
--- a/dev-libs/libpcre/libpcre-8.45.ebuild
+++ b/dev-libs/libpcre/libpcre-8.45-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
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
 
@@ -52,7 +52,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT)
 		$(multilib_native_use_enable bzip2 pcregrep-libbz2)
 		$(use_enable cxx cpp)
 		$(use_enable jit)
diff --git a/dev-libs/libpcre/metadata.xml b/dev-libs/libpcre/metadata.xml
index 5337fb94bb67..e7bcdb6d6d5d 100644
--- a/dev-libs/libpcre/metadata.xml
+++ b/dev-libs/libpcre/metadata.xml
@@ -16,10 +16,6 @@
 			Add support for command line editing to pcretest, through
 			<pkg>sys-libs/readline</pkg>.
 		</flag>
-		<flag name="recursion-limit">
-			Limit match recursion to 8192; if disabled, the default limit is
-			used, which is the same as the match limit.
-		</flag>
 		<flag name="zlib">
 			Add support for pcregrep command to search within
 			gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 8001cec37c52..1daeb333af5c 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,11 +1,4 @@
-AUX libpcre2-10.37-jit_fixes.patch 3022 BLAKE2B 7e3091cc46d60ec3c72981f1980f7ebcfaeecc1c777188bed0edbaa64205752fcd69164ebf5de670f857f4837a76593c1930cdfe7997b49b38dc1501d7e5cbec SHA512 b691357b43032be0e97234a7fb27b4bdb684028acd4e2bc3da9a997ba823e8ffc9eca1d32fb5c3bc5700b7504ad16f83aa0f6e486c869e529cdbfa597024ad70
-AUX libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch 1501 BLAKE2B cfddc2a8f4ae40e01d18c4f8e19b2810461b49e587dc2483fdc9b712ff4f7dd907b1690663180e480ff794bc9404ce4acbe22585c15a9f5852d116ab629f47e2 SHA512 1b6738f97425b4c397c85a6e254d5c37e17d7327afd8d62e11c565667bfb874a6ddceca8cab01bcc21a397a040b4e7fbaca3ef890569c4a9a207510425207edd
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
-DIST pcre2-10.37.tar.bz2 1729384 BLAKE2B b4e56041010d7f44e84a63a17b35e87329d258107d8b27ccead10f51e7deacc93cbee64a22c71b9f0b8f244920b3a22fa4d9b786ec441a428e0ad0bb8535773e SHA512 69f4bf4736b986e0fc855eedb292efe72a0df2e803bc0e61a6cf47775eed433bb1b2f28d7e641591ef4603d47beb543a64ed0eef9538d00f0746bc3435c143ec
-DIST pcre2-10.38.tar.bz2 1729078 BLAKE2B 9438ff2422afaa83d5a4b2e64d5897068c35add28d66956431f9937191416d6df4903ecf35af72c788480d7def08e0ce17922e9b036698ce1bbe6cacbb799df2 SHA512 3634cb2db6ccba9720c1b69890bcd9eb7057f6a6cb6981f12b3f2d6b2bb4e75e4e5014f566045f9ba1b79edf01fa5c4d81eb333727b9462e843dfb70f3a58f95
 DIST pcre2-10.39.tar.bz2 1730729 BLAKE2B 9ee01ac2704e9cb7a107d402fa0c32828fc66425b62270f6891667bde5fb00c1e779c9730df3522acbd62d11703343bf48265050c09d3754183de314baf7cddd SHA512 b3d898198f4b5ffc3453d2ba56fe2a7298c01c52e5f67d45f1e046fc0dee62e16a4024fcb65839ac9c367beedb531647affd6f8599fbeb102f19423c150d80d4
-EBUILD libpcre2-10.37-r2.ebuild 2593 BLAKE2B 02943bf2282ad9e35e8a70589c16a2f695c1be786b008307e2e4c5c1c597e56b3d830b12b05cac3dc4aa7c1ee39d6d4a60a8c094a6019e20817246b40f00c357 SHA512 365ab860ba70c2bd594ebe668bd86e03feaa97819875393c4e7011c3440c4aa9423e202194d4ecfc2bc07a501163202aad0360b91232824510dbb6bf2754edfa
-EBUILD libpcre2-10.38-r1.ebuild 2741 BLAKE2B 7528c16f246064358d84688aa99a143a25d8d73bd8628a95243c550ae6ec286f13c9a152fbc339d6207d3909dcf27e4238b45b794f06ce1f86c20f2a1f9fed9c SHA512 a9a724109d5d394d6d0bfafda9c3639cd0aac027f8f06024d75859ab1f5a4a84f51300a0acc2134ce0090466a7db221abda1f79a2f5b7e446dc4681113771a04
-EBUILD libpcre2-10.38.ebuild 2633 BLAKE2B 93310ef1b7076161de129898f87949e02a2787e573b5ae66d32036af3a545f86dd4e69d13ccf01c9ac034696ba4d413afe9da21f16956be4bab3a4ddaabb8711 SHA512 69e5a4dde785bb82494e07997d81eaab5f034ff599e2f25c6a54b52165999b40449b0a44ef98f162435e577ecede96826828782e74a3e037357dbeb290e7db9e
-EBUILD libpcre2-10.39.ebuild 2625 BLAKE2B 146eede56bb7521075d410a002a8259903777bb66d5b43194b422e8e0b091dac30511c3584c07648f9b14a809375847efbc526ce264fdd5a87788b36fefe2012 SHA512 14f10cb68a3cad05cc7850ad0bf9f9758f3fc583af44a869f9dbcea78981f561e0be3a1c745b195f6627da0a35065512ccb4edc3878fbacb65c3908b335ce766
-MISC metadata.xml 1236 BLAKE2B 4a7361d870b4cbbdf16cec3dabd66e5f161b5c9dc17c4db1972e99ed739f2f17dbbdea2b9828991137e7cf8db93c87ceb4b2b8b617174979d0a6d6d827e0537b SHA512 57d2fd0a8b3d98dd2d1d40cf4934bf1202c812b9c2a44802a6ca2960e174dc71471ef9fb5f1baed48432ca956a6572f4313fbec5e83f4557f9634e78f2f2a465
+EBUILD libpcre2-10.39-r1.ebuild 2540 BLAKE2B 9ade286d148d36182f0c31efdd8fe0bba41cca7768d101c1d3007e5c03cb54e05e839462466f4c79377cab34aaff16bca51bc88f3470ddda4061b0a5838278dc SHA512 a78040e5a5a60df14c9e8aa13222f39fcae851d6180c775d34c99f9ce21129b642b3af0627398ca345ba62f9ba9b54ec12dc6707fd3ba244706a4e78b5583ca1
+MISC metadata.xml 1079 BLAKE2B a7d0068409819b13a8216b72b4cbf4241db6ff180e3b0f13cdce8c669cdc4f8be156ad6020b854df349e4ffc4166a8119c582e4d0b90d93a09bade43fa8a1273 SHA512 ad273d7f89ed478186714d388b555b163f6424a9651c6673aa5bc89dc81f602a4add30cf22d8481b70eb079c71cf4d15746a15d6e4ba8ac483e5408aa3415927
diff --git a/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch b/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch
deleted file mode 100644
index 6ee5494f2bc5..000000000000
--- a/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: pcre2/ChangeLog
-===================================================================
---- pcre2/ChangeLog	(revision 1314)
-+++ pcre2/ChangeLog	(revision 1315)
-@@ -1,7 +1,14 @@
- Change Log for PCRE2
- --------------------
- 
-+Version 10.38-RC1 xx-xxx-2021
-+-----------------------------
- 
-+1. Fix invalid single character repetition issues in JIT when the repetition
-+is inside a capturing bracket and the bracket is preceeded by character
-+literals.
-+
-+
- Version 10.37 26-May-2021
- -------------------------
- 
-Index: pcre2/src/pcre2_jit_compile.c
-===================================================================
---- pcre2/src/pcre2_jit_compile.c	(revision 1314)
-+++ pcre2/src/pcre2_jit_compile.c	(revision 1315)
-@@ -1236,15 +1236,16 @@
- 
- return: current number of iterators enhanced with fast fail
- */
--static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start, sljit_s32 depth, int start)
-+static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start,
-+   sljit_s32 depth, int start, BOOL fast_forward_allowed)
- {
- PCRE2_SPTR begin = cc;
- PCRE2_SPTR next_alt;
- PCRE2_SPTR end;
- PCRE2_SPTR accelerated_start;
-+BOOL prev_fast_forward_allowed;
- int result = 0;
- int count;
--BOOL fast_forward_allowed = TRUE;
- 
- SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA);
- SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0);
-@@ -1476,6 +1477,7 @@
-       case OP_CBRA:
-       end = cc + GET(cc, 1);
- 
-+      prev_fast_forward_allowed = fast_forward_allowed;
-       fast_forward_allowed = FALSE;
-       if (depth >= 4)
-         break;
-@@ -1484,7 +1486,7 @@
-       if (*end != OP_KET || (*cc == OP_CBRA && common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0))
-         break;
- 
--      count = detect_early_fail(common, cc, private_data_start, depth + 1, count);
-+      count = detect_early_fail(common, cc, private_data_start, depth + 1, count, prev_fast_forward_allowed);
- 
-       if (PRIVATE_DATA(cc) != 0)
-         common->private_data_ptrs[begin - common->start] = 1;
-@@ -13657,7 +13659,7 @@
- private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw);
- 
- if ((re->overall_options & PCRE2_ANCHORED) == 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 && !common->has_skip_in_assert_back)
--  detect_early_fail(common, common->start, &private_data_size, 0, 0);
-+  detect_early_fail(common, common->start, &private_data_size, 0, 0, TRUE);
- 
- set_private_data_ptrs(common, &private_data_size, ccend);
- 
-Index: pcre2/src/pcre2_jit_test.c
-===================================================================
---- pcre2/src/pcre2_jit_test.c	(revision 1314)
-+++ pcre2/src/pcre2_jit_test.c	(revision 1315)
-@@ -351,6 +351,7 @@
- 	{ MU, A, 0, 0, ".[ab]*a", "xxa" },
- 	{ MU, A, 0, 0, ".[ab]?.", "xx" },
- 	{ MU, A, 0, 0, "_[ab]+_*a", "_aa" },
-+	{ MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" },
- 
- 	/* Bracket repeats with limit. */
- 	{ MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" },
diff --git a/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch b/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch
deleted file mode 100644
index 936bd057a0e9..000000000000
--- a/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/PhilipHazel/pcre2/pull/22
-
---- a/src/pcre2_jit_compile.c
-+++ b/src/pcre2_jit_compile.c
-@@ -1251,10 +1251,13 @@ SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA);
- SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0);
- SLJIT_ASSERT(start < EARLY_FAIL_ENHANCE_MAX);
- 
-+next_alt = cc + GET(cc, 1);
-+if (*next_alt == OP_ALT)
-+  fast_forward_allowed = FALSE;
-+
- do
-   {
-   count = start;
--  next_alt = cc + GET(cc, 1);
-   cc += 1 + LINK_SIZE + ((*cc == OP_CBRA) ? IMM2_SIZE : 0);
- 
-   while (TRUE)
-@@ -1512,7 +1515,7 @@ do
-         {
-         count++;
- 
--        if (fast_forward_allowed && *next_alt == OP_KET)
-+        if (fast_forward_allowed)
-           {
-           common->fast_forward_bc_ptr = accelerated_start;
-           common->private_data_ptrs[(accelerated_start + 1) - common->start] = ((*private_data_start) << 3) | type_skip;
-@@ -1562,8 +1565,8 @@ do
-   else if (result < count)
-     result = count;
- 
--  fast_forward_allowed = FALSE;
-   cc = next_alt;
-+  next_alt = cc + GET(cc, 1);
-   }
- while (*cc == OP_ALT);
- 
---- a/src/pcre2_jit_test.c
-+++ b/src/pcre2_jit_test.c
-@@ -352,6 +352,7 @@ static struct regression_test_case regression_test_cases[] = {
- 	{ MU, A, 0, 0, ".[ab]?.", "xx" },
- 	{ MU, A, 0, 0, "_[ab]+_*a", "_aa" },
- 	{ MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" },
-+	{ MU, A, 0, 0, "(?P<size>\\d+)m|M", "4M" },
- 
- 	/* Bracket repeats with limit. */
- 	{ MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" },
- 
diff --git a/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild b/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild
deleted file mode 100644
index abd807adeb95..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild
+++ /dev/null
@@ -1,97 +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="mirror://sourceforge/pcre/${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 +recursion-limit 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}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-jit_fixes.patch"
-)
-
-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
-		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
-		$(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.38-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild
deleted file mode 100644
index 84077f8a1f3e..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.38-r1.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
-
-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="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
-		https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${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 +recursion-limit 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}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch )
-
-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
-		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
-		$(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.38.ebuild b/dev-libs/libpcre2/libpcre2-10.38.ebuild
deleted file mode 100644
index 6f868c1cfe8e..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.38.ebuild
+++ /dev/null
@@ -1,94 +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="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
-		https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${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 +recursion-limit 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
-		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
-		$(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.39.ebuild b/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild
index 477a50daf57b..6add5be7acd6 100644
--- a/dev-libs/libpcre2/libpcre2-10.39.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild
@@ -27,7 +27,7 @@ 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 +recursion-limit static-libs unicode zlib"
+IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
 BDEPEND="
@@ -62,7 +62,6 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--enable-pcre2-8
 		--enable-shared
-		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
 		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
 		$(multilib_native_use_enable libedit pcre2test-libedit)
 		$(multilib_native_use_enable readline pcre2test-libreadline)
diff --git a/dev-libs/libpcre2/metadata.xml b/dev-libs/libpcre2/metadata.xml
index 0d201299bdec..1f00cd29ae6b 100644
--- a/dev-libs/libpcre2/metadata.xml
+++ b/dev-libs/libpcre2/metadata.xml
@@ -16,10 +16,6 @@
 			Add support for command line editing to pcretest, through
 			<pkg>sys-libs/readline</pkg>.
 		</flag>
-		<flag name="recursion-limit">
-			Limit match recursion to 8192; if disabled, the default limit is
-			used, which is the same as the match limit.
-		</flag>
 		<flag name="zlib">
 			Add support for pcregrep command to search within
 			gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index a583e7a79772..ba75dbf2942f 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,7 @@
 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
-EBUILD libpeas-1.30.0.ebuild 1968 BLAKE2B 893e1a059f197ecf3b2bcd71a34a9ec430098e15f49cca5b7119a699aecb7b7014be85cc1ce2fab4c5973c217ff5730028e29383f005e18039ea2f79c784b927 SHA512 e09f5a8698f520fd5ac39898460d92461e5ad95b1cd25b858d4f02207d870404f998dfd1abb5991babe2eb5284bcc21127dea5f88fd877462f48d9a25891bdd3
+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
 MISC metadata.xml 416 BLAKE2B 9383d1583b61f2218efb3b8c7bf6855e30ab8ee3f4e0829b78f17832af533a6839e713c702e0dbdcdeb24a516badb446b935e0ee1abc112c2342c2f0ce321d81 SHA512 3fb271973b7b510983e84c2d0188688f04a1f6a1a80aabc15dcbdb14276608ed59ee3ea1f77feade9b08785651ea4f85e400d928a267651c40f0e490c175da62
diff --git a/dev-libs/libpeas/files/1.32.0-meson-Fix-disabling-gtk_doc.patch b/dev-libs/libpeas/files/1.32.0-meson-Fix-disabling-gtk_doc.patch
new file mode 100644
index 000000000000..39377b392dee
--- /dev/null
+++ b/dev-libs/libpeas/files/1.32.0-meson-Fix-disabling-gtk_doc.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/34
+
+From 1be9b5a51ca4200d9cff69642368c24225b58dd5 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 21 Mar 2022 19:13:04 -0700
+Subject: [PATCH] meson: Fix disabling gtk_doc
+
+Without this, even passing -Dgtk_doc=false will cause documentation to
+be built if gi-docgen is available.
+
+Fixes: 82119a6 ("gi-docgen: Initial commit")
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index c77b352..91b8ca8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -251,7 +251,7 @@ configure_file(
+ )
+ 
+ # Options
+-build_gtk_doc = gi_docgen_dep.found()
++build_gtk_doc = get_option('gtk_doc') and gi_docgen_dep.found()
+ 
+ install_glade_catalog = get_option('glade_catalog')
+ if install_glade_catalog and not gladeui_dep.found()
+-- 
+2.34.1
+
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index a760f2697bdb..3af483ae7446 100644
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-lin
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+	python? ( ${PYTHON_REQUIRED_USE} )
+	gtk-doc? ( gtk )"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/dev-libs/libpeas/libpeas-1.32.0.ebuild b/dev-libs/libpeas/libpeas-1.32.0.ebuild
new file mode 100644
index 000000000000..aa4f25fae10e
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.32.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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} )"
+
+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
+
+	"${FILESDIR}"/${PV}-meson-Fix-disabling-gtk_doc.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+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
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/libpeas{,-gtk}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index be2315cd7ef8..84b3086a14bd 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,5 +1,5 @@
 DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa
 DIST libpfm-4.11.0.tar.gz 1043686 BLAKE2B 99b4f1a5156316139603cf50cf42c13c548a0b196435bfc92bc26ebd3f8d7ec9584255978d4f3fbff45cddc937269961e9d2b65d065632ae635e9ca45c179a54 SHA512 633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7
-EBUILD libpfm-4.10.1-r1.ebuild 898 BLAKE2B 5f6ea6c7e7e0620ab1dfe1c55630537500f1e70e479311b37d7c1a63518abadc324d664c394c6f87382462974bd0600bb532f43322989dbc2d916fc55316c528 SHA512 91fc7332530d754b3f6a9644df4b69c8cc49f60781a68fc83f5f45cb530722876884398b6cbc3a0ede8a1cd684db481fe1778d77819309f257a74420182b8b6d
-EBUILD libpfm-4.11.0.ebuild 958 BLAKE2B 28925ab3c437b9b7e0567a649c2461952f82c0bba245b776c2c1ee716f77e772e9f881cbf9340d810ea0ccf9eb0203a3ff9dae77035a9e975cc9eb12d8fc4aa0 SHA512 b8f3cc553c258c4171006c2df40326ac6241edd7402281cf3e995315fcfc1b365c74b6a6c40a123633af51e406b1524725015515055fd3246700b44f829fec6a
+EBUILD libpfm-4.10.1-r1.ebuild 902 BLAKE2B 1222b2d293447472d244ce0ac21cd63fd62dc17a101a927390bfaaf686572261b410e9317f7f7023b3597626bf547fe3146b9736e90625d1aec93f833bb9c8d6 SHA512 ce072a3390377be866c3d3cb4513275aef8a6c055ddd01c8f9a5c74d48f4aaa2a7174e8ef845efd6eee476bc8e6dd83ec0cef7f801a880950a4c43dc6775a272
+EBUILD libpfm-4.11.0.ebuild 962 BLAKE2B f51cef1a882d7cb390c5b52cd0a5a1b19a1d04749f4601eb1bb803b8abab9f1be40c9802d2d82daa4f5b0c648fae917d8e286139d4537c044c4c4511d3252e69 SHA512 8d1dadc4fadfebdd09f43f8c753e95dc0ecd64d3dcd6717946fff4103bdfd68f586eb11bdcc625572cba1660b985af02757ec95996eaee4d9eac335e70c6c8a1
 MISC metadata.xml 246 BLAKE2B 08a76e53ab8da2beee24c0920d47104aefd113853da0d9295967f0db8800717ea4486bddfb9ea1dd83039bb8f8deaf99edb834e2ed2bfe0207282130c7878a90 SHA512 7123d176941aa889b85a3fb204987908d69d05cfe577678b8e8bb0a4512b6a274dfb7e0ad1d2f5d93078512b78f89227712fdd3262fed332caafcaa40ffbc735
diff --git a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
index faac7cd052bc..e184cff1e527 100644
--- a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
+++ b/dev-libs/libpfm/libpfm-4.10.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
@@ -25,7 +25,7 @@ src_prepare() {
 
 src_compile() {
 	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
-	emake AR=$(tc-getAR) CC=$(tc-getCC) DBG=
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" DBG=
 }
 
 src_install() {
diff --git a/dev-libs/libpfm/libpfm-4.11.0.ebuild b/dev-libs/libpfm/libpfm-4.11.0.ebuild
index c5109aebff56..a3868b0f5074 100644
--- a/dev-libs/libpfm/libpfm-4.11.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.11.0.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 
 src_compile() {
 	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
-	emake AR=$(tc-getAR) CC=$(tc-getCC) DBG=
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" DBG=
 }
 
 src_install() {
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 11e46a1ae034..18f3cb09a382 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -3,4 +3,4 @@ AUX libprelude-5.1.0-fix_gtkdoc_1.32.patch 416 BLAKE2B 9717541a0d57a0fb97a7f4f2b
 AUX libprelude-5.2.0-luabindings_liblua.patch 611 BLAKE2B 8541a59228a9e8d0b35cc22ec2d26f3f01a91348fd7eb293f68c637b1ca176c86cfa28578d28b8c290f76bf8b4adba2ff5f7da7a8fd16ee4b846730c4cd04b56 SHA512 1a45fc0fb71850769e0b23c0b1ce8eae0912bdb3398baaef91b631b622fbd7166a11cc1f501d8dfa063b8dc5230c41b3e521b57792d8c865b94d9a6efea2c995
 DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
 EBUILD libprelude-5.2.0-r10.ebuild 2063 BLAKE2B 859bff279c0f3c110fe3dc3b99e8d00456f26a2f4237b714e94150c206def08dbbb62bdf64072bfa5340e48bbb9cd519aeb81b20a47e8a7c3b8115babcff965b SHA512 3cc3df6a72e57c314587e7198efa4184dccd7976fa63a9411d281bc1905185a47b99c85bb8a71a5e511b62c50c7d7a2344b7d60772c758c353470a8af00f7f16
-MISC metadata.xml 902 BLAKE2B c2e06db4cfe2d669d4096d41a00401199b03419206b9d69d011be926a6751bb50a3fa215e5f123f97199c4b0b9abb481a798e97bc61d99af7eeea5a70af26dbe SHA512 002876d6c69fa3df62e13d30d87e5c479fff09c5fe23f925c5643afaa2c2e280493d4bb821d2ac281f7ffc71ff0a139fbe2c5a6d7751fff7cb5b1d3ed151ab79
+MISC metadata.xml 666 BLAKE2B c133e5679e6a366f65f627ce547abd85393a9e17be6fada179b78a8ecfe85700291f688ad93c2afc9cc08a1554c0a0b783e53835fd3d62a65e21a01024d25042 SHA512 65a571f4f6602982484f9ce258bf684cec128c0460e9df37153e0647370beb3304404534f909cc72c775e05f04aea3ff8e2d0a1b3e19edfcb004789b35d60313
diff --git a/dev-libs/libprelude/metadata.xml b/dev-libs/libprelude/metadata.xml
index 9993a68f4a42..cff50f46e8bf 100644
--- a/dev-libs/libprelude/metadata.xml
+++ b/dev-libs/libprelude/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>thomas.andrejak@gmail.com</email>
-		<name>Thomas Andrejak</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Libprelude is a library that guarantees secure connections between all sensors
 		and the Prelude Manager. Libprelude provides an Application Programming Interface
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index f2f0ab378cd0..b7a208d36533 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -3,4 +3,4 @@ AUX libpreludedb-5.1.0-fix_gtkdoc_1.32.patch 431 BLAKE2B 243bda8c42be083a0c5d38b
 DIST libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf
 DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744
 EBUILD libpreludedb-5.2.0.ebuild 1876 BLAKE2B 82ae50c137091dc1a8044ebe71abcdc94e1ef05aad2bd66ea905dc74fd371e58160b2ec6d91db90df528fda3303abded1895f5280c4105e8027450748d127fb0 SHA512 c88cb822e44e41bca58e4467dd27cde10a182aa06c6de89992cd43c2942cca78e0e43bd13ad18542061fcf7acc34d8744b905b4ce10df26df976c89f26a1b9ea
-MISC metadata.xml 771 BLAKE2B bb1edc33156941cfa0ccfb9d61c268b755212bdbf03045fb875f2d9d544412a1d234f287a2a41a5d4d74b0baa509b2a46fc251283bd1f55a822d0145627f135b SHA512 feca887a2b6fb371ecdf358ec464510f0656e34b8ae58e9b16c47b84156f60c6217bf9618fb2def9c17b1633b53d03155954af5e4dca83d56758427eb6a5cc5a
+MISC metadata.xml 535 BLAKE2B edeb9bd1c236b095157daf54bb8c5f3d3b13c752691916a299d06028150159ea0716bb6ae822626cdfa997013f020fb329673fbae504d052aab5a137016259d3 SHA512 3480d1027cf20ae097a773c6cdbeeab0a3a6d842b225b09e4fdac64fe1c992d79569b88d8e8dacbb9f82e73b887d2c7477aa88390bbaeb6f3ac3c9948d972826
diff --git a/dev-libs/libpreludedb/metadata.xml b/dev-libs/libpreludedb/metadata.xml
index 130319f7e3a5..7bc26282c762 100644
--- a/dev-libs/libpreludedb/metadata.xml
+++ b/dev-libs/libpreludedb/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>thomas.andrejak@gmail.com</email>
-		<name>Thomas Andrejak</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The PreludeDB Library provides an abstraction layer upon the type and the
 		format of the database used to store IDMEF alerts. It allows developers
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index c6cc01384cde..c70c4832c172 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,7 +1,9 @@
 DIST libretls-3.4.1.tar.gz 435404 BLAKE2B 11b828f5c058b929d1d4bc0cd3c53f17592c113f10f6bb73f8b7e672b5ab376e768e33893c4fcf5c0b447bc5cd30012c8aaaf5b639cb4962f4e0849ac3ee6cf1 SHA512 5d8b8d6cafd4b3c7e97eb417dad35a415bd69d599e9ee720f5598452a6750589b570ffa52718062d2ae3477df81b2316064577a25d2c68fa673082bb766b16ad
 DIST libretls-3.4.2.tar.gz 435457 BLAKE2B 2bfe4af4ea8d773f79b6607e7a0a2e7ae7cfae40690312e940c583bfc6de98087f328d1613e65695f46cf6ba1e11f9ef5f043185d21bcd595004f70cec6f3ef3 SHA512 0ded26558b74a00e5e05629d577c07ad9b8a8955aacbd7f97d6d1c81d4e7ccfe7c2fe0cc5bcb03fffb282cd51b8404236371d0074e39508099d1990fc3e065ba
 DIST libretls-3.5.0.tar.gz 438466 BLAKE2B dac7442bb2bd924ff516e24f82905ddb69f20f697e7ceee04477f4a15560db358bf81e5a2ff68d088f13a99c2d8cdda93bb71c5a05a5a77111d691f9a9183265 SHA512 21f60dfc3147862df8499f81b5dd3d11fa9c6e481b06e9494797cfd78313982465fdd3ef0c4ec0373a708029df0acba7919620fb13142d5afec0bbe136760249
+DIST libretls-3.5.1.tar.gz 425343 BLAKE2B e303ce141a218c58655f01aacb11e61fdb96d9b3a5943b211a35f02d869fa99efe7bfbf719ad14a1983c7f418d8c1daf3013c01ffa3e0bdd58cfce84ed41ec63 SHA512 ea566f0eda3f5ecb413f070db0ff9633b0c9403919eb2724712eac1c47fd32745b6da8e974a0226c8f95b7e24e5824780b377ae63651fbd0fa34ff0e6df4792a
 EBUILD libretls-3.4.1.ebuild 663 BLAKE2B aae0f351b3aa8bed9e12226fd7f323e2c58771d750e424c2caaf2cba0fd98559224e75ce84738a5c89301bf37c5a934dbbeac981cbff2188a7cbc2c4fca66893 SHA512 abb227cda09a245991959d7015bce467eac2b2ba0eb5a7f55c9ed7f40abbbeff2d3e45708233fb73742dadbda507c0c2a4c605d2b0e26ff6ea645353444c32ed
 EBUILD libretls-3.4.2.ebuild 669 BLAKE2B 21ee067e2e922e487172c93c2abbfc8b076549125c4afe97c0ac97a6898a023d50e57273a12fd6de7f468f44f6d8ba1c4c3f1dd463fb6652aa396ee5209f3f4f SHA512 30e790b4c21a4dd580762971f82efc9d893a8c0de126d1c8966c68af4b9869dd4c09b1e12a695ccdf50ed5044988a2fbc1e17f371ec0f65830d9064f5372bcea
-EBUILD libretls-3.5.0.ebuild 669 BLAKE2B 21ee067e2e922e487172c93c2abbfc8b076549125c4afe97c0ac97a6898a023d50e57273a12fd6de7f468f44f6d8ba1c4c3f1dd463fb6652aa396ee5209f3f4f SHA512 30e790b4c21a4dd580762971f82efc9d893a8c0de126d1c8966c68af4b9869dd4c09b1e12a695ccdf50ed5044988a2fbc1e17f371ec0f65830d9064f5372bcea
+EBUILD libretls-3.5.0.ebuild 667 BLAKE2B c79c1d558eb57d462309cbd4c4c2e7ed0fc02a605e3bef47490c53d0429812240d098059e725c475d2dcf871369688c413f1581803bc1b6c522322212650bd58 SHA512 c02825f8f3d2f7e8f0bf9102ef3fc56cb422267d4c175c81ae4281ce1ddcec55618af514a9472e428ab8cef591e79c5873d665a1df9fbd581a66b1224ca48376
+EBUILD libretls-3.5.1.ebuild 669 BLAKE2B 21ee067e2e922e487172c93c2abbfc8b076549125c4afe97c0ac97a6898a023d50e57273a12fd6de7f468f44f6d8ba1c4c3f1dd463fb6652aa396ee5209f3f4f SHA512 30e790b4c21a4dd580762971f82efc9d893a8c0de126d1c8966c68af4b9869dd4c09b1e12a695ccdf50ed5044988a2fbc1e17f371ec0f65830d9064f5372bcea
 MISC metadata.xml 361 BLAKE2B 9f05ddd1ac3e1a634962c9c800c3bdf60554488c61dff9b215866b24e0b2472d7c0873f0fd6bacec2abbab0e79faca728a4b22e34633c3dde64995b05b86db61 SHA512 c7b186da31da21b4ad5c5662325cb2757e3ee8d7cfd84d75a49b07aebd4dc882cb9b0e16ffce99a8ae2409a53dd750dfb5ec6eff0f9da9f4afee013f102ef688
diff --git a/dev-libs/libretls/libretls-3.5.0.ebuild b/dev-libs/libretls/libretls-3.5.0.ebuild
index 777d4586d76b..7c1804374589 100644
--- a/dev-libs/libretls/libretls-3.5.0.ebuild
+++ b/dev-libs/libretls/libretls-3.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libretls/libretls-3.5.1.ebuild b/dev-libs/libretls/libretls-3.5.1.ebuild
new file mode 100644
index 000000000000..777d4586d76b
--- /dev/null
+++ b/dev-libs/libretls/libretls-3.5.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
+HOMEPAGE="https://git.causal.agency/libretls/about/"
+SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/22"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest
index 0cc68ae1eb7b..ef37035f7b85 100644
--- a/dev-libs/libstroke/Manifest
+++ b/dev-libs/libstroke/Manifest
@@ -2,5 +2,5 @@ AUX libstroke-0.5.1-autotools.patch 734 BLAKE2B 3590484c7a4b96b7faa09eb7e2267365
 AUX libstroke-0.5.1-m4_syntax.patch 1100 BLAKE2B c86fed17159d3179bbb538c1c467fa5a34133b6a43d30f2e2862158e0756ea8ca8654ca6f450219c9222cc3612fefddf6170922f410a9c1119f48439acf5daff SHA512 bfe54a1c60c381e01820f46998c1ade66bcc5b816d20d8736334cd097f94fd06921c7ef17ae42e1f4f47090a7a9a6db2121a9960c140ad7dcb4d5ac3acf6fded
 AUX libstroke-0.5.1-no_gtk1.patch 1046 BLAKE2B feaaa0206f74bc1206ed464ec3f29c76e2f51c83f78c6821d2184b833e1718638b11757ab3f8cef9464884dc11a3158fccb9f1f9fd166f50ee83f556b447b25d SHA512 96004186c51e617fa53f1bbaef5f58c6572c5acf0a6acf2d9e7be618c443fccff5feb8dd7bf77a9a435b8c5b334e1babb3cbd739e71ec6d7fe7feda1c66607f8
 DIST libstroke-0.5.1.tar.gz 174270 BLAKE2B ce642aff20f731ed8dc6aedfcdca0370e4e9789bdf1fd7d4157745ea7375d5e5f9c7a2f00739d886ff348c00ada36c3bef0ce68f18d9b0dd52eabcc086776334 SHA512 03431d4cd39174aadb6cfd00a1c487d34ae9cf4b1db9e9d01d563f2a661f01979f474b87099fd2bfb0e54653416a1b9dea988367674a3cc6134e16b62810a0c7
-EBUILD libstroke-0.5.1-r1.ebuild 741 BLAKE2B 13a400777d866642d5e15407324fed25f9fba69b698c4fd1639f2e878ce6bb862b5d2625f836cc651287d33114b134dcb84d954f2b887f76c53b03968d88a4dd SHA512 6e82b79427f8db3f8c7353e4a37ff6a924e2c097d72512729d64a97748349d0a048124e80a2dcef8bce59031612f169a653b8970ddb2b7f6f707edbef7772306
+EBUILD libstroke-0.5.1-r1.ebuild 748 BLAKE2B 250ac32b60bd308d2d77e94b2746a763b8911334031a99ab8323292219282bc31c2c76f1a2bcbeecb6ef93f92de705601b2ed097fc916b3ab9bdb5262c85ad8e SHA512 6774f5c0c6531bc90614edb23193dad9eeeeebe4713c5a236b143fc1091b88abb549c3b8db99e04ad01da0f5206b5b15957a7d408f5b5069b7c974078b7f9076
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
index de679ffa9ad4..5abb144b665b 100644
--- a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.etla.net/libstroke/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 69a832b0c9a2..ee2873300203 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,4 +1,4 @@
 AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
 DIST libwapcaplet-0.4.3-src.tar.gz 31766 BLAKE2B 7a51b27911192b0697d6eebe9e98abf720a76daa0e0ce0eb6148186e21e36d3b1853d3b24c8fa325ecaa4ed69d8262a9282ef77ba028d316dd16a225a6766d64 SHA512 b4cc8b0dac86c87b1806acfcf5c4734955eb797cb04ea67f764bae32fdecfd3ee4d8ad0f2f3f0a1813c9684b7120dbb97ecf11f29de0d60a7bd45d96c1a451cb
-EBUILD libwapcaplet-0.4.3-r1.ebuild 814 BLAKE2B e52ea13a9d3e2431630f279b952c3cfbec50a3dfcb86042032c5f71a3d11dd24033e2855178893644271303d77e3e7b0eca68b69ce7e1b92f97f81adbf2a9072 SHA512 975fb3dcafbce68823a719a4e1e84fbeb0283e1894437d215b12f533e0d3deeac727a6ce0d30a91c08a5180ebdd50caa17c256212537c7f35846d76b399bb2f9
+EBUILD libwapcaplet-0.4.3-r1.ebuild 821 BLAKE2B b9594d6d4ef1f299f8a88c15f9e01ab9648f420f86a8806f875c9c8d71c0e627b9c48db6e3eed9138425bcdad65db00b46381512494d564676a57e39c22862ae SHA512 4915671c065333719ee1a6e0788e9a2fab22fd5e91a5ac3dd62e66c6aff8d09689f15bf6fcdaac682ac994fefccdd1737986eaffd84cc23597148e168d645dcc
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
index 2fa2456ef9f7..f60d9229693d 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.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://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/mimetic/Manifest b/dev-libs/mimetic/Manifest
index fd14b3592007..41187d312dea 100644
--- a/dev-libs/mimetic/Manifest
+++ b/dev-libs/mimetic/Manifest
@@ -1,5 +1,6 @@
 AUX mimetic-0.9.8-build-mmap.patch 688 BLAKE2B ca85ba15a59d9581c14e5d04095988ea18c9e8ea5f6e55f085ce0796a7f0a84633a8506d503b55700155f5b5320ed9b9ae7aa32c9f26c95afdad9ed6e97bb605 SHA512 37bb61296c0f337ba670ab721360fcc22bbff375a7a5f8e612076e49545a34abe83e9c079bcd28c7735145b2f07a60e3b012eb55937999d9c3abab32d7e773d0
+AUX mimetic-0.9.8-uint-musl.patch 1164 BLAKE2B 98e45f7dc050f4ca01344578d3c076a85ad46fed2691d8a60e69ce79f7767df0f09b5ad3841cc21b7a65d7694b9fbea63dd3228684e822c35971ac9e3e95c3fb SHA512 bf01922ffa50ff443d1e2aa2e83d51338e8b6a21cb6d7ba03422e9f2518a44ffb9943cf52ff6fe14fced9b778e6504ea5a8f66e57a97a1bfe109b34025b98361
 AUX signed-char.patch 1024 BLAKE2B 333955f24190ac0327cbc8ec786a91d62f431169aa157966ba592b1132681635bd231f893bdb7b70c849aed2d3910aa488a9813f7f00b8688d3bb46000076a10 SHA512 23f79103ff31d70d992a777118bc733f3fc52b5fc21b6827c19b0d40a099c11b74eda89feccad2690f83a4cc3f8e92d918d111cf9cef025b94481fdd75c3fb63
 DIST mimetic-0.9.8.tar.gz 556716 BLAKE2B 16dcd2a869a5ec92f8aeffca52f41aa1773ad1446302cf827d25ac27c407bcb7e59ed3f8868a00102ec19ef874da440e72f80cb42150a20dfd962af5173901f8 SHA512 4157eecb3e26af314d475c91192a357d6da35271a07a07b037d5037e9af84952ce2636874e86df0e94e8887dcfdb8f594a1ba04e6448181e436b0e2675f48f58
-EBUILD mimetic-0.9.8.ebuild 996 BLAKE2B f535b304529f396415467b946c106e27699279a94f54ecb9934d64711fb04998332df9c1c4caf33c1bae88448687f76f8350861363e7bd18384e1a1b8289a583 SHA512 a2e3463bceda2a2b5bc31a2ec9d551b2448eac4c92d31e7f101cc07bd9e65ddecbe0d7509013947b76c619c9fce517c5512a13f681e4d64ec34d73f93e61f225
+EBUILD mimetic-0.9.8.ebuild 1032 BLAKE2B 2134b428597d03838486092071732affecaa050c54a342ffe8c259f7c5dd9f9231efe0cdb8bf9161f59ffcb73649426d9cc9015e94babc6a5c6c6bbcc2e25353 SHA512 3f06b9becb34de39ab7a2410034a660fbb24ef63203baf045b32ed815c8b0a8778b817a4b17d427649b2f97699f3a74bcc9d538bdf1722d1640ab5a9ff79efce
 MISC metadata.xml 384 BLAKE2B 1e0f2435d4ee6e9726cbd965c7aff8b1c3ffb7b91e91fa1a41470fdbed020a32a87bf048dc6b79f8c53ffcfb653a15829236093b7f77d8d5554b6bf048c47d4b SHA512 4c876d6eebdeaac99d38cc9f479da4a90ee1b496d9a0e93c7b9fe5174b37aa046ecd45d410bec4002be4f87d43ced5761b64092e4e2c4e5866fd8f17a9ffe987
diff --git a/dev-libs/mimetic/files/mimetic-0.9.8-uint-musl.patch b/dev-libs/mimetic/files/mimetic-0.9.8-uint-musl.patch
new file mode 100644
index 000000000000..45e90c0450e2
--- /dev/null
+++ b/dev-libs/mimetic/files/mimetic-0.9.8-uint-musl.patch
@@ -0,0 +1,36 @@
+From 6afcd2f85332bdb25e38718cb9db6e3040797a8f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Sat, 12 Mar 2022 21:20:50 +0100
+Subject: [PATCH] Use unsigned int where uint is not defined
+
+Upstream-PR: https://github.com/tat/mimetic/pull/27
+
+diff --git a/mimetic/codec/other_codecs.h b/mimetic/codec/other_codecs.h
+index c4ccf3f..3e68dd9 100644
+--- a/mimetic/codec/other_codecs.h
++++ b/mimetic/codec/other_codecs.h
+@@ -109,7 +109,7 @@ struct MaxLineLen: public unbuffered_codec, public chainable_codec<MaxLineLen>
+     : m_max(0), m_written(0)
+     {
+     }
+-    MaxLineLen(uint m)
++    MaxLineLen(unsigned int m)
+     : m_max(m), m_written(0)
+     {
+     }
+diff --git a/mimetic/contenttype.cxx b/mimetic/contenttype.cxx
+index 81c36c0..0cb75e7 100644
+--- a/mimetic/contenttype.cxx
++++ b/mimetic/contenttype.cxx
+@@ -34,7 +34,7 @@ ContentType::Boundary::Boundary()
+         stringstream ss;
+         srand(time(0));
+         short tbSize = sizeof(tb)-1;
+-        for(uint i=0; i < 48; ++i)
++        for(unsigned int i=0; i < 48; ++i)
+         {
+             unsigned int r = rand();
+             ss << tb[r % tbSize];
+-- 
+2.34.1
+
diff --git a/dev-libs/mimetic/mimetic-0.9.8.ebuild b/dev-libs/mimetic/mimetic-0.9.8.ebuild
index da9c0be7544b..4717e99d7e02 100644
--- a/dev-libs/mimetic/mimetic-0.9.8.ebuild
+++ b/dev-libs/mimetic/mimetic-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,7 @@ BDEPEND="doc? ( app-doc/doxygen )"
 PATCHES=(
 	"${FILESDIR}/signed-char.patch"
 	"${FILESDIR}/${P}-build-mmap.patch"
+	"${FILESDIR}/${P}-uint-musl.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index 9f692da1a617..e5c88ded1667 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,3 +1,3 @@
 DIST nsgenbind-0.8-src.tar.gz 117463 BLAKE2B 63ada11eb9e818bc864b8100d80fda5686d4b1cc2a1b021f6cf76d098f5c6551b2792da6dc8aba02774304d3e87bf9728a85d3c80ccb0c24e4bff5a4fee3f977 SHA512 850769fedc82c103b6d063ba25ec97638178e56f5b331a1e237566b3f3bd858aba270bcd37618c638575f5361ff88a09cdae92f6d2b5dc100491e5cc75c072e5
-EBUILD nsgenbind-0.8-r1.ebuild 636 BLAKE2B 1d8a867792c3a224017195aef3e47cc2ed72facfce04938796a083cbc7247dd77803c6a8fe2ee0bb82ab04f569475e1b317c784a7bd3705eea3c770617f9f481 SHA512 042381b531bdf4adc4c407072ab4eb26d8b61645d9fed2de2daaf1599fccbb79d297498fda00bf89fcb8687d216e1992207e8cb33f3666c04c49fea9078526c7
+EBUILD nsgenbind-0.8-r1.ebuild 643 BLAKE2B d415ed255eb701b384dffbd7949fd3ad7582d9b5d4413adda0db0e8d7867f9338aad3e0617180892b8b8ff6ab80fe0c51517fa781f3a680502d79d4e9dfc77fc SHA512 4e378a0f61040604114a7d6c8486fa2e69b92054a08bb0b948cf68e153d49e4f60c3a8451d3761656624645532ba67eb74c5ef416333ca51fd75a66d10514858
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild b/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild
index 7d9aae10d717..366c566a639b 100644
--- a/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild
+++ b/dev-libs/nsgenbind/nsgenbind-0.8-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://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 76194f29eff3..f96a0e186304 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -21,7 +21,7 @@ EBUILD openssl-1.1.1k-r1.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8c
 EBUILD openssl-1.1.1l-r1.ebuild 8467 BLAKE2B 5416eaf449db4d7e785cf8ba2b83a829a9b57237c9d561900029ede389205a3905411b9b19d170f801d781fdb7ff3f8e562c0b037a87ad1cb48830cdac8091f5 SHA512 826f4e77f5388fa0b3cdd754c5d39c049987f4c7c038fa416da1611e084c866339ae95ccae722fb2058689953c60ed56562247feb11baaaf869516eea5a56b00
 EBUILD openssl-1.1.1l.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8ce7be60a85bcc8f1de2c74b1421dd33fd22c00451f6c55aad404616b82f2c971aab751de1d243cb4dc6cde23615e18e SHA512 2f594b4df0c9a408a8208f98b9bbdb0ffc63f3d3e84c3c242b307b2d4cd1eb5b34ec8b30735c2c4bb0f9c0842fe6264dd71722adca04caed79e4c32ee25c005c
 EBUILD openssl-1.1.1m.ebuild 9036 BLAKE2B 998fbd22a08de53c635cb928dc236827e0982e5758f51d179d92a087771f46fbff227624868bb0a682d0df2daec093d7c64bfb3812a6c5035f529030bbec7e8e SHA512 d976a3e28a9914a6ca0cba3d6a852c787f80d51b381bcb400ab88bcbc9d6e956c60dbb439781cfbffe47d1227301aa4ceb7729718f49a239f784dcc239815f93
-EBUILD openssl-1.1.1n.ebuild 9241 BLAKE2B 668ebb22634516767883f9789d986045fc39ab74dc44325bf24e230c5c986303bdc025fb5f034cbb4c241ba41469cc8d26471be8624f90f57cc5cd64bfe05c22 SHA512 7d5cf64848ada014a52d5e2d8c0e56cb7554a0f726c372f6bbd156a257e8b3400c2356ca80f1580db60c1c000fcb56e080d1f3fb0be6cbdb883979a6f26cd4ce
+EBUILD openssl-1.1.1n.ebuild 9240 BLAKE2B 272e5a33356c2dab0d681998d52843bc817ec3d717a05c0645f6948a48758a5f3f93bf14164068da3c40a001727d52c309ecc3e2534354e27b244a7be2f58198 SHA512 9b9882975b1082b8a141206d9178a969b3301eeffee30415a1d9417f74e63310fe819bdec191e9d22d41d9c8036ade9eb1d0eb0c52428be65d9bca968811ebf6
 EBUILD openssl-3.0.0.ebuild 8414 BLAKE2B 29ed3955931fafb29299b1513cd27bbb6f6c299a6b3c9bf91133222835100e25279199fecb915e46c5a720ff1f3dc5cde29707f4f9505caf258ebad5386b33c9 SHA512 6a8a08cd86cf1b12c98b3e6cf700106978a706e5c815305fb78dabe6a25fcf28704f9d40411e4a8f26adb74cce192f55c791f99938ae007560a85c0ae04b7c97
 EBUILD openssl-3.0.1.ebuild 8464 BLAKE2B 8e024cdae9836cb5135089482d22617b0a90b9617bc5b4f9ab79669c9b28a8c623218de11a452e2525ba29456a7ba9be7ac16724eb0dbcafd2d653b26fd77e4a SHA512 28e4e5be320a1a0c2ea726ec0872d6d42c79f3b5eea9ef23a2501e24e1ca6ff27226ad7720a7717e61642399a4a0d5d98ef406d8b8856ef98934ea7c3015d1a5
 EBUILD openssl-3.0.2.ebuild 8414 BLAKE2B 29ed3955931fafb29299b1513cd27bbb6f6c299a6b3c9bf91133222835100e25279199fecb915e46c5a720ff1f3dc5cde29707f4f9505caf258ebad5386b33c9 SHA512 6a8a08cd86cf1b12c98b3e6cf700106978a706e5c815305fb78dabe6a25fcf28704f9d40411e4a8f26adb74cce192f55c791f99938ae007560a85c0ae04b7c97
diff --git a/dev-libs/openssl/openssl-1.1.1n.ebuild b/dev-libs/openssl/openssl-1.1.1n.ebuild
index 57dee5fb869d..af9f45ed046c 100644
--- a/dev-libs/openssl/openssl-1.1.1n.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1n.ebuild
@@ -16,7 +16,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 0b820157f665..6ea9c20398b6 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 2254 BLAKE2B 80afa68600304a2423bfc9b2f3f989d5350813f0c9d11132a73bc1cfa586c3cc47eab4a1258fae787ebccc1150f58ff7776240d0fcfc29c20ecce2e392f48222 SHA512 a4384fcff252ef8b841f5336b186915d31b52fc2b18de0644d94678838bdd7771a0e85c9bfd6272444bd0bed4dc5b2a7e104930eff2dc98cf8d8170019e32883
+EBUILD ossp-uuid-1.6.2-r7.ebuild 2288 BLAKE2B 40a3ad919b7c4853577d99af36e4ef25069d480bb1df410d4a201e7ba53146196a7da0ac12a3674bf996f356effbd04361a6cd1bce16450186bf27ce8021c42f SHA512 2475afb3c6fea25eb3b2e56d75e971c0e2a086b7581094c01838422d97c666b4be7ac9325a06b48cfab56116bc35fb3d7a705512826b9632a6952d713054b66b
 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 1054159a937a..90dbbbf5b19e 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
@@ -53,19 +53,27 @@ src_compile() {
 	default
 
 	if use perl; then
-		cd perl
+		cd perl || die
 		# configure needs the ossp-uuid.la generated by `make` in $S
 		perl-module_src_configure
 		perl-module_src_compile
 	fi
 }
 
+src_test() {
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/.libs" # required for the perl-bindings to load the (correct) library
+	default
+
+	use perl && emake -C perl test
+}
+
 src_install() {
 	local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS )
 	default
 	unset DOCS #unset so that other eclasses don't try to install them and possibly fail
+
 	if use perl ; then
-		cd perl
+		cd perl || die
 		perl-module_src_install
 	fi
 
@@ -75,10 +83,3 @@ src_install() {
 	mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
 	mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
 }
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
-	default
-
-	use perl && emake -C perl test
-}
diff --git a/dev-libs/pmdk/Manifest b/dev-libs/pmdk/Manifest
index 9b888b773534..ea13eb253348 100644
--- a/dev-libs/pmdk/Manifest
+++ b/dev-libs/pmdk/Manifest
@@ -1,3 +1,3 @@
 DIST pmdk-1.9.2.tar.gz 2281358 BLAKE2B 2124055c9535a58d2904df20504ce17e51d8fb67aab2fd302b44d61e04fc40e7f622b6174bd7f8d4b978ff51386a6548cfbda4423be2764f36f8c8311cf54836 SHA512 da9f7863c346de2ec7874d5f920b5ef8e0de7bc87d2ca21ebc25056d6fde4e7753957d2a1b9d8ea26f53f0b828984d69efbd88ffac62d1a7403ef3bf9d33fa30
-EBUILD pmdk-1.9.2.ebuild 1057 BLAKE2B ee5472c5050edf97db552b5fb0e50f212b5e9ba62bdbb8416b42db124734339a58545f1a5603a8f28a3c2c6265f0f3af3968ac4ec8d8635d469503c24cfad43b SHA512 2699abffb4a9cae0a5c61a4a75cf5ac2842ed5f7877e06b563111c68765ffb4dcd8afa6c12511ae96a5fa358541fe7713ba3298ea89bc4cbae9c4b522d576f39
+EBUILD pmdk-1.9.2.ebuild 1065 BLAKE2B 8e36c4dc2c2d255fc5b3bbffeafddf4e634185f0cc6a6a55c3428ab38e440b139924a51855e542d443c9ef7571472ec5c029c8e912102294417fc47a135878c0 SHA512 c7610b21f9f2d2563dff9472c2cb48056213fb331da3c005874b4681ab9238b8ead60645ca5bcc56ada9df3d7121cf17e3e78b17720f61ef5717466d8db9d15d
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/dev-libs/pmdk/pmdk-1.9.2.ebuild b/dev-libs/pmdk/pmdk-1.9.2.ebuild
index 245e99c6fe18..a91c34bd922c 100644
--- a/dev-libs/pmdk/pmdk-1.9.2.ebuild
+++ b/dev-libs/pmdk/pmdk-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake DEBUG= CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getLD) AR=$(tc-getAR)
+	emake DEBUG= CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)"
 }
 
 src_install() {
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index d5db5232efb7..8c57df9a2547 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -12,6 +12,6 @@ DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd2
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
 EBUILD protobuf-3.17.3.ebuild 3962 BLAKE2B ce7bdfc88b34eb0ac4a5f1cbf4ea50390c2e3e541a8465039b2c8c6d30d67ba88cb7529beeaf22bd2ef648c97e6e8a027c4fd03256d124213c2751ea57351fd0 SHA512 84db0ad5516ddfc3ee71c0465344200fcc83e20de1f3fb2ded37392220b3ada8cc54d51d00ee7ae11c6926430968f9ba4f26c1af6e09775f9bc1f6239b19ee21
 EBUILD protobuf-3.19.1.ebuild 3937 BLAKE2B 91f50e666933ee1c60528513827bec42fef40aa8c1d3fada8bef9c8407b870c6e925515edbba8202c0261d197f76de004d644b57f0a7f1808faebf5c8cfdb02c SHA512 f8d3b796169d113bdbd7b81e7433a121af13a0722c991bac50a6a009a2869ffbac4307857e649f08756c268732367d6005403e3b505e97407659e5237373325f
-EBUILD protobuf-3.19.3.ebuild 4132 BLAKE2B 15b71474760e3cdb22d5d82ebdd436e7bc5e03fec4ac8d3c1d2f2bf95182d7f7e22d65437614e6b4853332660998bc23dae14fa5620a18a3f137caa922752112 SHA512 a3c2cbac121819025c9408af4af5de93f506142bb10dc749db7d7e26bf48546f8f899efdf4cdfb9bb9e8b8cb87ae90fe1c81575e8d1ae864093ff2b6915beba8
+EBUILD protobuf-3.19.3.ebuild 4131 BLAKE2B 6fc98f9c80316b494bfa66446d944421d88da42285b0c088a7342b97438228b92520551cf3251ed195f3ee0defde48c509f267f6b33f7f39fb64b4f337bacb77 SHA512 5b93b519733e0a825b9bc3d363dbda75beff21f39150fb0c164e88cd49f6b64ec71ed8670f691d20b72a722c77b99b7dd60883ba589852158e7bf580e28006b6
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 5627d3ad014e4360622b5837088bd6bdbc24b78886d734b1b37d01b474a4013e1ddec73422224c235e4908e8c1601e9650a69ee13d2ddb024d734c05080ab344 SHA512 bf151189787bbd05ff37f7d4e7e160d29b52ae1740704dd2b3446cb94e34e141e41d53b5a28d829c74c50e7f3fa5fd36a6bf528f0ad00af7fdc5be972c5738fc
 MISC metadata.xml 595 BLAKE2B ba1b916e26b1e53f68e660f03d2e53fea8d22db04e8241ebec3ec20fbb251c2b164cf25d5fb6118423ce7721a822ae2302aab137b0748730e9a6860bf8e65668 SHA512 785e2550621b79b6350e1a6b52ed9992610769885fb29a9e92ee45a35158cc08707a3590dfcbece9ee9a5e16e1abfb614e8186132da7b942f2761b5e6ecfa827
diff --git a/dev-libs/protobuf/protobuf-3.19.3.ebuild b/dev-libs/protobuf/protobuf-3.19.3.ebuild
index 606851de0768..bdd17c6aab1e 100644
--- a/dev-libs/protobuf/protobuf-3.19.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.19.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/30"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index dc810078ff3b..32d6f2b841e2 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -4,5 +4,5 @@ AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9
 DIST raft-0.11.2.tar.gz 325098 BLAKE2B d9366547440b431edec75a22bca3a50bb6d714b5d950c061723f0585c5ad33704d23c32f2e325dc566ebeab71e15e10f07932c854657837e190901b52c9b4950 SHA512 8be47270cf3b888ff6adeeec2480ccd5065b45c3c546da089cbb326cf429f0bcd4396001e20fbf52587c00d5757337812c834ec5064fafa4815a978a7cf0c35f
 DIST raft-0.11.3.tar.gz 329571 BLAKE2B 08b145bfbcc26b50f69c550599978ed365ccbbd021b9c4699784c08bd7e0f17f366b1709c22df1a467fbdb524668a753f431744419da8f18d57ea52c5b33de38 SHA512 7d1a7455ff8d58ed1f3d259cade1c74fcb22732a55242dcf761cc6554739c0ea1c462aa02591d28d8fa2b343b23e6261a5e15d02e2a31467969b7d9f9f3b5e92
 EBUILD raft-0.11.2.ebuild 1031 BLAKE2B c1bb5e5a07ec1d08b60dea5193de4561fdc3e8edadc737af4e6fffdac0d07ea2b204bfd9af9ad62f7e86c9486e978629848773033fc1c1d5a027ed8566c23c52 SHA512 c8322b60b347c6e40fd95c4f54918b5812833e034fe8eeeeae0821ddca0cf76e1b173001b786d42330113353ec742f1a0435b338b9848eeb034791ada3142a1e
-EBUILD raft-0.11.3-r1.ebuild 1096 BLAKE2B 830606018fe823faba2bfba7b1c5d4a4cb4ff9e7ccbc70f2bbcbbfabc100e68723000d225c020fe0b025f758e708353439643d4202b1870fd5872550bc32ad4d SHA512 bc42c406b1bdfe5a86e0bfb9ab78c82b515aba15b90e274924b255ea75c6f23d1bb4339a6f53a4625e0c7cacd3200501fcc6db882a402adba8dea9db92f31b6a
+EBUILD raft-0.11.3-r1.ebuild 1095 BLAKE2B 075d92ab1d95dacff2027da82952aa8f252eeb43b8ff3c4aaf0c5c10eb8df3f810a96c456dd7963ed04554f59081b3f864769bdb2e4e61003dbfe38e2e8e492d SHA512 31a64647fc3e944d2f76ec095fde4d5c2b28995bd68e6517538563c8d7b026bfd9999e68c75d1872970d30be1b3a74696d84a9086942ccf067ff3ee44194c76b
 MISC metadata.xml 813 BLAKE2B e2ee68230ca6938ecc09c7cf9a3c4acbe961c1a6c44cfc5521f5d1fca93d7b1a62c1bcf10290207288f3e5c04b8ecebb7d4ee4ba2b1a12326eb58e80e0276ee6 SHA512 e163b16c585f79757c35d5a84ed017cd173a40fdef5ea736f4a01c24ffc3db2f5f0d69486c58217d8910eee47757da5da23e8353f4254990ba13c2cd56ddaa57
diff --git a/dev-libs/raft/raft-0.11.3-r1.ebuild b/dev-libs/raft/raft-0.11.3-r1.ebuild
index bd9c3e128919..e0fa1e7d55b7 100644
--- a/dev-libs/raft/raft-0.11.3-r1.ebuild
+++ b/dev-libs/raft/raft-0.11.3-r1.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/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index be205cee68ca..99b8cebc2001 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,6 +1,7 @@
 AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9ddd49b1afeccc81f9306b26aa35f2bce5309ec45f1449d464b59f8a63b86cbcd43bd58014733f4ff0e3babad91be966379ed2 SHA512 f6162acd8af142efac6596b8e95199b3b14dc7d3906f30515b10b422a74fdc97fef1563d392e8c67bbec2b7c0ed532690c16f4a3bbfffc1b274e0c86c345bcef
 AUX rocm-comgr-4.3.0_strip-usr-include.patch 820 BLAKE2B c6f30de65db0dc690a41d1563bab100d1bc3503101867092e45480d256408d77a1104f49bbea9e38be41fd9b693d7a4e6a0d81ff9b6879681b3f07342abbbb73 SHA512 2c58214bbab369365b8bf38565bb141362041f3e56035e5f4e31b839d7440a62eec627c2fdd87ab1d3f5409a9d49844d14a293887acab5cdb2c53cfac3994761
 AUX rocm-comgr-4.5.2-dependencies.patch 1255 BLAKE2B 544a23e8066a2b308e2f90bfaf7e538ebe9b4becd5d84f3c4e8d563c01148e298c556fcec8639861749ba4cf838bf73e98a8231e0d19faeda6ea5d7df8459629 SHA512 4f7be98945217fca917b788f3ac93f9d5356d410d3c17f5fadda753d6bd5121c57ecc2c758c430f6d4a2997bc61b5d54b3b8be6f6af1d575c0190c635cb64426
+AUX rocm-comgr-5.0-rocm_path.patch 419 BLAKE2B 2adfe03cd86d84b1f183689e5feff298860c22b12a87bddf357d746d96f2e4df3de3d01962138e02b7670b28a7884d4b16fe9f52f937a22caf931e74bd46de21 SHA512 1ca24101e3c296127a7b429f0f6b05bbff388a0db2d4ffc3003844353ca43ddf0d95c4f13c902b841d748c19cfa11c39a300786af04919da3919b8aa7724fc1a
 DIST rocm-comgr-3.10.0.tar.gz 98322 BLAKE2B a7245531eb7e5e7a306a91ca917f03b25a159729a8fbd830cbb02355f807900f439d3d793c416ea277aa0aa64829e697ef8bb32a246a3618ed9bc2c42d25acdf SHA512 b9e0ae6d10a39d55855c35305560af8c5cdbef8f9d41022c40dc60b4fcc629a73a91c6d7235dd0785aba5e14f566f7ce0911a5a1c52c39cebd947f7b585c4d5a
 DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a
 DIST rocm-comgr-4.0.0.tar.gz 98316 BLAKE2B d96200d2fe8929631d1f40577a115b72e2341a66941e9de9de2e61c3d9eab9cb4a0cb51f3b2abc183be832ee86404b5f24d053396615038f4ca6bda23a7331d5 SHA512 fdbb334ff1cb2cd5eb40b9dcf1bbcb138b95d24fac80a90c12c9b5b2ac24226eed4f30ac2fa1923c274fae830e52542d5725436a77c404d1680266b103444549
@@ -8,6 +9,7 @@ DIST rocm-comgr-4.1.0.tar.gz 101923 BLAKE2B 227317d3c96d577ff2df352721e3ffcf75e2
 DIST rocm-comgr-4.2.0.tar.gz 101877 BLAKE2B 6796ab4fc7139224af9e26f6adc5ac3ef260b36d125517766bc4adf3dd819709e5aa816680ae073f00db635d15d2a3bde7bfc69bdfbea0f49453f75930fae90d SHA512 dffc00d166eb060c6cf848878cc6c7fc63858168cd20b5f22df2b7cbf3ac7a3253fbab5df4df055823028a06c3dca3e3f379246305ae9872eb94bcdbd30dd602
 DIST rocm-comgr-4.3.0.tar.gz 106250 BLAKE2B 40a3a69147ae4fc96d3713331d35ae65d952dbf92fb3c92bee75bbef394342b11f383cb51c6def85c256326905c5067b1da816e853f793fd3c40a5af9a6e0122 SHA512 5961720bdc78c6d3fc626bd83f52be0aa32b01178bf4db0a503a0639fe05c5c589b7feb2dcbeb78021d36a40ac6f936cb1262cd5ab5cda4689e8e642ab7eddc3
 DIST rocm-comgr-4.5.2.tar.gz 108521 BLAKE2B 9fe238a17bac5739d2d103d859a8dd16cb95d0333f9f85e7fd94463c4ee8bd88801b7b1d1278d978fda7425f391de5e9043a3539583ed3b8d45393a613c19bba SHA512 c466a9bb1b725b79d056673824c6dd79919866f42db88b611e4ac24b0624b12c078affe8bfc7ad7c1373ce0ca60607904c46f13751b47c9f4deaf4105e2c7cd3
+DIST rocm-comgr-5.0.2.tar.gz 117092 BLAKE2B 1ffcb74f9716a8f050d722f569cced66e8e9fa5a23a7156edd1b4dfd7dd7b09a175f3555bbf29ef452d7e4371f65ebe4c6fac30c583468a5563dd59fa92b53e4 SHA512 d2cf4517fc1da1adc367aaa6f53cc099547a931be30cc261d68c8174a5a9ffe3af937fbb298987abbdd7fd5d80364bef6ea9112dcaaf326a410fdd215e568f2f
 EBUILD rocm-comgr-3.10.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-3.9.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-4.0.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
@@ -16,4 +18,5 @@ EBUILD rocm-comgr-4.2.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe9
 EBUILD rocm-comgr-4.3.0-r1.ebuild 1084 BLAKE2B 1386328f3b75963b1b16e9b28b3894fac2f246c8ba5094c7cf8e4f784353086278d064072a295ed391319794df3fc3212dfd85dce41a023863bd6950baa0eb1e SHA512 949ff3b7670c09c7f702c233854a05547415996cbd04d77fd5de1b2f4b3b3557d0bb4129daf0a3b49e16e890017d466d1ec72822f6f4af05a1f92b6d718feace
 EBUILD rocm-comgr-4.3.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
 EBUILD rocm-comgr-4.5.2.ebuild 1097 BLAKE2B 2a8ec9f20371b7c86295dea6a044da83c96a0774c55f774b4b01118fb3c27185beb7b09a94144b43d95e75eed3ac2fae780314244ec7e2f55b7b3f82303a8969 SHA512 7fc5a888c252736f1777580208d6f2701a8b52690ce1753a10f259e5534d0027e09161a12b7d8bb9717c921fd0b1d31a89fda787ce9fb1f605d78d9ab5af2a07
+EBUILD rocm-comgr-5.0.2.ebuild 1633 BLAKE2B e0d150a3926662b7347a57994cadd835c8083215c56536b1eaae3d1fca13b601a59528da12c600c44edbe9ae78918fdc5ee2f32224a59293a30df9e7603e7d7d SHA512 7ae43bbbcf647d5a8c781b7ed0df41e34b7847776bfc4258f4bda4dace11512ddfee18f48c99cbc47124c7e6ad7984d332dee56edc3ac5688c3857408bd1c92f
 MISC metadata.xml 382 BLAKE2B c49984c9ac37bdd2ba8f4345d91d4b6e79f4e8d91e0b89dcd286ef32ede9477c964554cafe52419ca1d696a4b2b7391d45c6a8a4316e3a3103268153fc3bdda2 SHA512 d8d0ce6840a73611e02721c1fd458f9756962583484a61c6fe9051dcca1641091008eea4c01a71d4ee70649eb4c29e99d86e1f24861c05e4a542d0c60d388590
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch
new file mode 100644
index 000000000000..6e908847a54f
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.0-rocm_path.patch
@@ -0,0 +1,14 @@
+Index: comgr/src/comgr-env.cpp
+===================================================================
+--- comgr.orig/src/comgr-env.cpp
++++ comgr/src/comgr-env.cpp
+@@ -247,6 +247,9 @@ InstallationDetector *getDetectorImpl()
+   if (EnvROCMPath) {
+     ROCmInstallPath = EnvROCMPath;
+   }
++  else {
++	ROCmInstallPath = "@GENTOO_PORTAGE_EPREFIX@/usr";
++  }
+ 
+   InstallationDetector *Detector;
+   if (ROCmInstallPath == "") {
diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild
new file mode 100644
index 000000000000..e7ed23e8d3a5
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-5.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake prefix
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.2-dependencies.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
+	sed '/sys::path::append(LLVMPath/s,"llvm","lib/llvm/roc",' -i src/comgr-env.cpp || die
+	sed '/Args.push_back(HIPIncludePath/,+1d' -i src/comgr-compiler.cpp || die
+	sed '/Args.push_back(ROCMIncludePath/,+1d' -i src/comgr-compiler.cpp || die # ROCM and HIPIncludePath is now /usr, which disturb the include order
+	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch)
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
+		-DCMAKE_STRIP=""  # disable stripping defined at lib/comgr/CMakeLists.txt:58
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 2c43817f4d97..56485c182614 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -7,6 +7,7 @@ DIST rocm-device-libs-4.1.0.tar.gz 230813 BLAKE2B 699c23f3b08989765e90d3168e1369
 DIST rocm-device-libs-4.2.0.tar.gz 231971 BLAKE2B 292798ec29b6feb268928a41d7a321b9cffeb2e624557fc4c04b9fa48347a29838f53217b3006b52db53db0981d87b8cc4df6d95578c17d8d10b00b24211d773 SHA512 78aa285f97916ad68aa6108fea22b2c5f223c0c36fd631a4c8f565cf3eb26c0ad58ea31b5e700369a8b13a86f1c076e6cfdb829952cdf03c88a7827c14371aeb
 DIST rocm-device-libs-4.3.0.tar.gz 234910 BLAKE2B af306219df395f9c5e65e6e06dff976698b80009d3b0c330c396c3e9475dca124bee4c96ff31724763bf40b3fd611f1ef55a7fb675f5ef82b992e496bc3a2d6d SHA512 6e93b435d782a50f45d17bafb466ee05df88c39d665a8d796b68d588b6074629934c44afaae233fc84a238dc9c93d15917efeec7633349b4e894f3b3385bf57e
 DIST rocm-device-libs-4.5.2.tar.gz 244532 BLAKE2B fd13f3e518dc0922bb4e2a49863e3b86238158431189f4d4e9665f7e7b1adfa78ca96d915a3737b0da476cfbffcf0a0ad8840349a22062f59a83f59bc9edd05a SHA512 5da2efd685c279ebb1bf67e27e1a8febb20dcdcf33136667b9bf2ca0d3684b366237358269a0c221dd602af37503aa766842cd1932b2711b562c1fc94cd2ae70
+DIST rocm-device-libs-5.0.2.tar.gz 242099 BLAKE2B 3fc2afc3a837557da04bcd5673656c08d0b5ebf48fd6568a4b1687d157dc4b08e3b5cd219a7bf3c2ed82ca1391477c32c42b4e594d07ad47ef429061be351af9 SHA512 1c37401641080e511f325cddb62490c8827d1bcef7f2198449246afbd391162ed3294c24b0529e1b3669129e29544989e2cf12d46c90fea8d880c52cfdca5a72
 EBUILD rocm-device-libs-3.10.0.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
 EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-3.8.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
@@ -16,5 +17,6 @@ EBUILD rocm-device-libs-4.1.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7e
 EBUILD rocm-device-libs-4.2.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
 EBUILD rocm-device-libs-4.3.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
 EBUILD rocm-device-libs-4.5.2.ebuild 1018 BLAKE2B 21b067394e03510c311f4a52b3d311fef129bb7b2b6c3155a60136261c60b89b7a81c7cd19b5f8472ee97c7b4839f2f2601a18bde399d0177ab51be09244be2b SHA512 ecfb42ce61993db1056fbb977a82aa41196d0d687618002e910e5459bade69e42fe2eb6fdc52e1671e91bce7807451ee6c6298a1bd20d23246e7edf307700383
+EBUILD rocm-device-libs-5.0.2.ebuild 1018 BLAKE2B 1520ae84ad833f3e81555e5dbdfd8ca397000e425a800769b4bd6bc1e32878b0a040ad6d9685a380f87e4abb183d790c4954bd18b8c111375a92e0f27e5a3d83 SHA512 c4ffd4df5c91f93555a30b693552748a885cc1e1c2c3a22d95ccd9ea6d1f012d567bd2d04f1a56da3dbb7494a2a8f904a3e0ecd1d3495a0a1dabc86e77ed61b8
 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 378 BLAKE2B d4defdfb2ce3bab811d9c2ac75b92b7892d46d87dad9f89c26cde140b3b167b43bf4022128dee45e063e332d6dfafc3ee8d78b0112909a7ce2d4a4a44c6cfa14 SHA512 0732d51019f0d27ffb1ffea32d76cad8a6d82927cb8788ff983cdb8dcc472015dbe36ba568bda7459d0b32837e89e1a32064ab7dfcefd2b88458cbb4438f452a
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.0.2.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.0.2.ebuild
new file mode 100644
index 000000000000..a91a625b12d1
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-5.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 31d46659585b..b07a6a3c42ad 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -7,6 +7,7 @@ AUX rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch 576 BLAKE2B a
 AUX rocm-opencl-runtime-4.2.0-opencl3-header.patch 3227 BLAKE2B f9a23194e9531da59839e3b6636a523a1e50a20bc57af9615f49ad390912af1032131d67ea3c157c76c35529d4776f26fd3c1806342e2b67a71737cc9bd108ae SHA512 4364cad8e0f20dd2df1c3e23d6099be6e96ff585d95fe665e63d926b37e5d03aa4e5729af53e1575066e501230c1c766cebb86da47052d0d9f4dc23da7069b83
 AUX rocm-opencl-runtime-4.5.2-remove-clinfo.patch 577 BLAKE2B e8d57ae30b3ad97721f3afc254d780262c6f73259731d226445a320d7fc620c00398c781c5309bd4b43327ce45a747b5add3421c3abab0600d9e07c46cc20549 SHA512 83b7e1ef6d14f0cfefc2498fe5df191f2442b0265139cc3f2661346b55ff3621cf590a40476e156e729604fffb1285243df705010191b343596cbe3d67ee8c64
 DIST rocclr-4.5.2.tar.gz 846950 BLAKE2B beefc6a98d9a8a1a6c00b03cbfd960215888201002f7d4a0ee079db1fc29f2faa9f53326d49c1ad00f2c3a507d5047aae8175a3abb50ae0a74ba36fdc7df9e22 SHA512 121cfb711172596d9e4d429a38fb333bbb10e427ad49cf337324dc187a04adcd99e94521cda65ba21b6ac3bfd7837f607e4c0fe38c6ebca3d58bb090128d0a43
+DIST rocclr-5.0.2.tar.gz 853965 BLAKE2B a0d568eb3b230845970d8256a5a2f32018e4b9fb68e0f1aa13a1f3fc953e614025315b90cbe68c107f7150cf91b4b1ea438455429062c7dc06ef77d65dedd2ec SHA512 b30a57c09973d8ef624511f422babaf9722685b9f85643783aebc000671b41fd54f44b308cece0baab187e1ee00b10335c6d22b6bad6fb3468abe6ef0da97d73
 DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
 DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
@@ -15,6 +16,7 @@ DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334
 DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605 SHA512 49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
 DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B 29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07 SHA512 a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d
 DIST rocm-opencl-runtime-4.5.2.tar.gz 998488 BLAKE2B f5b92fca4b8aec8a709fccf6817bb3c6a1074f90a0ca8d38c23efe614672daf597f03e947dffbeca715619595878518e1eb7b8d3e3fd00dd02cdf076135fe626 SHA512 6c26b5517bebb2c3096efaec42bfdcb7485e13551b75397f029fa9b4925fe85201e749b91e3a068705cdf4284895d1d996b2819faf4013e1ed34a10319240452
+DIST rocm-opencl-runtime-5.0.2.tar.gz 1004855 BLAKE2B e2c2beb987053204fbe8fda562ae65d6c1a58447e9e88bf1081aabeee6c9a10738fd8562114b564b647682438fdbd2c535db1008ac6e1cc4eb9a915998eeb3c7 SHA512 fa01d1fafc890181b9e67070353ee7c9100619494b7509cae1a3659f24ef1d00f650024cb24bdb0e6e7eacfdec1115e4683ec6f320228a19f41ae83321780780
 EBUILD rocm-opencl-runtime-3.10.0.ebuild 1959 BLAKE2B 55455b2b6c94f4c48f29b49873ad15fa2409441b184c6b6adf679f7e8656f373705b115d6b5a4c6563c75385d0b418590a2041ab69c6948a42950319e1abd85b SHA512 3c4f68ed353c7eef6f44b6f0f81549c4cdc2fa8d0a652a2d84157b29ae5a5b63583744192384d21af2cd5e93fded4fa0886fdfa0ac57b9af090415080881e00b
 EBUILD rocm-opencl-runtime-3.8.0.ebuild 1958 BLAKE2B d9aa4e4227e5e9d9fc7d590f9c1e03c6a408fd910aa070833e0fc6b9f344c0c3470b3d4be6bf8fcc67d96d286814ec366dab5c758e76ead4b9b5b5f21d77849f SHA512 cb7e217a3a416bdf55ed756bb19d27cbf6b15b49ccc7482f0b611d210368e3d6bbb983cb9a1e684efb3df273297c12e90047d766a2195d67a36095435d9b3507
 EBUILD rocm-opencl-runtime-3.9.0.ebuild 1958 BLAKE2B df047f8b49eabf718ad126e9c14ae9313d51ab1fa4c32895229987e375499500c97549ff7f620b6bbdb1b47abe8e7cc2c2f85bd9622cc5ee2132c03385ae7707 SHA512 ff9e05cd503d218f65b5749d056832e543f74ece0f7585d4e89b43b8a450532864dfb44f09e16cbea9b18083cc0460347a9cbdd3eaeabfa3d1268a5265bb856f
@@ -23,4 +25,5 @@ EBUILD rocm-opencl-runtime-4.1.0.ebuild 1723 BLAKE2B c9d75c187aac9926441f35c3fe8
 EBUILD rocm-opencl-runtime-4.2.0.ebuild 1764 BLAKE2B 05fa06033a0ee255ebda6bc17c9341b7b08a8b3f086c29f3104c07a8d78db105ce8d28c83b21ed259569b4d0c5bd00851e0553d84bc2650bd2c9b0f77aec7461 SHA512 88f7343cc137f039b5b374092a5f81cfb1e1223c36b9da9ee3b471e05fd770d9cde6b7d68f9c4288d421d4aa9350e2fa16b02e976411efc790ab4fa86e6e5dbf
 EBUILD rocm-opencl-runtime-4.3.0.ebuild 1771 BLAKE2B 6f89d392b1fa396abbff5bf4c72c874d759128eebd8ecdf9460750b654447f0f2b0e09f9d7bf1c7a468754e055b533f05f679439c0f1fd10c08f8dfbec1aca29 SHA512 a1132d242d3c5fe6718bb207a4a5430b036e77958267dbfe2485dce7d29ff1714bd7984f92c428b5e47cdf246bed1ced6fea1d01d9c1ff2f0b411dd5851b2bde
 EBUILD rocm-opencl-runtime-4.5.2.ebuild 2098 BLAKE2B 927e8c40f12b2dc9648b54af826e0ffa38f28a47dbbf33f3dc5f6504a1201d3a11abf8620486f7df5984dd7388a1160029be2e0d1c9a4f1bc2663d3fed852b34 SHA512 6bb18a36e3a77d83035306273685e3ab6397b91e2d311276e4f3bf469039e6c0b3ab70a73c29f30318fe2dd959244c449334e138e64ec3327c4b9870d5bafe5c
+EBUILD rocm-opencl-runtime-5.0.2.ebuild 2098 BLAKE2B 927e8c40f12b2dc9648b54af826e0ffa38f28a47dbbf33f3dc5f6504a1201d3a11abf8620486f7df5984dd7388a1160029be2e0d1c9a4f1bc2663d3fed852b34 SHA512 6bb18a36e3a77d83035306273685e3ab6397b91e2d311276e4f3bf469039e6c0b3ab70a73c29f30318fe2dd959244c449334e138e64ec3327c4b9870d5bafe5c
 MISC metadata.xml 381 BLAKE2B fbd9237f4928b42544799482f55fc0e72e872a554bf96c3066ea59213e7d840d432c320f834cc333a09498d6deabb0fc751657ad0e861be7997fba6f1788ffac SHA512 8d05a33637e38b0596a98f5dfee096a91bba41ca16c4eba5f5e93f05f800290c480a0393bf4d5a7ce70cbff0a541b95e52d3c95b02cc7a079343c8f740b8e479
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2.ebuild
new file mode 100644
index 000000000000..a90a016047af
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz
+	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=virtual/opencl-3
+	media-libs/mesa"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/rocm-cmake-${PV}
+	media-libs/glew
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.2-remove-clinfo.patch"
+	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+)
+
+S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+S1="${WORKDIR}/ROCclr-rocm-${PV}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	# Remove "clinfo" - use "dev-util/clinfo" instead
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+	cmake_src_prepare
+
+	hprefixify amdocl/CMakeLists.txt
+
+	local S="${S1}"
+	local CMAKE_USE_DIR="${S1}"
+	# Bug #753377
+	local PATCHES=()
+	BUILD_DIR="${S1}_build" cmake_src_prepare
+}
+
+src_configure() {
+	# configure ROCclr
+	CMAKE_USE_DIR="${S1}"
+	local mycmakeargs=(
+		-Wno-dev
+		-DAMD_OPENCL_PATH="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+	)
+	BUILD_DIR="${S1}_build" cmake_src_configure
+
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	CMAKE_USE_DIR="${S}"
+	local mycmakeargs=(
+		-Wno-dev
+		-DROCCLR_PATH="${S1}"
+		-DAMD_OPENCL_PATH="${S}"
+		-DROCM_PATH="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	local S="${S1}"
+	BUILD_DIR="${S1}_build" cmake_src_compile
+
+	local S="${S}"
+	cmake_src_compile
+}
+
+src_install() {
+	insinto /etc/OpenCL/vendors
+	doins config/amdocl64.icd
+
+	cd "${BUILD_DIR}" || die
+	insinto /usr/lib64
+	doins amdocl/libamdocl64.so
+	doins tools/cltrace/libcltrace.so
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 2b3c13cd785a..d2909d74cd97 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -2,6 +2,7 @@ AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5
 AUX rocr-runtime-4.1.0-cmake-install-paths.patch 4031 BLAKE2B 144df57dc9fa014779d6490217ded97511228d88a7e8864e4eea2870f8b48ec361b4a16ca5e3571ed27a1f91e32d07d694d93c3a2075c60af626c57112ae4e86 SHA512 28f6b3db96df74ede81219005d5d62194f2d41b0628de92202a4293983384390e68c9da1005af86b2b2d2f19f1de6fc2ca4ac1f4dcf9358f66ca519c894f2043
 AUX rocr-runtime-4.3.0_no-sqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca
 AUX rocr-runtime-4.5.2-cmake-install-paths.patch 2683 BLAKE2B 9f4c3e232e81e7544e77c7388c5f555bd564e4806814d40012820023c4293242bdbbcafb788141e437fdfa6a3269d241710d74587492a657cc80fcb8f9cb29e4 SHA512 62165ed65c9d26194bbd4c3a9e1dae6d0ce2b8d61a6d421d5800e2a9a885e94cde648290090cc3654bf8b4a4c5263899c52e556d1d42e08d6d75f4bf00860928
+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
 DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc58a1900aa35bbc0295df0cabba25e5352b3def0dbc1a8ea889ad4876321f99a73c4c6c9ec042186efda9b3308583825 SHA512 d968e96cabc98951890435a2b9bfc9943df9435848f0c6026a59953c78ad4c1048e7c532a8093e5f633fdc5d32622fb88ba0212f32f317d5473fd7e957e4dc4c
 DIST rocr-runtime-3.9.0.tar.gz 691645 BLAKE2B c90cdba93be510532a65ebfd69322972c61603b23932b95982d9a2bea742979b14acd83728a37ecacd7ec540268311bd313801acece89ec02a234dee66155dbe SHA512 e117536300ad05db27ccd92d2f9fadbdb9711fc724953ef65609c7af1ef369b8cf132c8b0f72d33e7ffd43acc3e59dc5525bacaa1507fd01fab79685f6b8d86e
@@ -10,6 +11,7 @@ DIST rocr-runtime-4.1.0.tar.gz 698452 BLAKE2B fb1ca1219d2c59db4d8bff414f40eaf6e7
 DIST rocr-runtime-4.2.0.tar.gz 701445 BLAKE2B 901c256bae823861813a7afdbd3e9f80b6f86cf2c7002815e04c762cef241a9f32274093067c97578e05fdf5c4e699287b7835d00917cb4997302c455e5d593a SHA512 44a798efd0121c7107f3f5df868eb83d0ff9aad1e11c01105d5852bef159c019db6d2aeebe02e8e187dc45a2542d72f145fb5390b27abf64e0b427e192772d6c
 DIST rocr-runtime-4.3.0.tar.gz 709075 BLAKE2B 6856681bd3d56827e517f76838886f793f4d709562c2c7c4f480ef5786c5a5fac25654032b80d565ab5da241f76329d39ab3189daa4806b8cf1564d9f08a837d SHA512 749a8f84a302f7ed518f87688f68cc2a094eea2d104cddc25b3e5d98ddf6e534285750828ca654976054bbf986a61735e17ad211505557671627e44f6831dc0c
 DIST rocr-runtime-4.5.2.tar.gz 717648 BLAKE2B f3acf32943b73b65f1272317bbd8928d1a05e9985ec6242f0480cfdb988052caef198900643fc42288af6acd5fbe2052f063b022219b2ef0d3fb843032de6c92 SHA512 69d7a3f7960ffca339d706a9356e0994851761a135e1b7e7b9b451bcff5782c119b99756432546e7f066f8b60b8717557340cf382f8a9beae6336d23d90ecae4
+DIST rocr-runtime-5.0.2.tar.gz 719840 BLAKE2B 3d0fd6df0a0ab1e180b4a6e61fdf6d796cf71ab7b259057a1942f70dfcbcf8cb5ee6ac563a4baefe3c608139eaf3d8433b5b58e871b45f43cb4d98d1889f6718 SHA512 0590975cab6463a39d78bad933f8e0d30cf23d100b58f5b1968f6d6bc4b88e3c6bca5c46783e321d4bfc9a685837385f90feb8e922523c002c1f4ea0c70bdf72
 EBUILD rocr-runtime-3.10.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
 EBUILD rocr-runtime-3.8.0.ebuild 1494 BLAKE2B 559ea5454433cf167cb1da2369700ace96729b1b4648f729e251b7e8f41368775766f0c2c288e986af26a5eb2655a9c35115497e8bf3e08e247c2237bca9556a SHA512 32986094590e367f61dc70a2be74716c81a95c03ee063f37321b9b579c5adcc72e1ebbdd71d1b23d6dc6e83a617d2d1ba6d0f3c0e65e6247414d8e7a0208cbea
 EBUILD rocr-runtime-3.9.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
@@ -18,5 +20,6 @@ EBUILD rocr-runtime-4.1.0.ebuild 1648 BLAKE2B 6e654ed96e97b9a60e25db92eb8ab80ace
 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.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-5.0.1-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-5.0.1-cmake-install-paths.patch
new file mode 100644
index 000000000000..8715a15d8de1
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-5.0.1-cmake-install-paths.patch
@@ -0,0 +1,42 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src.orig/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -286,35 +286,17 @@ if( NOT ${BUILD_SHARED_LIBS} )
+   install ( TARGETS ${CORE_RUNTIME_NAME} EXPORT ${CORE_RUNTIME_NAME}Targets )
+ endif()
+ 
+-## Create symlinks for legacy packaging and install
+-add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link )
+-if ( ${BUILD_SHARED_LIBS} )
+-    add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
+-    add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} )
+-endif()
+-
+ ## Set install information
+ # Installs binaries and exports the library usage data to ${HSAKMT_TARGET}Targets
+ # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_LIBDIR}
+-install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets
+-  ARCHIVE DESTINATION lib COMPONENT binary
+-  LIBRARY DESTINATION lib COMPONENT binary )
++install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ 
+ # Install license
+ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary )
+ 
+ # Install public headers
+ # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_INCLUDEDIR}
+-install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
+-
+-# Legacy symlink - not packaged (CPack is bugged until ~3.18, see https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4637)
+-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
+-
+-# Legacy symlinks.
+-if ( ${BUILD_SHARED_LIBS} )
+-    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
+-    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary)
+-endif ()
++install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
+ 
+ ## Configure and install package config file
+ # Record our usage data for clients find_package calls.
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.0.2.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.0.2.ebuild
new file mode 100644
index 000000000000..c3e915ee947b
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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}-5.0.1-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+COMMON_DEPEND="dev-libs/elfutils"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}"
+BDEPEND="app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	# ... otherwise system llvm/clang is used ...
+	sed -e "/find_package(Clang REQUIRED HINTS /s:\${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm:${EPREFIX}/usr/lib/llvm/roc:" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:/opt/rocm/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 3fbe8dad0108..adc29e6a2633 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -4,10 +4,12 @@ DIST roct-thunk-interface-4.1.0.tar.gz 2697077 BLAKE2B 6d5d35c57d73c7d23fe28f438
 DIST roct-thunk-interface-4.2.0.tar.gz 3162877 BLAKE2B 48196c2334a5514c17a5b6ca122f0beaf964040f1705bd60532e4379a01d8d6a9b462a7f74916d80841caa9d3a57d5b6e2fb030a9556a1305b879036f9bcec5f SHA512 007cd64e33bada7707f340bffddf6eb9531b0bd5227a5da522c0ff4f0e2efe4a113fc50bf52da19d58fef73008af70a352aad8b41387b327f2ba19b54ede9646
 DIST roct-thunk-interface-4.3.0.tar.gz 3177655 BLAKE2B e3746bb361731484acb5da8c48246fa9ce6cce46919bc771e2670bc4694e09147b51b65274cc58d690e06ce6781aca54d67508625d9ffc1e30f42dbd69adabd5 SHA512 c0515784696464feef906d6ef4446c9bddb77b5abe62e982a7d75331a8b7fb84e94f12ebeaf2e128be28ab8f903bf6894cbf2302aa5ddee23eaf9b2cc807c872
 DIST roct-thunk-interface-4.5.2.tar.gz 3178434 BLAKE2B 3333b3416d1f7f26401a543ff5ef1b728a6efc38c5c9306d98cb03f034f8b0e10f961f9863192c23a6b7a70ff543e2d8abb60169a4a9a0c5992f2483e6f69db2 SHA512 6f51956df14532a3428f56a80479357c703c26589c68b054a340d751e34435211500c441fc90d7edbbb7c6c327a8ba71afafc8355c8c0e7a1cd45a9c9d0d99e6
+DIST roct-thunk-interface-5.0.2.tar.gz 3178727 BLAKE2B 9b8926ec18340a686f0499070dd4846fb9ba3eae2fed2d02615fbbee977c3417cb5815b54a19aed7623484e175702cb757e8f3ac30b8b9f04ce4cf0ce81b2cc5 SHA512 c78a4d22d6e09decfec8c710707bc89ca30d3deba9ee3123af83d530f1bf58cb3681206a8c2ad8a523ff45621b87701020cfce23bba4fd87b81791ee8f04619e
 EBUILD roct-thunk-interface-4.0.0.ebuild 982 BLAKE2B c48fd4af78d9d0ba922049ded53f1e768e4e9781b85780575e33c316af2e82762869d5e1e184bf4cc92d2d08168bc1b3992e76482a15a82790c5822289a49679 SHA512 1c4bbf21b2cbfc453f4a9859c227a15eb92f31e580625f1fbdb19de2c7bde809aff347983464c8ab25cbf4b0efda8ac7bc64f52cac66bc183d3f3b893f3f8183
 EBUILD roct-thunk-interface-4.1.0.ebuild 1056 BLAKE2B 4e20e7086cb909f309899ba94ec5e58d9bd439d954a7f44301ccc36515dee99fdecb2b7e59afeeaf397a0923a9e3e5205b0684c85dd27cca98874e55af32db53 SHA512 1159c9431f4b16098642d32b4ec9d48002088c30bb070e8173528c66a188b443936803b0494dd22f63d078b20348d4ba466a98a145421d932451649bf6e61b73
 EBUILD roct-thunk-interface-4.2.0.ebuild 1056 BLAKE2B 4e20e7086cb909f309899ba94ec5e58d9bd439d954a7f44301ccc36515dee99fdecb2b7e59afeeaf397a0923a9e3e5205b0684c85dd27cca98874e55af32db53 SHA512 1159c9431f4b16098642d32b4ec9d48002088c30bb070e8173528c66a188b443936803b0494dd22f63d078b20348d4ba466a98a145421d932451649bf6e61b73
 EBUILD roct-thunk-interface-4.3.0.ebuild 982 BLAKE2B c48fd4af78d9d0ba922049ded53f1e768e4e9781b85780575e33c316af2e82762869d5e1e184bf4cc92d2d08168bc1b3992e76482a15a82790c5822289a49679 SHA512 1c4bbf21b2cbfc453f4a9859c227a15eb92f31e580625f1fbdb19de2c7bde809aff347983464c8ab25cbf4b0efda8ac7bc64f52cac66bc183d3f3b893f3f8183
 EBUILD roct-thunk-interface-4.5.2.ebuild 1107 BLAKE2B 2d5bc5e7e2cd317cb93ef743e4eaf3c99f4ee969879e0025f2b9525ac39ec57f259348bdf680f819f57948cec57e7fd66b46da5aa37c913509092f711dafc18e SHA512 c1b19d3a7763df634626e64ba1223a1da0e93a4bfb3ac9015cf934ef68c27724c28cba535dd155b74fbd84ba15127896eedb15a94d9cde42a414a15bc670cbf3
+EBUILD roct-thunk-interface-5.0.2.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f
 EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 MISC metadata.xml 674 BLAKE2B ceb6cc04ddd9f957a765c89bfe83de382412c5d04bce87e3fa9c0fdfe72fa2d24e597aa47287488463fa34d85a91556d2b7ea073b19c341a48045c9e7f51f9f3 SHA512 8cb0feb4d6ea9d3de4a45a9be0de498b5ebb36a779af03e58f5c04593082e5bd618614c1daf2707f3bb1de019bf88292605669e2be48d9bede6e708c39aae7e2
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-5.0.2.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.0.2.ebuild
new file mode 100644
index 000000000000..d0cf376f0b8d
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}"
+BDEPEND="x11-libs/libdrm[video_cards_amdgpu]"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	sed -e "s:ubuntu:gentoo:" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/shhopt/Manifest b/dev-libs/shhopt/Manifest
index 8729e046b21c..a7480e27360e 100644
--- a/dev-libs/shhopt/Manifest
+++ b/dev-libs/shhopt/Manifest
@@ -1,4 +1,4 @@
 AUX shhopt-1.1.7-build.patch 1751 BLAKE2B bb3fd0376bdf0da0c1a26b1472f9edd7dc21b628bc89577a3bb56fbabb3555667df70837cf47ce4361d369112972912c4388b55a4b28ae35100c82da3015bc60 SHA512 ba11cfd9ae4d75d676b15e2ab7a1d017f59193908e4e0b51ca2d5b2dc8fcdbce9e839d6835d5a05761464c7177ae20be5c3ef059e4d2a52f100f0b949811e089
 DIST shhopt-1.1.7.tar.gz 9923 BLAKE2B 4f9fb23a67c03caf6c56227729a681eac3ee9c78e16f56d6fedd2b1cdbe56471150d9e91ecf84945348078d03102aa7e7cc98b4cf11dda6f5da79d1edc48b96d SHA512 bd985d50e87808b5c6993496ba3e7c255d47895d90e108f03fd72bb273e786730898048af3b30ca29cb5dbd058f2ea178ca73b6362211c50aa0eb75f743b5ec8
-EBUILD shhopt-1.1.7-r3.ebuild 641 BLAKE2B 4109e69faae2724e469d002de54d35270dfd3fd4f3cd6f79b640847d3b18d47ed80c5fc7aa97700865f8cc1e9f2b7e2401be4ec04fd64eb74b413430b29935a2 SHA512 6c8f5fe4f91dc898fbd576a81f6dc1177eb178ea57c58c1cb2bfb2a60ea7da27ff0abc2db8366b0ab695fedd83dcdca66287c413250cc189b198e53bab3e3df8
+EBUILD shhopt-1.1.7-r3.ebuild 643 BLAKE2B 192a184c0fcbee906a0f3782296e7a9a945743b6934ada717447b64f18cf7ed8099bb7c99265c0b114f3de46b97de048607d7f14fa469bafdd12349e3e15f516 SHA512 5abc3df177b7f6f45bd65190f5c717de03c6a73f812e58fa932b609ae89fd1a55246586ff83d62f61e22d3a3659202625ca5a15b9592a3ef8c7f30d9352cc098
 MISC metadata.xml 342 BLAKE2B 0a3b9df31b9dde45947b33748499a7e4555f42ecb6ff9e8f6617c6e625d9d800f2dba05a89ce68a38b5c0d84428db5475d3868c08569ac73e7a3b8727b4b3b8c SHA512 ca78689f45bdd030c7e77ee83016090987e8707d94c636a05789451b87b2989bb65b7c4ffdf1a4c2f5a54ba260d547cebe7c10659283b6692fee7892f08288b6
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
index 3710e4d865d3..c1fd89d7f6c8 100644
--- a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
+++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ppc x86"
 PATCHES=( "${FILESDIR}"/${P}-build.patch )
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index afffec3f9c04..3bba4fd55eed 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -4,6 +4,6 @@ DIST snowball-data-0703f1d6a21802c3ff00c2c8b31bd255b74b2aec.tar.gz 33063873 BLAK
 DIST snowball-data-887fb7a3e006f32b4979e0d55f2543abe78a42f1.tar.gz 33063750 BLAKE2B bffc7e9f8fadbaecf9a7d1a2b8ee7a9db0b1dc1d5a6304a9c8d60b6c24a0947307b8780a99d2349b19e5fbcdfe819cc400ffb0b8b1df9748bb401ae1dec7b9aa SHA512 b68567d3e59aaa870251f682988b52a89d82767e954adea6b7f6247a6d432c29c8373c95a5e49df07110d4cb396aafa64ee6c71af2c0680d383ffe22491e50dd
 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 1351 BLAKE2B 0eab0403b348ef10c66fefe17c9a20a738ac48c3ed096f0a58698e919d612ad8d68fdbd335ca4bb5c43463c471f225a52d8a272dfb3e06e6adbd9eba34584a2d SHA512 3210b5906a61fbbe4f889f650463a116928d92ca776ef2b1f73684bb4cd974dc4e5cea428b5d5e6950cee0a424502736ebc1e73285498b60a78329c579856981
+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
 MISC metadata.xml 216 BLAKE2B 8ee3fc474431bb5216c1bf008cae233e6710753065ef303f86c694489d511571a7de860e785a1bbbbb4a1fb709ac3800e13677c75c9d312447ceffcc834d3b7b SHA512 f058726d4f2f98447c6df082db3b9f966ec23819805b9a6d340aa6fc7f96e0150058b55c1478b5e41dc3fed90753a188e3c6c362db1e551feb941efef3f63897
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
index 9fb67bee6b17..e2953adabd51 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-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=8
@@ -30,8 +30,8 @@ PATCHES=(
 )
 
 src_compile() {
-	export CC=$(tc-getCC)
-	export AR=$(tc-getAR)
+	export CC="$(tc-getCC)"
+	export AR="$(tc-getAR)"
 	default
 }
 
diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest
index df00aaef3181..8921d4d9acca 100644
--- a/dev-libs/template-glib/Manifest
+++ b/dev-libs/template-glib/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 645 BLAKE2B 805c0245f153163919a831b3921757814594cbfc70e47c6216ebf1f977180ce190e9ff3a0f78661c52f02fd33d7800aa3a5b96a5d281b3ece28a217086259045 SHA512 79eb403fc2f7b952885bfff1d94f0ff265a124e58bc00bdda1e533caf6c9eb1b3f3bf143d9f35ed7f9f1094d7f65fbcef60b516ae7581d6ca4ba4307ba4eab13
diff --git a/dev-libs/template-glib/template-glib-3.34.1.ebuild b/dev-libs/template-glib/template-glib-3.34.1.ebuild
new file mode 100644
index 000000000000..830385f79f8a
--- /dev/null
+++ b/dev-libs/template-glib/template-glib-3.34.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson 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() {
+	default
+	use vala && vala_setup
+}
+
+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/tre/Manifest b/dev-libs/tre/Manifest
index c09ed5e1efa2..8398833e9118 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,5 +1,14 @@
-AUX 0.8.0-CVE-2016-8559.patch 2658 BLAKE2B 12a7d12d35e2d61457fbb9e368cfa738bad74ac490ce4ffa59d1494d879d9db481b89b0e3ef3a2a4601b8280ff8f1c54f4ccdc00716a904bff291923c4aaa02c SHA512 9f45299ccd21cc4e78946ad22963d4505e9cd430f49f275fbb742696029530e7e6eb848b0ae4bf55bb5e2a2ee77d3cf272b02e2a6a2ba7c3bd69f68816e300b2
-AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
+AUX 0.8.0-CVE-2016-8559.patch 2445 BLAKE2B 1bde61db5aa46213c6d5dbaf6b97ba91fe50eb9c4c315be08b2964c2c3e5a85c2dd8933e1b69fd48294b6dcf5af3be7e386e55717e34c3ada9d30eea4675e112 SHA512 bae516a86ef0290a79eca283e4e6cc831255d1653b65f13714530811d358d0775b17711c54b1efab0c9d60829926123c70309aed30767eb7ac2a00ace1411766
+AUX 0.8.0-pkgcfg.patch 355 BLAKE2B 14b3ddb93249d827f64d1facd5d7f83d6d4b74d067b66bce405501a3195d230439dbc5036233c2242442e3fa56a771981be9c6e6cb8d668e5f0c293d4dcae1e4 SHA512 5c3df45b4c37d8923ed93ccd24e204fa42da7ac29fdcead81fffdd153d19fd71759ce4922cb55c09a34b21adbdf3d079339c15acc17b1c7d8e924db5b22a9e65
+AUX tre-chicken.patch 666 BLAKE2B 8f8f56a7a7cacb9bb0d43b993d51e6d936ffa09bbe866fee7e89299e6c6a3767147b8f340179c0f543da1b6d2554a6187b1a92ddf3bdc2b3d53abdbfb1d251de SHA512 6923a5ed08a2a9e08bc5e46028d2187deb5a62a756598125410a3c4704485b7bcbed2ad90002917474515065f2701f885c6ff462ebbf426135cced74343dfa74
+AUX tre-issue37.patch 311 BLAKE2B 315577adae015abf2719509e84554bd3631f777d94dabba0ca9070429e2be5785edc3a3e6a7612dd6fc792a6b03c6c3871954e39363d8f9e91dbe34f5f2bb576 SHA512 41f270e197d254da2ee742722a60324020ea98b3fd6498b6244aebe310587293b4eff7d80a793861f616a772e3bc1058b2f3bee487066e0bc712fdb34aad0720
+AUX tre-issue50.patch 419 BLAKE2B ffcbe398ed330a047ca3c9c011096261352885600a4e40399221681966d26f559df5242d5f6dac0076587680c71f54f4aa1a8d51abdb65071e917ccb8489f055 SHA512 dbadcc67b00992a0039ef927f3a756cd0425c082c926bd3e60cc9d137751508eca656ab8779bb05b27f0b0b891ea283208210e6a44dc7b06189d47491749c684
+AUX tre-issue55-part1.patch 685 BLAKE2B 45582ffee5ca731365c1cbeb41ccc3ce9dd58bbdb732a45896a986d308d94ba46db5bc119f902505a42e0fb16193cabe3f4c12fc0669472b0709123e5b7f24bf SHA512 e79c1a9f97eb2ef2f30d46238e30b1cdd8bf56259467b02dd47b89e88af6547e812107d32d15a5960e181982b16515ce3b8998de1033cf37de24a7ab3bee76ed
+AUX tre-issue55-part2.patch 335 BLAKE2B e4c67973f6565e918c17d733bd8d8a1c5e6e67ce0d5b8ce1781a8ef7aa8087249d8bb68d1e5df52703f91a37864b7201cff9551786810b4cb20b6f5f9f0d95e5 SHA512 76032f37f8750fa90ebcc81341b9141390080e3e3ce2627177676fe4a56dfe879bf3edf1a08991dcc5533b3a622da26115a138fc27efb45d980b08217b57eb21
+AUX tre-python3.patch 5186 BLAKE2B c9e08efa47fb8ad00385703c9c7cc9d240eaccacf472c47991426702d4c971857c7c6fd1cac47135153616e4358ccbe1fcd05c04973c3c9164639634926b9c8c SHA512 0fb84b2051b2082f3271e4d47d0bc666ba9e6deb8ea2dfe0201ef4f0708b94b6706726740bfbfcf1ae708f348c63850c1b175ed1f93200934817337a5d23f1d2
+AUX tre-tests.patch 235 BLAKE2B 11c601f9b352dee9e2d36e60c537a4c2969beefd04bdab21c1e00886611d243a6c818b4a8cb484b8a414d3ec07de3e3ce32fde4aaa096bcda307b66225e8179b SHA512 69373229743ad805d4bfbf41def35de930424baaf66c36f35b3cba04860c2de15051ff640d486ec75e85aa20a28863e7937c6876ec443418ba1391e9dbbf4047
 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
-MISC metadata.xml 354 BLAKE2B ebe62e551444e71cca88ebbdf04e1ad583c7b2ec5cc588e4f949f2f2f1ce60f666bf84cc5a45e08e2e7b83c6ea61e86f6de7b43ca84f7d93a338d72ef60b63ed SHA512 cb14e81dd473b72e816159e690939c1894cf5cca1fa37072e05b8ec24f0894e0a4d30e8397f5ee81372d53a8ffc3fcbce67a8923d4b220cb9e1dd5f3f3a970d0
+EBUILD tre-0.8.0_p20210321.ebuild 2424 BLAKE2B 64696db1ff19928e3f496bf8b2971eb059a0bfa23fd6ada59ff35b96cb94a29b3559607416c6871d8b2d5bebebdb4a76950869560fc8c32530c96ca30a7c87c6 SHA512 3a5d919d0ad4a7be44c364e5aad0c42b6dd5f90eda1da3931322ff9dac5defbfbaeecaf75009a026fe6998f8806f6b5d8dd59597fedd4e433f3af4b8dd61475a
+MISC metadata.xml 638 BLAKE2B 4e02f7673a19acc091ee21459551e6d40f6a78d5a25cbbffe877d46f0a181067e2163d1ac79d0f7d38ff383b8775abf6f69309ad97b25fd2af55b0ac2223ab40 SHA512 9f725eebbee4753cb05b0adcda1edec2aa50265257db359ca0ec4596761072ec335fffb5a5035cf5ec43c13b8c8a7dd7ed916bbf82acd57c6d8ee5e4c89cb622
diff --git a/dev-libs/tre/files/0.8.0-CVE-2016-8559.patch b/dev-libs/tre/files/0.8.0-CVE-2016-8559.patch
index 39ceae016446..923dbfbf3a2a 100644
--- a/dev-libs/tre/files/0.8.0-CVE-2016-8559.patch
+++ b/dev-libs/tre/files/0.8.0-CVE-2016-8559.patch
@@ -12,13 +12,6 @@ type, size_t, rather than int.
 
 also improve comments, use calloc in place of malloc+memset, and
 remove bogus casts.
----
- src/regex/regexec.c | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
-
-Note: patch was modified to apply to tre, parts were taken from
-https://github.com/laurikari/tre/issues/37
-
 --- a/lib/tre-match-parallel.c
 +++ b/lib/tre-match-parallel.c
 @@ -59,6 +59,7 @@
diff --git a/dev-libs/tre/files/0.8.0-pkgcfg.patch b/dev-libs/tre/files/0.8.0-pkgcfg.patch
index 82f803504282..7952619c9616 100644
--- a/dev-libs/tre/files/0.8.0-pkgcfg.patch
+++ b/dev-libs/tre/files/0.8.0-pkgcfg.patch
@@ -1,8 +1,6 @@
  tre.pc.in |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/tre.pc.in b/tre.pc.in
-index fdc45fa..b8d0676 100644
 --- a/tre.pc.in
 +++ b/tre.pc.in
 @@ -6,5 +6,5 @@ includedir=@includedir@
diff --git a/dev-libs/tre/files/tre-chicken.patch b/dev-libs/tre/files/tre-chicken.patch
new file mode 100644
index 000000000000..6047f9ae80d3
--- /dev/null
+++ b/dev-libs/tre/files/tre-chicken.patch
@@ -0,0 +1,20 @@
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -10,7 +10,8 @@ import shutil
+ 
+ version = "0.8.0"
+ data_files = []
+-include_dirs = ["../lib"]
++include_dirs = ["../include"]
++library_dirs = ["../lib/.libs"]
+ libraries = ["tre"]
+ 
+ if sys.platform == "win32":
+@@ -31,6 +32,7 @@ setup(name = "tre",
+                                sources = ["tre-python.c"],
+                                define_macros = [("HAVE_CONFIG_H", None)],
+                                include_dirs = include_dirs,
++                               library_dirs = library_dirs,
+                                libraries = libraries
+                                ),
+                      ],
diff --git a/dev-libs/tre/files/tre-issue37.patch b/dev-libs/tre/files/tre-issue37.patch
new file mode 100644
index 000000000000..43b0cded7d26
--- /dev/null
+++ b/dev-libs/tre/files/tre-issue37.patch
@@ -0,0 +1,11 @@
+--- a/lib/tre-parse.c
++++ b/lib/tre-parse.c
+@@ -1480,6 +1480,8 @@ tre_parse(tre_parse_ctx_t *ctx)
+ 		      ctx->re++;
+ 		      while (ctx->re_end - ctx->re >= 0)
+ 			{
++			  if (i == sizeof(tmp))
++			    return REG_EBRACE;
+ 			  if (ctx->re[0] == CHAR_RBRACE)
+ 			    break;
+ 			  if (tre_isxdigit(ctx->re[0]))
diff --git a/dev-libs/tre/files/tre-issue50.patch b/dev-libs/tre/files/tre-issue50.patch
new file mode 100644
index 000000000000..f233953ce28f
--- /dev/null
+++ b/dev-libs/tre/files/tre-issue50.patch
@@ -0,0 +1,11 @@
+--- a/lib/tre-parse.c
++++ b/lib/tre-parse.c
+@@ -1341,7 +1341,7 @@ tre_parse(tre_parse_ctx_t *ctx)
+ 
+ 	    case CHAR_RPAREN:  /* end of current subexpression */
+ 	      if ((ctx->cflags & REG_EXTENDED && depth > 0)
+-		  || (ctx->re > ctx->re_start
++		  || (!(ctx->cflags & REG_EXTENDED) && ctx->re > ctx->re_start
+ 		      && *(ctx->re - 1) == CHAR_BACKSLASH))
+ 		{
+ 		  DPRINT(("tre_parse:	    empty: '%.*" STRF "'\n",
diff --git a/dev-libs/tre/files/tre-issue55-part1.patch b/dev-libs/tre/files/tre-issue55-part1.patch
new file mode 100644
index 000000000000..8e12cf683030
--- /dev/null
+++ b/dev-libs/tre/files/tre-issue55-part1.patch
@@ -0,0 +1,28 @@
+--- a/lib/tre-parse.c
++++ b/lib/tre-parse.c
+@@ -582,16 +582,23 @@
+ tre_parse_int(const tre_char_t **regex, const tre_char_t *regex_end)
+ {
+   int num = -1;
++  int overflow = 0;
+   const tre_char_t *r = *regex;
+   while (r < regex_end && *r >= L'0' && *r <= L'9')
+     {
+       if (num < 0)
+ 	num = 0;
+-      num = num * 10 + *r - L'0';
++      if (num <= (INT_MAX - 9) / 10) {
++        num = num * 10 + *r - L'0';
++      } else {
++        /* This digit could cause an integer overflow. We do not return
++         * directly; instead, consume all remaining digits. */
++        overflow = 1;
++      }
+       r++;
+     }
+   *regex = r;
+-  return num;
++  return overflow ? -1 : num;
+ }
+ 
+ 
diff --git a/dev-libs/tre/files/tre-issue55-part2.patch b/dev-libs/tre/files/tre-issue55-part2.patch
new file mode 100644
index 000000000000..b28a7a5f4901
--- /dev/null
+++ b/dev-libs/tre/files/tre-issue55-part2.patch
@@ -0,0 +1,11 @@
+--- a/lib/tre-parse.c
++++ b/lib/tre-parse.c
+@@ -641,7 +641,7 @@ tre_parse_bound(tre_parse_ctx_t *ctx, tre_ast_node_t **result)
+     }
+ 
+   /* Check that the repeat counts are sane. */
+-  if ((max >= 0 && min > max) || max > RE_DUP_MAX)
++  if ((max >= 0 && min > max) || max > RE_DUP_MAX || min > RE_DUP_MAX)
+     return REG_BADBR;
+ 
+ 
diff --git a/dev-libs/tre/files/tre-python3.patch b/dev-libs/tre/files/tre-python3.patch
new file mode 100644
index 000000000000..b3068519e1dd
--- /dev/null
+++ b/dev-libs/tre/files/tre-python3.patch
@@ -0,0 +1,191 @@
+--- a/python/example.py
++++ b/python/example.py
+@@ -1,7 +1,7 @@
+ import tre
+ 
+ fz = tre.Fuzzyness(maxerr = 3)
+-print fz
++print (fz)
+ 
+ pt = tre.compile("Don(ald( Ervin)?)? Knuth", tre.EXTENDED)
+ data = """
+@@ -16,5 +16,5 @@ typefaces.
+ m = pt.search(data, fz)
+ 
+ if m:
+-    print m.groups()
+-    print m[0]
++    print (m.groups())
++    print (m[0])
+--- a/python/tre-python.c
++++ b/python/tre-python.c
+@@ -86,9 +86,9 @@ TreFuzzyness_repr(PyObject *obj)
+   TreFuzzynessObject *self = (TreFuzzynessObject*)obj;
+   PyObject *o;
+ 
+-  o = PyString_FromFormat("%s(delcost=%d,inscost=%d,maxcost=%d,subcost=%d,"
++  o = PyUnicode_FromFormat("%s(delcost=%d,inscost=%d,maxcost=%d,subcost=%d,"
+ 			  "maxdel=%d,maxerr=%d,maxins=%d,maxsub=%d)",
+-			  self->ob_type->tp_name, self->ap.cost_del,
++			  Py_TYPE(self)->tp_name, self->ap.cost_del,
+ 			  self->ap.cost_ins, self->ap.max_cost,
+ 			  self->ap.cost_subst, self->ap.max_del,
+ 			  self->ap.max_err, self->ap.max_ins,
+@@ -118,8 +118,7 @@ static PyMemberDef TreFuzzyness_members[
+ };
+ 
+ static PyTypeObject TreFuzzynessType = {
+-  PyObject_HEAD_INIT(NULL)
+-  0,			        /* ob_size */
++  PyVarObject_HEAD_INIT(NULL, 0)
+   TRE_MODULE ".Fuzzyness",	/* tp_name */
+   sizeof(TreFuzzynessObject),	/* tp_basicsize */
+   0,			        /* tp_itemsize */
+@@ -193,7 +192,7 @@ PyTreMatch_groups(TreMatchObject *self,
+ }
+ 
+ static PyObject *
+-PyTreMatch_groupi(PyObject *obj, int gn)
++PyTreMatch_groupi(PyObject *obj, Py_ssize_t gn)
+ {
+   TreMatchObject *self = (TreMatchObject*)obj;
+   PyObject *result;
+@@ -220,7 +219,7 @@ PyTreMatch_group(TreMatchObject *self, P
+   PyObject *result;
+   long gn;
+ 
+-  gn = PyInt_AsLong(grpno);
++  gn = PyLong_AsLong(grpno);
+ 
+   if (PyErr_Occurred())
+     return NULL;
+@@ -277,8 +276,7 @@ static PySequenceMethods TreMatch_as_seq
+ };
+ 
+ static PyTypeObject TreMatchType = {
+-  PyObject_HEAD_INIT(NULL)
+-  0,			        /* ob_size */
++  PyVarObject_HEAD_INIT(NULL, 0)
+   TRE_MODULE ".Match",		/* tp_name */
+   sizeof(TreMatchObject),	/* tp_basicsize */
+   0,			        /* tp_itemsize */
+@@ -380,8 +378,8 @@ PyTrePattern_search(TrePatternObject *se
+     }
+   else
+     {
+-      targ = PyString_AsString(pstring);
+-      tlen = PyString_Size(pstring);
++      targ = PyBytes_AsString(pstring);
++      tlen = PyBytes_Size(pstring);
+ 
+       rc = tre_reganexec(&self->rgx, targ, tlen, &mo->am, fz->ap, eflags);
+     }
+@@ -433,8 +431,7 @@ PyTrePattern_dealloc(TrePatternObject *s
+ }
+ 
+ static PyTypeObject TrePatternType = {
+-  PyObject_HEAD_INIT(NULL)
+-  0,			        /* ob_size */
++  PyVarObject_HEAD_INIT(NULL, 0)
+   TRE_MODULE ".Pattern",	/* tp_name */
+   sizeof(TrePatternObject),	/* tp_basicsize */
+   0,			        /* tp_itemsize */
+@@ -467,7 +464,7 @@ static PyTypeObject TrePatternType = {
+ };
+ 
+ static TrePatternObject *
+-newTrePatternObject()
++newTrePatternObject(void)
+ {
+   TrePatternObject *self;
+ 
+@@ -482,7 +479,7 @@ static PyObject *
+ PyTre_ncompile(PyObject *self, PyObject *args)
+ {
+   TrePatternObject *rv;
+-  PyUnicodeObject *upattern = NULL;
++  PyObject *upattern = NULL;
+   char *pattern = NULL;
+   int pattlen;
+   int cflags = 0;
+@@ -537,9 +534,8 @@ static PyMethodDef tre_methods[] = {
+   { NULL, NULL }
+ };
+ 
+-static char *tre_doc =
+-"Python module for TRE library\n\nModule exports "
+-"the only function: compile";
++
++#define tre_doc "Python module for TRE library\n\nModule exports the only function: compile"
+ 
+ static struct _tre_flags {
+   char *name;
+@@ -556,40 +552,57 @@ static struct _tre_flags {
+   { NULL, 0 }
+ };
+ 
++
++static struct PyModuleDef moduledef = {
++  PyModuleDef_HEAD_INIT,
++  TRE_MODULE ".Module",   /* m_name */
++  tre_doc,             /* m_doc */
++  -1,                  /* m_size */
++  tre_methods,         /* m_methods */
++  NULL,                /* m_reload */
++  NULL,                /* m_traverse */
++  NULL,                /* m_clear */
++  NULL,                /* m_free */
++};
++
++
+ PyMODINIT_FUNC
+-inittre(void)
++PyInit_tre(void)
+ {
+   PyObject *m;
+   struct _tre_flags *fp;
+ 
+   if (PyType_Ready(&TreFuzzynessType) < 0)
+-    return;
++    return NULL;
+   if (PyType_Ready(&TreMatchType) < 0)
+-    return;
++    return NULL;
+   if (PyType_Ready(&TrePatternType) < 0)
+-    return;
++    return NULL;
+ 
+   /* Create the module and add the functions */
+-  m = Py_InitModule3(TRE_MODULE, tre_methods, tre_doc);
++
++  m = PyModule_Create (&moduledef);
++
+   if (m == NULL)
+-    return;
++    return NULL;
+ 
+   Py_INCREF(&TreFuzzynessType);
+   if (PyModule_AddObject(m, "Fuzzyness", (PyObject*)&TreFuzzynessType) < 0)
+-    return;
++    return NULL;
+   Py_INCREF(&TreMatchType);
+   if (PyModule_AddObject(m, "Match", (PyObject*)&TreMatchType) < 0)
+-    return;
++    return NULL;
+   Py_INCREF(&TrePatternType);
+   if (PyModule_AddObject(m, "Pattern", (PyObject*)&TrePatternType) < 0)
+-    return;
++    return NULL;
+   ErrorObject = PyErr_NewException(TRE_MODULE ".Error", NULL, NULL);
+   Py_INCREF(ErrorObject);
+   if (PyModule_AddObject(m, "Error", ErrorObject) < 0)
+-    return;
++    return NULL;
+ 
+   /* Insert the flags */
+   for (fp = tre_flags; fp->name != NULL; fp++)
+     if (PyModule_AddIntConstant(m, fp->name, fp->val) < 0)
+-      return;
++      return NULL;
++  return m;
+ }
diff --git a/dev-libs/tre/files/tre-tests.patch b/dev-libs/tre/files/tre-tests.patch
new file mode 100644
index 000000000000..c39ff9fb268d
--- /dev/null
+++ b/dev-libs/tre/files/tre-tests.patch
@@ -0,0 +1,10 @@
+--- tre-0.7.6/tests/agrep/run-tests.sh.tests
++++ tre-0.7.6/tests/agrep/run-tests.sh
+@@ -2,6 +2,7 @@
+ 
+ set -e
+ 
++export LD_LIBRARY_PATH=$top_builddir/lib/.libs
+ agrep="$top_builddir/src/agrep"
+ 
+ echo "$builddir $top_builddir $srcdir"
diff --git a/dev-libs/tre/metadata.xml b/dev-libs/tre/metadata.xml
index 4d02215649f9..f77edd54bfa6 100644
--- a/dev-libs/tre/metadata.xml
+++ b/dev-libs/tre/metadata.xml
@@ -8,4 +8,9 @@
   <upstream>
     <remote-id type="github">laurikari/tre</remote-id>
   </upstream>
+  <use>
+    <flag name="agrep">Build agrep tool</flag>
+    <flag name="alloca">Enable if you want TRE to use alloca() instead of malloc() when allocating memory needed for regexec operations</flag>
+    <flag name="approx">Enable the approximate matching functionality</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-libs/tre/tre-0.8.0_p20210321.ebuild b/dev-libs/tre/tre-0.8.0_p20210321.ebuild
new file mode 100644
index 000000000000..15ab1ee38acf
--- /dev/null
+++ b/dev-libs/tre/tre-0.8.0_p20210321.ebuild
@@ -0,0 +1,112 @@
+# 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
+		python_foreach_impl distutils-r1_python_compile
+		popd || die
+	fi
+}
+
+src_install() {
+	local HTML_DOCS=( doc/*.{css,html} )
+
+	default
+	use python && python_foreach_impl python_install
+}
+
+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."
+}
+
+python_install() {
+	pushd "python" || die
+	distutils-r1_python_install
+	popd || die
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index eae52e3eaf55..e46b5a9407aa 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,7 @@
 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
 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
 MISC metadata.xml 326 BLAKE2B cd8c49993b750ebef93c620f819f42b858431d1aab4d2066a124a5118d5d18f4970b9d1eccb77121089264db7cfbe69ca06fb2fc2d2c4db98047629af9878db5 SHA512 52854d43fb74af5402cb1855409ab25d6741ea6fe48ae50416044d7b518745b02752e69cb9680e9c132e3a2f65ae29d92e9e771ac883e2ef01ae91effdf1097f
diff --git a/dev-libs/vala-common/vala-common-0.56.0.ebuild b/dev-libs/vala-common/vala-common-0.56.0.ebuild
new file mode 100644
index 000000000000..40415607535f
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.56.0.ebuild
@@ -0,0 +1,29 @@
+# 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
+}