gentoo resync : 20.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-20 10:22:14 +0100
commit: 46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree: db33a91259730be84999e13a8d8168c799f50ac0 /dev-libs
parent: e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)
108 files changed, 1232 insertions, 975 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 28fd96106d41..47d77e1829fa 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index 3eee5752ad30..f538311ef99b 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,5 +1,5 @@
-DIST angelscript_2.34.0.zip 2020026 BLAKE2B f002c67d812cc6453d1e93ffba4aaa4c300926996b74f8d596642625e251ccd14b97473f8f0ff595e3233a3ebc7654c94420ae761eaa0b67439e18472f8df977 SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4
 DIST angelscript_2.35.0.zip 1971850 BLAKE2B 2253583f46181b420514e3f5a4609a33a019e47ac4ef183d1ddbca52610ce421da28a0e67f16f04b873bd18d9c56673bfac5aba152e6fadff84f8fe4718308a4 SHA512 e54b58e78b21c2ff6aa34d5f55b18fcf8737d057c86aef8901ac0c11f14739fe7f1494f9bcfdbca6a8e54b6d0b36a04dd098780bcd02dea5764fd6d22984b6b0
-EBUILD angelscript-2.34.0.ebuild 986 BLAKE2B a3d46781774031df2820e0c5f3755cbf835157866ac2d1ab65a0138e507f1f54cf58573f14c302db07266baa0e977c5047bbde6fc33f5f20625cd045a7b607d7 SHA512 0b22fa066cb4eebd20e1fe093d8365f8fb839c6f138b3841c14b7badb11ba77c3823b407518c8c5e9720ca5e2b943a9cee4f2bee3e261cb4260a94dc7735cbbe
+DIST angelscript_2.35.1.zip 2033435 BLAKE2B b88189fb78294e5804adf313bc333a9a21760120a42b3df78c9c54861718acf435de55dcfb26a8975407102c1182093caed11bfecc6ba946bc7614f62f7e176a SHA512 b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa
 EBUILD angelscript-2.35.0.ebuild 993 BLAKE2B d3a12ba2531ce84532b7dcb61a4921fd3caa17820c032c0a79803d4c7bcfad4202c1a3b0c95f1453ebbc0b239c8e7935703d23e181c7dc1cad9420eb2e87e3fe SHA512 148a185791b7d9cf4e51781da3911a9080cf70495b4e1198700791149c4885ce5752775394fc807230b892fb153aced0a8e31bfba90d7cc6cefa76dea70d342f
+EBUILD angelscript-2.35.1.ebuild 993 BLAKE2B 63f4afc6e695bc594eb9ba8352dedd13ae43fc473ed5a34516b288a7565fb7416f599bc8a3b0603d2f8290504c44cc7bc86150bb25ff1bea3b441c433b765e2c SHA512 0a5bbef25caef9d930c67260d065a8fb735f2819e443b4d07eca72af06e5d8a3207b9f353aa7b8a07411ff9329bd88c46b401b03e920baf2be4528037d2e5a85
 MISC metadata.xml 407 BLAKE2B 5d10a87729e294d0df6a7afd624cd4012116e773736aae89ee56763eee0002feca2206d62b22feaa835383c1b0d197966a5e19f48851281b06df0c7cf9c0a4a8 SHA512 883e575349da504d73f1aad6b8e03fe12a1a0c05a33c63cf592bc1919fe926a4f5fcc80fc68deeb026adc143ebee0b96bbff2f32d0d5fa49554a0af28ee69b19
diff --git a/dev-libs/angelscript/angelscript-2.34.0.ebuild b/dev-libs/angelscript/angelscript-2.35.1.ebuild
index 5020c2d65b17..b6aecfbeccf1 100644
--- a/dev-libs/angelscript/angelscript-2.34.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.35.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs multilib-minimal
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.angelcode.com/angelscript/"
 SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="doc static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 4619aecc6f88..f460db64fa54 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,6 +1,4 @@
 AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8aa231d1885c157a8fb1a0849ddd4e2c015a87df58965ec6ae9c36b536bfdd3969ead61215686021f5e39274e00d9179e7e00c1f975aad SHA512 2e9e2597df81015c2eb91dabd39d3cbb6bcf01b3732a35e68e08e52df40e80edfade620e525d480f46126b5c1080027516a13a524da11d71f5c63844ce714ba6
-DIST AppStream-0.14.4.tar.xz 2309444 BLAKE2B 0c1fd20a01d0fe59d1b1ff029e4fbddbf9cea833d4665549480744e48dc0b3615b0d507278c75025c99ccda21b97e25e62496ecfc49dbe6527132f5dad5d6ad5 SHA512 86bd98e94f3e730d37030be31c6ea0000ba12b35e13778458c0f50bad75babf8c8e93b62492a2546a42f750f91ae81f3456d04e63ad9a4acb804cf38493440a4
 DIST AppStream-0.14.5.tar.xz 2344820 BLAKE2B 714f7004db7579fb293c68e8574f0ebb8cea230e090edbaf459e6e2e0833656d7dd6372bd55c39c5e0b665117015c768990ac8b182a51219823c9cf90360263d SHA512 3f2fff8ee98a5689534802136b9fc8368422ce73c72458924b49beeb5b01170dadf25308bee692cfbc0b0a6cd4b3ee3047e46668a1b76a16b23faec4bf8ae78c
-EBUILD appstream-0.14.4-r1.ebuild 1781 BLAKE2B 3c5ebb2dc3e83dce3dc762a378d7864479adac8dd6b0b679734870c0c872915efc8a8caaa6648bf0e41fdf63b0d2ba84d5a4aa5c2fa478c6ec3c6b38fed2ea79 SHA512 3c7387b09e4e9d253d07b7042630f0feddd0a4418bb638a1f88d22da5c2441a9d3c2fb3f9e725d3e14db4eadee26dcd1b521a50cfc02d5a2eeb2539bd00b43bd
 EBUILD appstream-0.14.5.ebuild 1788 BLAKE2B 6caa408ff4ce96c547fddae9396d6e92d9721febf16d73c32052a93bbfe47add052c4b49185d8616eee1aa79ad3f69a9cac2caa5c6f4ff807063746f3db4ddb6 SHA512 b615ef8dc0d8ea2f87cff9c7b98c3c14eb2dd08369f69ff0119e735a40344fac6b370dcddcf78dc6e74f7433b7c0c81d5868d544cb1450affd846c8e694a377c
 MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
diff --git a/dev-libs/appstream/appstream-0.14.4-r1.ebuild b/dev-libs/appstream/appstream-0.14.4-r1.ebuild
deleted file mode 100644
index 2916ede87699..000000000000
--- a/dev-libs/appstream/appstream-0.14.4-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
-	S="${WORKDIR}/AppStream-${PV}"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt doc +introspection qt5 test"
-RESTRICT="test" # bug 691962
-
-RDEPEND="
-	dev-db/lmdb:=
-	>=dev-libs/glib-2.58:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer:=
-	net-misc/curl
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( qt5? ( dev-qt/qttest:5 ) )
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	doc? ( app-text/docbook-xml-dtd:4.5 )
-	test? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.3-disable-Werror-flags.patch # bug 733774
-)
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-	if ! use test; then
-		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dcompose=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dinstall-docs=$(usex doc true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index d7f10179846a..a83738c1a32d 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,3 +1,5 @@
 DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
+DIST gc-8.0.6.tar.gz 1168660 BLAKE2B c23cb10db54db0e8b16c429e039791086dfec4216ad65fabf072bc0f05df66364d019fccf945bffc32ce12868edfbaf6d9482acb2949d1e233bd89925ab55ebd SHA512 2ea25003d585118e3ac0e12be9240e8195db511c6e94949f20453dc3cb771380bd5b956c04243b2a8ce31508587aa32de4f0f10a813577e6dbe8367688b7614e
 EBUILD boehm-gc-8.0.4.ebuild 1417 BLAKE2B 0a0d40849a901b436928f336c1e897ad6731317767d396aa0b606db1f8c1f21ab4a28e3e9730b5bda2772547903df19950fbbb228e688892b0475664af14d70a SHA512 2fbab201dcbc7eb60c4331f512a1c44947a5be15e70ef5de535cf2571a8bbb64f4a1aa571bcb08c8c2bb8c84eec336b8f01ef1320e08d303d4bcca724e2d3116
+EBUILD boehm-gc-8.0.6.ebuild 1422 BLAKE2B fbf46110e837ef054eb2173816d4ec4165cbafc355a487540133133a503b8ce25c56815f91705e4d981e82e71fbc7b22a54147e62f1f5fd64bcbd2e5a40bcc03 SHA512 66e35b05815d72e218e01412d0f2cd1f524301ecd85011d5d9bc6449608b741c3411df5650bae2972b879492bb6578d02f368331e1d7504d45c8b3f123f07951
 MISC metadata.xml 366 BLAKE2B 29c98f78f2dbe359f1210fb58bd24365791b393cd4bda563185cea4fd35633e0affc82ef00e1e933a1fca0893054d81dd2e1a0c32c861b3cd496766d9decfbe7 SHA512 949dcd60bcde0641526151369de2195e7f784e30e7652087c58f30f3dce1646f619a0c31a0ffdbfa4dc1053d10d713e7e49050c1cf61a7fb8ecb40b479357eb6
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
new file mode 100644
index 000000000000..fe999330ff0e
--- /dev/null
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+MY_P="gc-${PV}"
+
+DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
+HOMEPAGE="https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
+SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="boehm-gc"
+# SONAME: libgc.so.1 libgccpp.so.1
+# We've been using subslot 0 for these instead of "1.1".
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cxx +large static-libs +threads"
+
+RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	elibtoolize #594754
+}
+
+multilib_src_configure() {
+	local config=(
+		--disable-docs
+		--with-libatomic-ops
+		$(use_enable cxx cplusplus)
+		$(use_enable static-libs static)
+		$(use threads || echo --disable-threads)
+		$(use_enable large large-config)
+	)
+
+	ECONF_SOURCE=${S} econf "${config[@]}"
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( doc/*.md )
+	einstalldocs
+	dodoc doc/README{.environment,.linux,.macros}
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+
+	newman doc/gc.man GC_malloc.1
+}
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index 87f2e3bc1ad3..e1bbc60166b1 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -3,5 +3,5 @@ AUX crc32c-1.1.1-system-testdeps.patch 755 BLAKE2B 5eedd88abddcb93e33dd4dd37b442
 DIST crc32c-1.0.6.tar.gz 29596 BLAKE2B 5806e0a48cb3048c9b07abb75eb232491483176bbeb98bc11ad1b0ef7d4ce89929ad20b0354906fd67e8773541f9913f3948f1db9a3f3987fe7e2ca67e9d2467 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
 DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc15ce18070cdcdb12fd9b67f7ec732a53d8af7dc4b77add859bf64c4fa8bc52a593830de931a7bd12c60498cc SHA512 c276160ec960a38cd535c998336472694819bc6eb37beb711bd43a31441d1808c8a14d3a1f0eccc780785b19f739a4a51f923867a20b0707c465e0cc03f457e9
 EBUILD crc32c-1.0.6-r1.ebuild 703 BLAKE2B 3443d226948d7357e5db97f791a96abf123a4e99573dfed1d3d15a3ed4547f43d8f9e2ed6aa72edbd373770c822582123ac162a197d70016365d489f0b6e5781 SHA512 87923213b411d5ca4c92cadd3d18aa61965e1d50f18c84d9ffbd7a2f789d9353629b768824debd9a1cbb1fb5aedf90e0e216482e907bac63ff684e7a4f61f9a3
-EBUILD crc32c-1.1.1.ebuild 868 BLAKE2B ae499e557adaabaf2b66f4bc0b323fdb4713cbfb2f73657e8cbab6036829bfebe5cacee05718cb579ebf5eb3e1a637073046389d95bcc54913b1c360265d22b9 SHA512 90d74eda12d9262f7b95718f89c5a7d141761490923be58049fa9b3eb9fff9ac8f5c926dd788d0538f33a89b21a6916b7361c8073a2ce1a2efee2fcc55c6108d
+EBUILD crc32c-1.1.1.ebuild 866 BLAKE2B b72361efd51aea538bc2e82fa4d23a10eb954a261334989937a9f3635ce46abb797c1f19a3f4c783b10a2c8ed67040dfb199d7c25dd26b98bf6b84c9bee1d737 SHA512 bb2ad906d9124847f5df27d6980cb59b720b5f7e27dde5933f09b802883d01f3f3a999b968637e147a1075579cb895e5080f6e5e0c7be2dfb6053d92d5cf4817
 MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
diff --git a/dev-libs/crc32c/crc32c-1.1.1.ebuild b/dev-libs/crc32c/crc32c-1.1.1.ebuild
index 6c0d39fcd71f..0086632b41ee 100644
--- a/dev-libs/crc32c/crc32c-1.1.1.ebuild
+++ b/dev-libs/crc32c/crc32c-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 5e227ee54e2c..cfd655d211b2 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -9,5 +9,5 @@ DIST cryptopp860.zip.sig 659 BLAKE2B 591a535092c61964c0fbb1ba31e44e70fc5f15757b9
 EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
 EBUILD crypto++-8.4.0.ebuild 1190 BLAKE2B aaeb8f3171c59e2e8061b01fc8e515da289017720b162614ea77d0d7c49dd4c0d558cbf8042272f736a2786e2eb32d05b49669c5df6a1990dcadcae60004613d SHA512 1ec1a83bff3e783106705dfa46dad55bf80026dc0665e58e325f4b43fd314036f33e94a60b392b6fd9b48aae5e2c4534619ba22d4a072ccdfb4e497dd9df1cde
 EBUILD crypto++-8.5.0.ebuild 1447 BLAKE2B d9d8f823078f8bdbe335cc305a11c4f8d4d40b2c23614133a43d330cc183e8af7efe065611aba160e7eb3d8dff264eaf3afae6f26b4b171b2101380d8cc8a273 SHA512 3c7e7827dad7c689926e048349d11f3ada622687ae32813fe9bc9604eecebc04f251470364978ff44170133112a82b07693561f17d2678c61db70ea703b98fd1
-EBUILD crypto++-8.6.0.ebuild 1491 BLAKE2B c0883009b23220a1c17b0797c47a5e743707e6858d192a8fe1c82a0e0e87efbc8d2aa67f579de135751e1239e6214dd9049c1f19b60deb9c24a97206a2527f2d SHA512 3665e5b2de685f647c6131a45c32a178463f72f888da0b2757f8da73b226af89ee75fa906af40b45bd8f310a2eca96f7d3661863f16a2835916f6cb194891b9e
+EBUILD crypto++-8.6.0.ebuild 1485 BLAKE2B af5d71ff66b85afe974b4d8152a12c8453be92b69abe98eee3aeb9b762825e4490583ecde2d8ef4af342737d1e90cc8f4075ffd5cb826f734a39ce9f0963a999 SHA512 c4527ee11924249315dc8ba37adc2484976c9de1ef705ad16cf381732fc1065b3ff3872378e6542e94b59f624ba950a1d087b3d16fd48c633dc5abb1786f54bc
 MISC metadata.xml 506 BLAKE2B 5d6a8770ad53c178e43d30c04be9924718eaf373e8d9945f637db7af71fccf9b21bf46141910ec1cb1ea12e3817dfef4c7881d935fb6f441898ee949ac13ee5f SHA512 8d195dfc2d4f627f59d3a37d4988a0bc59e420a64f8615b819760e32449640eff2f357160b2b9797817d38b0e44c8d6bc04bc4f84a2bd20cfdb7fb5d12df7f2d
diff --git a/dev-libs/crypto++/crypto++-8.6.0.ebuild b/dev-libs/crypto++/crypto++-8.6.0.ebuild
index 93a1b6bd3929..442c22f0aba7 100644
--- a/dev-libs/crypto++/crypto++-8.6.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.6.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="Boost-1.0"
 # subslot is so version (was broken in 8.3.0, check on bumps!)
 # Seems to be broken in 8.6 again too
 SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 4c6f4cdb8cad..fbb5d9d2c7b0 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
 DIST ell-0.41.tar.xz 525240 BLAKE2B 80614190c1237fdbb867300418d474d50e163fba7ca15f4c74c3019b4d407da8319b67be5a88886894dd8869620bae1338e91d28993077690e93260ed1dc3cf6 SHA512 bfbc18195126196776a0d00b4ae8bd8358a6cd1d2f8221132fdae1f323172f148a3faad84a951774ca38a3a72e8d96512b9cac84d9ef3a6cddf4b1490b34453e
 DIST ell-0.44.tar.xz 530720 BLAKE2B 682217828a6a8c6b429bd3760f39fe2d4139b2836daa30d9cd6fe2149c30db63acbeb9be0b4e2f8ed6debf3a6b153950b12995fa5093078f93b4c45b7425bfd8 SHA512 589bf5d8b2954ea7ab38d9673b7ef59729a51c50c20c03b35673bf777b369819222390f471fcd58651f7d51e42375197792119327d4e7e7b101d1bf22c9b7078
 EBUILD ell-0.41.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
-EBUILD ell-0.44.ebuild 1175 BLAKE2B 38153be8a98441d30ba0299302e0913631abee145ad6c2c212ef6d4c9ef7ba97f4408aa79119f2ee6e2ada5731d8811288fcd9d98385f1660efa89d58dc2c149 SHA512 9572ec6ecf0e0bb036934ca776675d1d14694df5a0efda4bc2045e45c2478b2c8c9c1488b9daa123754f3eed2c14a883dc3d1d64bfbf4085961e3720fac7e46c
+EBUILD ell-0.44.ebuild 1169 BLAKE2B ed818bc1b592a9d5768ee4875205a63bedc7c32cad81e5be707e5b345aa78de37e1c337a33fdbae36a934bb2c01e288f5ab27a8af6a3fcfd795912414dd4437c SHA512 b4aab5df0c8036b434c05e46f00277f5b9a111567b3fd1b7ecff52cbb0c6e3678fa8cd9afcba57c43bc316b7416a28582484791d66b1ffb9357e366e3821241b
 EBUILD ell-9999.ebuild 1168 BLAKE2B 229eaef8e41979c42c2a5b5a233cda5701be588f5dc093eb8b288ef3ad05c9216b065cb8e29bf4adc4d8f702331032f9904f443f139ac72936fe776434f32b59 SHA512 e9719214985628d7e6f752df9a69f4576efb2c0e418f9bf44968c0c23ed81ede0483fe9f5f79bf9ef32a18fbaded57fc3c38c582f02bd2e5cd0dacfda5532028
 MISC metadata.xml 337 BLAKE2B 48c0725411f6975e1e1d6783c7c8cb76e0918265c4ac90a762a440e34505db05096bdacc9dba9cf928ae39dc40e94a59305ef5cfa5f6e80c5711909cee1ce1c3 SHA512 b7ed002ca708259ce0a7a1106b944fa5f463fe600ba390059e9b6b7c79f70dc88c76666d7245c0334a29efc1170f6797d710e14811f187856406c1f9d6812e9f
diff --git a/dev-libs/ell/ell-0.44.ebuild b/dev-libs/ell/ell-0.44.ebuild
index e2a5fd2979c4..21c528b64073 100644
--- a/dev-libs/ell/ell-0.44.ebuild
+++ b/dev-libs/ell/ell-0.44.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 813f84fbfd6e..3207f698f984 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,3 @@
-DIST folks-0.15.2.tar.xz 489236 BLAKE2B 63bcfedb88205b37c6e9595c3e0c34f7fc869045648e04042cce9300776e4b7d102f91312434545581882f0959502be7ba1bc2f77d50ec2af7f649444da9197d SHA512 c327e39b7cf32b72db3f84504f8ec2a4bc2d98693ca5ff21c3b544e37b58a1df9241dd1be541a39be83468b62dd0f5d7b5a3a0ca4bde5e94d1e075d77d3be505
 DIST folks-0.15.3.tar.xz 491432 BLAKE2B f11123a2c41c4a36c002b26f3c3616d62e4a74bbddbde84643143404497c8e3c31d8cafc8bff0ba4714606259aaa6f7adf352ba4bb98a20c75a181ee68bfda3a SHA512 dd54aef470990974bfc9b22fb83c868ca9674608ccfddeea1bb7507dfc77d7d12a43d43462957b0bb99bf249c13868ba7326f7fd7e38de8802a3ba54e33d8d58
-EBUILD folks-0.15.2.ebuild 2236 BLAKE2B 26740bbbd0ece731614d8023d803ded59e2f31a460cd1e2441b374a07be5d673e00eea984f6ddc93a859dfeb4ed1b95c31fe63c35a219a84c04806185aecb5fa SHA512 6edb3876d6c904a3a166011440edf925146ac6c554201ad06b369ea7f791ab9d65ac68a3db02db6babd834320e7102f969f2d84620fae531fb9dea50df89e555
 EBUILD folks-0.15.3.ebuild 2342 BLAKE2B 7c8163357b69e5fa6ee31f43bd0b44d80113373c7d54e4e4356be0d3f97cee0bd786579fdba66e075d1c5e1f06915e69a447c68310d1ef97d91629ab4efca838 SHA512 5c8e12e8d23ca8edbd75fbe025d34dd50d4e655f64dd4b6cc2263978a59ac9b58c3fcf36db8e3b0435cbdc3c092390a94033ca1b9b56b6d5406f73d69094317c
 MISC metadata.xml 396 BLAKE2B f4e55d5af852a227b66080749510b9915ac9c3f7081c88051f06be73465235ccc326db015238366e62c40d6e8027eac233644ad8421eb0b59f881e2ec215a1e2 SHA512 4a6a15a7ecee35f43c7f82d24e82c32ca3811058f5135e473e15bcae21fc3023d61a6c9f638c9d97336baef3fa8126ab31a49eb036545f521dab2bf93c2a0f0a
diff --git a/dev-libs/folks/folks-0.15.2.ebuild b/dev-libs/folks/folks-0.15.2.ebuild
deleted file mode 100644
index dc0e45aa8416..000000000000
--- a/dev-libs/folks/folks-0.15.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.48"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? (
-		>=net-libs/telepathy-glib-0.19.9
-		dev-libs/dbus-glib
-	)
-	eds? ( >=gnome-extra/evolution-data-server-3.38:= )
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	eds? ( gnome-extra/evolution-data-server[vala] )
-	test? (
-		sys-apps/dbus
-		bluetooth? (
-			$(python_gen_any_dep '
-				dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-python_check_deps() {
-	if use test && use bluetooth; then
-		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 510ad1310ede..5e7d48dfb6d5 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,4 +1,6 @@
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
+DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081 SHA512 e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42
 EBUILD girara-0.3.5.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
+EBUILD girara-0.3.6.ebuild 967 BLAKE2B f105816e38708efa8ec963e953a878aee03ef216308bb26d5bf5c4fdf6bd1668a215641354ba793ae896fdc53ddc8262ca81dc58e04f8cec66935dd2734abdb5 SHA512 4ca523fa13be09ad4bb7afc7d9d70280e38cdf592fe3e6e4a5f6020534e7716529909c7035344133b51aa722f2431ffa00f2d3b8c1b8460c6995d93cffca232e
 EBUILD girara-9999.ebuild 1102 BLAKE2B 7d305110e6e6c72090a938d9f4c46f39f58a9cdf6cc5eb704b43c683772e069f9888f2bc4ec59e2ab1a8fefb64d0be165db2d8412383b4b3e0a5d78cc7e02192 SHA512 f0f8a6a60d25c2525b2724fb8143f6dfccfc5cb05cae8c1acf350575ddabf80fd4f1066797f9556a839f824a4a87e0c9ebcbbd5a2169e764232eaeb157cab3f4
 MISC metadata.xml 582 BLAKE2B 2ec3bae683d84fb4fd9fbf5114606ac1191df2ca8ac2fdf46b5b4da32999342af02881c67b96df28b39499bed88db1a6512922df437b2a3335fdf62ee56a57bd SHA512 86df21ee24a4f91bbe8329b197ebe7b327ffaa1949c66d7cea4a3cb955aeafa122192c2d2178234b014d5e3824a041641243ebc9869a789d5238942fd6c200cf
diff --git a/dev-libs/girara/girara-0.3.6.ebuild b/dev-libs/girara/girara-0.3.6.ebuild
new file mode 100644
index 000000000000..712c70f1c1cc
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/glib:2
+	dev-libs/json-c:=
+	>=x11-libs/gtk+-3.20:3
+	libnotify? ( x11-libs/libnotify )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Djson=enabled
+		-Ddocs=$(usex doc enabled disabled)
+		-Dnotify=$(usex libnotify enabled disabled)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index c6889affadc5..2df4621fd3f1 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -3,9 +3,11 @@ DIST gjs-1.68.1.tar.xz 558920 BLAKE2B f5364fe92ddf4cb1e9b5dac5921fa180ed31bfe54b
 DIST gjs-1.68.2.tar.xz 559432 BLAKE2B 09146cadcc17f16c36f2a07108b086850d51d95cba21ca95ff0311dd107835b6c5fc9d5d682c9c6713ebd082372f8b46aae31b71f7f5e0e03dcb0d47c5d3c72f SHA512 a42d4ee7be92c869ad9e74c0e02debbe62d13fd0926aa0d903efe802d0f8bc6bc18959d4e161b3960261f9e7b9c0de1d4df5cfcf1eabea29fd75063af8cba154
 DIST gjs-1.68.3.tar.xz 559792 BLAKE2B 0e625c80164ea6053941ce04d00ac688e7a2ea79150dba8849ffc22ae51951d3a6442d8a28755400331a13bf8fcff01dc299d37e61d165de61bbdc1416298f63 SHA512 1b93bdce97b81ec439cde7824491661fc7e4296464a41e4357fc902ec62024e855a4dec24ae7dcb01ec57d4a0019ab2c4aff0b3c08fb94c7beecdefe34226d46
 DIST gjs-1.68.4.tar.xz 559768 BLAKE2B 0e5f2cbb5b93c7ddc05916c95f23d9438c8e76bc2eb35c11eca5414d9f4327e0c99ec9c85795880bd478de5e3655da0f7e9223ba4c3f7c8d5685bdb4a00920d5 SHA512 c610abfa701c0a61ffa6916ec5ebcd07b1dcb04607d74ab0b6d30583da27d60f9993e037fab73e66e1580d644d3a57f0a479f55a09e3bf56fea7f17367c787b3
+DIST gjs-1.70.0.tar.xz 595292 BLAKE2B fc06f4b397350daf19a532a3ec3c2851e106bc76dda41d4a9c32b2718a6f5add1bf0c1066ba9cc5aaeeb192cb4f0a0e3dba1c16826fb3157c0a1e0a8bfe88606 SHA512 e32ee511c34fa9af210061a106d42de67d40c20f398dfacc541db0323bb4a499f2552aa28028eba16ec42afd4dec5a0cea4292155a66b966c3731ded45b23cb4
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
 EBUILD gjs-1.68.1-r1.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e
 EBUILD gjs-1.68.2.ebuild 1125 BLAKE2B 13fd2a1ec2904660be057b1ef8702b704161dbe23796634bb62fab968d156cdf462603ec02a147f2d9ca0d9724f7769ca502613bcb640c90f0ea829f308dd8ad SHA512 b5be649efc4c5835701675423fea9153439d3f17232c9b16d2220588c7b8bdf2abf03a8c5334c18e7b9941e02b5e4a7ab9c961c563a910d5a41a84198b41be85
 EBUILD gjs-1.68.3.ebuild 1123 BLAKE2B 0c93c957a12a41b9233a5b307de829ee1a477d13cf6f5517ba8bf2c33d0aa3f2d9373c59f4d4f66d403dc8585a8b7bdf24bad9c4690a3f0408bec48af9a185a7 SHA512 1558ac302ca7f12655b8de50637ecdd9790216749dbf52042440dceb4e89622ef36509e2b64656cd81376303d4b98ec0feec88ed50cd7483603fbe6c6b72c6c1
 EBUILD gjs-1.68.4.ebuild 1122 BLAKE2B 1f1ddf1335f6651e95f1c0eed3a8bbd79fcdd457ee9d662333f36c260e78db28dda58412169c8c72802f83b616d099b67316854f35eb1cd0a588b00e45df336d SHA512 5bc16f6c8c1f4e5aebbef6595f1cb1a30b6fabb530b998d591a35aba28ba1e0a40508adc825f5b09f9b171d1bc099ef5c714fa28f36ba4f235196cd1a8645643
+EBUILD gjs-1.70.0.ebuild 1189 BLAKE2B 29ff3e597493e433fd70b443c0e6f12f0667d86a1b6c4dec38ff559a74c17641a6ab4e1a89182e0413146af473ede2bf6e0f6381ea0ce44b5c6f0c7409c10832 SHA512 722f5b3365e37f697dcc8cbaa484067bcd92ad793180089b17c2bdfd306016668dec439fafad2772092aaabb6da78214b19e27325ccfc5cd135c2c4c98804b51
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.70.0.ebuild b/dev-libs/gjs/gjs-1.70.0.ebuild
new file mode 100644
index 000000000000..ea422c9bfc60
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.70.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic gnome.org meson virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk readline sysprof test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.66.0
+	dev-libs/libffi:=
+	>=dev-libs/gobject-introspection-1.66.1:=
+	>=dev-lang/spidermonkey-78.2.0:78
+	cairo? ( x11-libs/cairo[X,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/imath/Manifest b/dev-libs/imath/Manifest
index e0fda7659fa3..e5620258b83f 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,7 +1,6 @@
-AUX imath-3.0.5-0001-changes-needed-for-proper-slotting.patch 7130 BLAKE2B a041a7ce654c32443457b34d9c2c4d0d919b9fe373971675ec265218dff7f8a2b470a44e7af44d27cb4d8c8c4b8f3e405b4b9762e7f8cfa8ad84db9c37f4baf0 SHA512 6407eaf9041105da66bfd70fa6e8b99813f938636dfda10b29aa078c445244b0f188f097bd4540ab3e1f1113faff6e1e7531df5ebbba28b7ab511ebbdae297a4
 AUX imath-3.1.1-0001-changes-needed-for-proper-slotting.patch 7206 BLAKE2B b812c30370a0022824fe8d251e26ce63abc0ba3f970059336cd8402f899ecae456982e4a3cda0e152323005d5eba3adaeee47bbacf78084ae3dbafa5bd0a89f2 SHA512 5df522b31043cbfcaa21c5fca4e4d6866f3ed93530fd0beba81d2c6c684003cf3214e3e011816996e76e177cdb60d1aec584c454664362e6079f1efaf9e857d7
-DIST imath-3.0.5.tar.gz 528503 BLAKE2B c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6 SHA512 df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2
 DIST imath-3.1.1.tar.gz 568231 BLAKE2B a1210b5f6ff4723a133d317c2b40338e387973a1409868a218192a53778b86a0912c77911bdf76286a6ed6931175aec38bf24ddc0c76eed3375b7a2945dba124 SHA512 b2f4cc21e44094ef139a1f04bb997c7e41770ff886457fff00d65ca477ba579c86fd5fbd465998c4519855fcb34328ac834d84d0d011f758f56a20ef79e9ca3d
-EBUILD imath-3.0.5-r1.ebuild 2307 BLAKE2B ea32f43a16047b17499fdbee21978bd3ad824bdc0fa543e31f0ac63b8694f084968fe19e746a2f0d40d92b82fb2501b3342d90cfa7587e33cb775af6814e1a52 SHA512 8bf1d5a7047b62bc5036b38e1d4ae5c5ccd41ac15c6f28de89cec79a5db30ba199e50406075772aa5b74c47ca4e25bf1caccd989b89817930c512aa550dd1eb8
+DIST imath-3.1.3.tar.gz 570840 BLAKE2B b037c9bdee87f58c7a2be9dbda52c89c26eba25fe07342710578f9eef4b90a49b9d5dc5451702c960ae94427d7f748b79b81b7fc9ad350d2252e9e4bf6a1d6cc SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75
 EBUILD imath-3.1.1.ebuild 2246 BLAKE2B 952a2801dcad6d79c53bb5375f391e9f4e0827b1f0b9c2837a13e77df08baaeb101ed8532ec30012ae2fa05d71f75ff18a9a5e239a148358e19225058a444a2d SHA512 eb9ac6c21b0c8ce528644999da28e0beb6653b860c160961def13f933c7e0af9f3b1439b8224b916851815a6767b0b8ee2fb063a0baf41666f26328c24175e66
+EBUILD imath-3.1.3.ebuild 2020 BLAKE2B a2e3fe8154387da1b3c4da28b5ee1bf398d55ec51a7a079b9a35b5bca9ad1f62a4268d639f4615c7bb563f81a68fcebdb37ac5a860ca527f2393e1e0b914ce3a SHA512 142571ae60baeeec6004a4bdf304bc60a27b25d8ffc744fa867cb51db049019586742cdeb78a0d95c036370c18fc5ff329658291370c81eb13805cf284f42dfc
 MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4
diff --git a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch b/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index 74d0f2dff7d7..000000000000
--- a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 20 Jul 2021 19:18:20 +0200
-Subject: [PATCH] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- config/CMakeLists.txt                  | 6 +++---
- config/Imath.pc.in                     | 4 ++--
- config/LibraryDefine.cmake             | 8 ++++----
- src/python/PyImath.pc.in               | 4 ++--
- src/python/PyImathNumpy/CMakeLists.txt | 2 +-
- src/python/config/CMakeLists.txt       | 4 ++--
- src/python/config/ModuleDefine.cmake   | 6 +++---
- 7 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index d51c25b..63cc98d 100644
---- a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
- 
- configure_package_config_file(ImathConfig.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
--  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- 
- write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- 
- install(EXPORT ${PROJECT_NAME}
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
-   FILE ${PROJECT_NAME}Targets.cmake
-   NAMESPACE ${PROJECT_NAME}::
-   EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/config/Imath.pc.in b/config/Imath.pc.in
-index df11cfd..6eb4f40 100644
---- a/config/Imath.pc.in
-+++ b/config/Imath.pc.in
-@@ -5,7 +5,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
- includedir=@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: Imath
-@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
- Requires:
- Conflicts:
- Libs: -L${libdir} -lImath${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
-diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
-index e9ff904..00e5176 100644
---- a/config/LibraryDefine.cmake
-+++ b/config/LibraryDefine.cmake
-@@ -74,8 +74,8 @@ function(IMATH_DEFINE_LIBRARY libname)
-   install(TARGETS ${libname}
-     EXPORT ${PROJECT_NAME}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     PUBLIC_HEADER
-       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
-@@ -88,8 +88,8 @@ function(IMATH_DEFINE_LIBRARY libname)
-       install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-       install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
-     else()
--      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
--      install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
-+      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+      install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
-     endif()
-     set(verlibname)
-     set(baselibname)
-diff --git a/src/python/PyImath.pc.in b/src/python/PyImath.pc.in
-index 8e8de6f..1902660 100644
---- a/src/python/PyImath.pc.in
-+++ b/src/python/PyImath.pc.in
-@@ -5,7 +5,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
- includedir=@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- 
-@@ -13,4 +13,4 @@ Name: PyImath
- Description: Python bindings for the Imath libraries
- Version: @IMATH_VERSION@
- Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
-diff --git a/src/python/PyImathNumpy/CMakeLists.txt b/src/python/PyImathNumpy/CMakeLists.txt
-index 7b4f6b2..8f7fd70 100644
---- a/src/python/PyImathNumpy/CMakeLists.txt
-+++ b/src/python/PyImathNumpy/CMakeLists.txt
-@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND
-     LIBRARY_OUTPUT_NAME "imathnumpy"
-     DEBUG_POSTFIX ""
-   )
--  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
-+  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
- endif()
-diff --git a/src/python/config/CMakeLists.txt b/src/python/config/CMakeLists.txt
-index 4f796df..15d7026 100644
---- a/src/python/config/CMakeLists.txt
-+++ b/src/python/config/CMakeLists.txt
-@@ -41,10 +41,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-   COMPATIBILITY SameMajorVersion
- )
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- install(EXPORT ${PROJECT_NAME}
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
-   FILE ${PROJECT_NAME}Config.cmake
-   NAMESPACE ${PROJECT_NAME}::
-   EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake
-index d9a8907..ebe1a95 100644
---- a/src/python/config/ModuleDefine.cmake
-+++ b/src/python/config/ModuleDefine.cmake
-@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname)
-   install(TARGETS ${libname}
-     EXPORT ${PROJECT_NAME}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-   )
- endfunction()
- 
-@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname)
-         LIBRARY_OUTPUT_NAME "${modname}"
-         DEBUG_POSTFIX ""
-       )
--      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
-+      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
-     endif()
-   endif()
- endfunction()
--- 
-2.32.0
-
diff --git a/dev-libs/imath/imath-3.0.5-r1.ebuild b/dev-libs/imath/imath-3.1.3.ebuild
index f2fc31012332..8ce94a93b3bc 100644
--- a/dev-libs/imath/imath-3.0.5-r1.ebuild
+++ b/dev-libs/imath/imath-3.1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -12,13 +12,12 @@ MY_PN="${PN^}"
 DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-# re-keywording needed for (according to ilmbase keywords):
-# ~arm ~arm64 ~mips ~x64-macos ~x86-solaris
+# re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
-SLOT="3/28"
+SLOT="3/29"
 IUSE="doc large-stack python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -42,7 +41,7 @@ BDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch )
 DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
 
 pkg_setup() {
@@ -54,15 +53,18 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DDOCS=$(usex doc)
 		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
 		-DIMATH_INSTALL_PKG_CONFIG=ON
 		-DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}"
 		-DIMATH_USE_CLANG_TIDY=OFF
+		-DIMATH_USE_NOEXCEPT=ON
 	)
 	if use python; then
 		mycmakeargs+=(
 			# temp. disable for finding libboost_python310, #803032
-			#-DBoost_NO_BOOST_CMAKE=OFF
+#			-DBoost_NO_BOOST_CMAKE=OFF
 			-DPYTHON=ON
 			-DPython3_EXECUTABLE="${PYTHON}"
 			-DPython3_INCLUDE_DIR=$(python_get_includedir)
@@ -72,23 +74,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		pushd "${S}"/docs 2>/dev/null || die
-		doxygen || die
-		emake html
-		popd 2>/dev/null || die
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}/docs/_build/html/." )
-	cmake_src_install
-
-#	if use python; then
-#		rm "${ED}"/usr/$(get_libdir)/cmake/${MY_PN}/${MY_PN}Config-gentoo.cmake || die
-#	fi
-}
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 2142d48ccaa6..2c6870ed9ee8 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,10 +1,12 @@
 AUX intel-compute-runtime-21.31.20514-no_Werror.patch 346 BLAKE2B 0ffeef51d3f2aa4ccd295cf1317b58343e39c7b32fe2acd52e45c0596c22b4c5fd3d301c333010abc3386b797c05d20860e61496444598c8f271b5e4b0f4fcae SHA512 932d80d81947c96f543f9d8704120e851f1004ba93718566f578610cbe8c2c65a131246bbc0e392135f866f277270d6bfe4424abca25f6cceedcfe17a4e800ba
-DIST intel-compute-runtime-21.33.20678.tar.gz 4534884 BLAKE2B 9a5e7f962be08701bec1e890eeb5b6208694a33b524872494e428b73d46629b7cde1522c6b7d0b27725cc170f1e65391892b253ca84d988b209e41631548b135 SHA512 278284fafe0e2d340668e1c21188b706ab48439c6ea573885d1b060df458e2016ed40e0a0c65e4076378ddb3ab284eb2cd92b1db5e6bd892babf2275ed600341
 DIST intel-compute-runtime-21.37.20939.tar.gz 4576917 BLAKE2B 42563ce897667025100b40f504fe4897222fd28f1b82ac22fb6cfaa6a273b8e9199d57743ab338ab52b32c9598bbf6856530688ca9cbff360db356dabed6d96b SHA512 ed213e2fd234300ac940ffa503a34ae54698e2d359927b3bdcb59bf7ea9d6b950073e9e2e750ec5b8e3e387f0c8d74b4852627c283964fd6a9742dcdc32f518f
 DIST intel-compute-runtime-21.38.21026.tar.gz 4655853 BLAKE2B 28ebfb1cbce30fdefb7104a2b6840ea95d62645ae51a97a0b970aa4344fca7e64eb8f289895c30cf9fe4a0d9e5294490810236c0e565e78383ad7096429e2155 SHA512 08ffaaed80ef5776e6ecff15467170ca143887cda7905a49f7b2d12862ff17e75e7ff89ff2bb76ce25eec4ef32dfc882ac3cddf5a3e71d24adb21cc8c806cf5b
 DIST intel-compute-runtime-21.39.21127.tar.gz 4666632 BLAKE2B 0e63e1bdf152e9995d48bc514ad86ce107ab7a62946b349f88fee3dfea89c93d3c2c7ce0ff3fd670d9944fa563cb409a04ae65820f3bb591f56638a7be54ec16 SHA512 7f526ec6f3c38586f75bcb0acdc312fc954655f2a92f78e820be722c27cac60b961b73897a1bd4ceeb397abdf3565be5e9c0859a0906723cb79e2947df2d2136
-EBUILD intel-compute-runtime-21.33.20678-r1.ebuild 1377 BLAKE2B cf691d661311001daa82c720b2bab9992994a42be7375b3a9372cb9c719a18195b08270f45b332bd37871bad0ff6afb120adce6ae4c40c00be0dca36e57ce68d SHA512 d956347a35e2999136cbe58828768fc37a6ffb44af3e2dd09b6b4425e6dec5ff09fe0fdf8e14e6031ac9543435d7e285978ec93fcb36fceab2bd58a571810c63
+DIST intel-compute-runtime-21.40.21182.tar.gz 4678271 BLAKE2B c8f5c324af0e8ef787b287ee1e3fcacc217c3d935ce859123a217c088323f97a80293749689959be22502e7f569ad0fb917868c526dcea7905e80585e7376f53 SHA512 fdf74ae700a444ba9732938d9cdda3ba6f6baac209ca1611488b405a4ecced7cdd434a9e349af8a095b5adcd583b84294cb831ddc785520cd697a7af1ffa0437
+DIST intel-compute-runtime-21.41.21220.tar.gz 4753783 BLAKE2B a340c2b5c1199498a68aa66c1d88367b99bc2404f35da10135030aa68462a909808fb2358dbc3d75357e00ccf30bb259a325a3d4523d862c0da358eae7528f65 SHA512 df397688423dbe0ec2e61c9a9c8b6ee1ee4451a95ef01aefcc2a0ed956e6b8273a4e9975c9aca592b51b4ce85324f5bdcd6a835f8eab40a0e715eb10000f1ceb
 EBUILD intel-compute-runtime-21.37.20939.ebuild 1388 BLAKE2B 5bffd85ae102c1079ae6d1bab8cfd531f302a1c1c2ddbe5d27bafd10e90c734171128abf686178b97cab9392e38d53c2f09335626a72bb4a756f614dbcf6b650 SHA512 812b0e8e78dde7cf287730efeed5f1d1d58bd542f69aba014683489ab4a6655b4bc07f6a2968a04eebaf59c21f11ab12986d8bac254a3f0a8f4cf90bdbad5db5
 EBUILD intel-compute-runtime-21.38.21026.ebuild 1386 BLAKE2B 0d00917c93bc06395d15e08542148e8a06c91dc095b22122d893dc0112c0b6e134eae91cbb8062938894bf1722f094195b9088b46da22a7941a6dc57fc4ed5fc SHA512 bdb6a276d513e5544b70174fbed3cf2d76e936e5041344a461e3487230e89f47144d0c7569e2fe1a0a6f78f24b31d84271c5cfd79961778899fb87ea2ca5142f
 EBUILD intel-compute-runtime-21.39.21127.ebuild 1386 BLAKE2B e7fa088d3c0869f7a5b251095bc33531a242c555c25ced19182b91786372cdbb0d308a3b6b12c63cd49fd8680d8810a0936582e12bb70a8511d7eeac0b8e56d6 SHA512 e082c0fbfc6d6ca10f2c6ced5f43a2b4071437e79974cf1c075ab4d1319f0786d2d97fa545671b8060cee87a661f755d0833c53ec560c3a2cb424c2aec072986
+EBUILD intel-compute-runtime-21.40.21182.ebuild 1386 BLAKE2B e7fa088d3c0869f7a5b251095bc33531a242c555c25ced19182b91786372cdbb0d308a3b6b12c63cd49fd8680d8810a0936582e12bb70a8511d7eeac0b8e56d6 SHA512 e082c0fbfc6d6ca10f2c6ced5f43a2b4071437e79974cf1c075ab4d1319f0786d2d97fa545671b8060cee87a661f755d0833c53ec560c3a2cb424c2aec072986
+EBUILD intel-compute-runtime-21.41.21220.ebuild 1386 BLAKE2B e7fa088d3c0869f7a5b251095bc33531a242c555c25ced19182b91786372cdbb0d308a3b6b12c63cd49fd8680d8810a0936582e12bb70a8511d7eeac0b8e56d6 SHA512 e082c0fbfc6d6ca10f2c6ced5f43a2b4071437e79974cf1c075ab4d1319f0786d2d97fa545671b8060cee87a661f755d0833c53ec560c3a2cb424c2aec072986
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.33.20678-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.40.21182.ebuild
index 331420e21856..030eef16a573 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.33.20678-r1.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.40.21182.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -15,17 +15,17 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND="
 	dev-libs/libnl:3
 	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.8365
-	dev-util/intel-graphics-system-controller
+	>=dev-util/intel-graphics-compiler-1.0.8744
+	>=dev-util/intel-graphics-system-controller-0.2.4
 	>=media-libs/gmmlib-21.2.1
 	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.4.1 )
+	l0? ( >=dev-libs/level-zero-1.5.0 )
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		x11-libs/libva
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.41.21220.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.41.21220.ebuild
new file mode 100644
index 000000000000..030eef16a573
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.41.21220.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.8744
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	>=media-libs/gmmlib-21.2.1
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.5.0 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+# for Khronos OpenGL headers
+DEPEND="
+	${RDEPEND}
+	media-libs/mesa
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index b0e498d25041..fbb3eb09b379 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,5 +1,8 @@
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
+AUX isl-0.24-gdb-autoload-dir.patch 1577 BLAKE2B e7d7fad85d194f2e55a319ee7cd803813332780a75b904897f2141d6e4797a6be3e467e28bfa007b2a14568c9f56c0efa10bdef185547179345689032cde9e57 SHA512 168e3875248af7abf432d8a82af1b9e9232fdb251425fc9d35ee3930d307f1543444d83fc46cea9bc295ec15f855c736889388a6c06062c78f06f8f39df0aa1f
 AUX isl-0.24-nobash.patch 1092 BLAKE2B 42dc0587fbb05584ff51ad490cc487159a7bb2ab5fd7db2c46bc70c572dd6ee391b077cf54767f3811b6586e8e6271a7d4d93e9a21fe968db683d349fa02103c SHA512 92ae3b054eb5cdce3e8bbc54c072e8d5cbf691a325b06269d4fe9fe6d889e1a291bb622ecf98b1c63177112914cc1836c646503b0f8f50a4cea24634f55b5445
+AUX isl-0.24-respect-flags.patch 204 BLAKE2B 34d028a22ad608fbddf7a3909000351f7cf9b7e75cf3b0f687fafc35554163a123467053433c96c32764b155c02f01a336e92e67e25726bfd3e109ba18de42b7 SHA512 0d72d99266d181cef9fac1388c254f1e85c64aa394a672245013be17f2f4117c3f23252bca42746fce91fb2b266688245c1747cf21a69afe82de058cdcb600b6
 DIST isl-0.24.tar.xz 1930956 BLAKE2B 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d SHA512 ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
-EBUILD isl-0.24.ebuild 1985 BLAKE2B e0a65b6a516eb5a69ccc4f82af31b51912561c371005f01552f0441d5d1dab906cd64ac0d6796e33548a4684b3f4cca39c471051b9d467b655923d18a5ee811d SHA512 b18e57fcc4ddb1aa00a9e849d2741dc5a91120e7bf0a1d5fb67ba2af2b88a2ac998e592e31865629dc57516723fbf08c17878d30803d621a356f19e0eca769af
+EBUILD isl-0.24-r1.ebuild 2179 BLAKE2B 9da3c3903e80c0727ba2c3bfda463b57ec95cc07c48899663e616a0ef64163831bc3af76443ef69eb538f89b047e8bb5ae83de29bf0d905a1cd6b79db9377c96 SHA512 7c25d27f7b95bc669dcf30b14916190d415c17bab7c2ac8a7f6c9d39681f407489bd856e04713735c5458550918298a5f6fd9ddbd182b1012e34218b3a17481a
+EBUILD isl-0.24.ebuild 2065 BLAKE2B 3e9a9474be627c9832a3347f9a6fc96371eda37f017be6770b4a60061185afac16d5479e8bb0d3cd0dbf56bf3d042a86aabaf9685541ee4571466a16843a6ae9 SHA512 226512b08c6d26de9d624ed0fefd38613e2cf1675f55b7bee31b666c4c17b1d54843808724825c9c42f31d8b146c49d2195eac49439501dd7c476a66184c1b75
 MISC metadata.xml 226 BLAKE2B 99dd52557be714400c2d45f1621a6ed5e95b38fee6c6812b4681e5363c84bac0e5a55026b609b0ec9196348fc1ea5f55b4763220ca16cf45c3b61a20dc0fb745 SHA512 df6b46a0133ce8106a367f43e477f044f06a8411b9164ed4cc8543289ec78c5e3f8d4dd3fc36100f39f5c9928d1100c0f5a25cf457dc7048dd37ccc3fec24f57
diff --git a/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch b/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch
new file mode 100644
index 000000000000..6751d5755fbe
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch
@@ -0,0 +1,35 @@
+diff -Naur isl-0.19.orig/Makefile.in isl-0.19/Makefile.in
+--- isl-0.19.orig/Makefile.in	2018-03-03 11:32:15.000000000 -0500
++++ isl-0.19/Makefile.in	2018-03-10 17:29:30.039182728 -0500
+@@ -2269,10 +2269,10 @@
+ 	case $$libisl in \
+ 	'') echo Cannot find isl library name. GDB bindings not installed.;; \
+ 	*) echo $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-		$(DESTDIR)$(libdir)/$$libisl-gdb.py; \
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
++		$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
+ 	$(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-	    $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
++	    $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ 	esac
+ 
+ uninstall-local:
+diff --git a/Makefile.am b/Makefile.am
+index 96cac65..8bb6aa2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -639,10 +639,10 @@ install-data-local: $(srcdir)/libisl-gdb.py
+ 	case $$libisl in \
+ 	'') echo Cannot find isl library name. GDB bindings not installed.;; \
+ 	*) echo $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-		$(DESTDIR)$(libdir)/$$libisl-gdb.py; \
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
++		$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
+ 	$(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-	    $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
++		$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ 	esac
+ 
+ uninstall-local:
diff --git a/dev-libs/isl/files/isl-0.24-respect-flags.patch b/dev-libs/isl/files/isl-0.24-respect-flags.patch
new file mode 100644
index 000000000000..e00748b24330
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.24-respect-flags.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/815700
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,6 @@ AC_PROG_CC
+ AC_PROG_CXX
+ AX_PROG_CC_FOR_BUILD
+ 
+-AX_CC_MAXOPT
+ AX_GCC_WARN_UNUSED_RESULT
+ AX_C___ATTRIBUTE__
+ 
+-- 
+
diff --git a/dev-libs/isl/isl-0.24-r1.ebuild b/dev-libs/isl/isl-0.24-r1.ebuild
new file mode 100644
index 000000000000..71aaf3b34155
--- /dev/null
+++ b/dev-libs/isl/isl-0.24-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib multilib-minimal preserve-libs toolchain-funcs
+
+DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
+HOMEPAGE="http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz https://libisl.sourceforge.io/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.24-gdb-autoload-dir.patch
+	"${FILESDIR}"/${PN}-0.24-nobash.patch
+	"${FILESDIR}"/${PN}-0.24-respect-flags.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local econf_opts=(
+		$(use_enable static-libs static)
+
+		# AX_PROG_CC_FOR_BUILD deficiency:
+		# https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+	)
+
+	if ! tc-is-cross-compiler; then
+		# Incorrect CFLAGS handling as CFLAGS_FOR_BUILD
+		# even for native builds. As a result -O3 is being used
+		# regardless of user's CFLAGS.
+		econf_opts+=(
+			CFLAGS_FOR_BUILD="${CFLAGS}"
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${econf_opts[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	preserve_old_lib \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21) \
+		/usr/$(get_libdir)/libisl$(get_libname 22)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21) \
+		/usr/$(get_libdir)/libisl$(get_libname 22)
+}
diff --git a/dev-libs/isl/isl-0.24.ebuild b/dev-libs/isl/isl-0.24.ebuild
index 9b5ae94248d8..3c45913215e2 100644
--- a/dev-libs/isl/isl-0.24.ebuild
+++ b/dev-libs/isl/isl-0.24.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit multilib-minimal preserve-libs toolchain-funcs
 
 DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
+HOMEPAGE="http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz https://libisl.sourceforge.io/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
@@ -35,6 +35,7 @@ multilib_src_configure() {
 		# https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 	)
+
 	if ! tc-is-cross-compiler; then
 		# Incorrect CFLAGS handling as CFLAGS_FOR_BUILD
 		# even for native builds. As a result -O3 is being used
@@ -49,7 +50,8 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_preinst() {
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index dc838714510f..8dbf118205b6 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -2,5 +2,5 @@ AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c
 EBUILD jansson-2.13.1-r1.ebuild 942 BLAKE2B a410c9992a4b386d189e4dfa5cb56c6d815a8e0751251e923fe85c227e1458e296330b3be284d8ed7ab409085cc4ff76472c8ee1c4fa63d140b09350af3b116c SHA512 c6f8114764f437f6f96437ee1108784982dd223adf9cb29d81ba5a57354bbc7dc07377b7d60ff5cf234729ed1a509ce7ce543067434a9fb88a1297d99ea3cd69
-EBUILD jansson-2.14.ebuild 847 BLAKE2B 129ce6812cdff2caee84bfe7d505bd6cb97304199550864821520fc966052bff237ec81c0ee4dfe27203b851a23ee1b4c642ae6c276b7e746f2b2465cb647d88 SHA512 b01db7151486e367683e9cdb65c4463b2e1e3fbc1dbc568c43d13ff1f14b1ec5777a13d73a2c74829ec39d5a8da0d47f5e7039021216342633e218b06d4b057e
+EBUILD jansson-2.14.ebuild 878 BLAKE2B bcf501239b88fe0e185d155a7bd053599a5ee682e94f461a865bd6a28b31df845d9f0512e8ebef8c0fa8cd4cc42f08f14c30a50c583661f9621e77e72e35bd19 SHA512 859fbbe220b20b915ad63a3cd859207c49a6bbd5258a1a111e7059fcbb1a4fc096d9bd9f3eb5ba8497b4fe5eeadc40dcc2ace065c28239695e77eb92d36a3f03
 MISC metadata.xml 395 BLAKE2B 414a914de07c51b1fae68121cbeeff2b4975fa351e068d250c7d88f6ac8832a2c954f311f547494e10a78dbc5b9b7ccd1fdbb46335f28bac7b23cb5aa13050ba SHA512 067ae2c24fdd77747a78590731e1946bc0a2150038e9722d60ef97c428538046f20843bea2bd970d9591c7f7dbbef2fd81b605fcc2d67daaa55551cfd3d7dd24
diff --git a/dev-libs/jansson/jansson-2.14.ebuild b/dev-libs/jansson/jansson-2.14.ebuild
index b6d6d015ad68..396096cda49d 100644
--- a/dev-libs/jansson/jansson-2.14.ebuild
+++ b/dev-libs/jansson/jansson-2.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
 HOMEPAGE="https://www.digip.org/jansson/"
@@ -11,12 +11,14 @@ SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( dev-python/sphinx )"
 
 multilib_src_configure() {
+	tc-ld-force-bfd
+
 	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
 }
 
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 124c6f5aa89b..ec5be7302896 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -2,6 +2,6 @@ DIST level-zero-1.4.1.tar.gz 391185 BLAKE2B 470df7a3fdc8562fd427bb94e236553f76b7
 DIST level-zero-1.5.0.tar.gz 395657 BLAKE2B ccd667f39b36f24826ec2ce2f9a755111d09f47798a7af9ddafc78947d008d0af82aa6189683b29acb59f9dc54d20fe0419ec4fbf5728e1652513b43b058db45 SHA512 2fd822dafbfaa1f51ff04e33f1cc3f5bdc4d71d45f1a3f7795ca870882647b162d2e4f727341542b09efe38e7bdb21bbefe5e6ea5af97c2579c7d74df55c5c1d
 DIST level-zero-1.5.4.tar.gz 395657 BLAKE2B ccd667f39b36f24826ec2ce2f9a755111d09f47798a7af9ddafc78947d008d0af82aa6189683b29acb59f9dc54d20fe0419ec4fbf5728e1652513b43b058db45 SHA512 2fd822dafbfaa1f51ff04e33f1cc3f5bdc4d71d45f1a3f7795ca870882647b162d2e4f727341542b09efe38e7bdb21bbefe5e6ea5af97c2579c7d74df55c5c1d
 EBUILD level-zero-1.4.1.ebuild 727 BLAKE2B 5e3b87746f59c74f9b89ccf926e3f042f8907194a793ac329b04e5c6b673f31e3e3b945a9230af9a7775bd9d8d41a293a56500ffdb81cd5b9f2d07a1c8147655 SHA512 93b57b3ed85ad42f9017417cc29b978b79ad7145c7c5ef3be079044beac17be43a103ef003959cc3a3630c52da822416d552f68196299a6ecad4d0c4d3c44e51
-EBUILD level-zero-1.5.0.ebuild 728 BLAKE2B 22309937e74456276ed9261a84b17d063ea7711fd72b7a8218869ad8d1bdcd1f48a9ab32bc9c87b6740ac1c685c9d5239f7598f68cc8d06fcd5b74bcc9bc492f SHA512 97fea4c2d0e23673c3ba1caaa5e2b663e136c1fddd3f16554c6bcb156f244d6103916770d763dfaff5166bb68153e5c020256746f6c54575bfb54f7c22ba3912
+EBUILD level-zero-1.5.0.ebuild 727 BLAKE2B 5e3b87746f59c74f9b89ccf926e3f042f8907194a793ac329b04e5c6b673f31e3e3b945a9230af9a7775bd9d8d41a293a56500ffdb81cd5b9f2d07a1c8147655 SHA512 93b57b3ed85ad42f9017417cc29b978b79ad7145c7c5ef3be079044beac17be43a103ef003959cc3a3630c52da822416d552f68196299a6ecad4d0c4d3c44e51
 EBUILD level-zero-1.5.4.ebuild 729 BLAKE2B 3308c284a5ace378ab808a03dd09fe3e81f22c703c7c62eb9dc161c2010e2c70843308125d02444921f80bf1bd6daffdacb1fb38f4e5d8049da067af5ce23130 SHA512 2b03676b7a1fff4858d0fd393be61a69229c39315364526d0c82f8d84b1bd5e6ac7727dea9e2d12110166f5926cfeac812d876adb6ff102e603ed642b895d9c2
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.5.0.ebuild b/dev-libs/level-zero/level-zero-1.5.0.ebuild
index 87cf476cc25a..0cef8138c81c 100644
--- a/dev-libs/level-zero/level-zero-1.5.0.ebuild
+++ b/dev-libs/level-zero/level-zero-1.5.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 93b641ed4b9c..0f13c049d517 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,6 +1,7 @@
 AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
 AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
+AUX libaio-0.3.112-respect-LDFLAGS.patch 521 BLAKE2B f45b0147202e767385f6816192c0fe8418cd7ed61b6807d9a6d16ec7448f10f4f842c32167f6a2ef82df820c291142cedcd66b610693858aa6ca956de272d2a4 SHA512 c1d8385fc66909168e2ff39d334e9ac37a02527a892ed13a594c1b0b55103a5115d79c32aff756a9ec96117a7001703a3d141319369dc7bcb118eb752860f0ba
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-EBUILD libaio-0.3.112.ebuild 2125 BLAKE2B de7aeb7469543f50fce366acfc71ce5635b0ce1a30e65b7a96228d7f58d0939c050c494a193b2eef4b1fb31ac022fe8117d55c6703964f9937043a40f40f625f SHA512 e87fbbbc0e97827e9c19680e9ed6c77f3b8b515c9394e925cfa381542149b3bae64786cd20d2a666f5c4ce03f4a0878ffcd97a847a4e2405bfe85ad16a72114e
-EBUILD libaio-9999.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232
+EBUILD libaio-0.3.112.ebuild 2176 BLAKE2B 7b01abde1954d1f1d5a5b64e4abd8c2f1620497e567bb425e78f8c54216df4d8627473bf2cca714543e015a35b9136982ddf39ff98909f5d1e75031f68e159e2 SHA512 596a1fae4d24cbc19784a183b67b165bf693b2a7c07798d75540c350efdc88dca34149b6bda5014eb108e3730e28ebe7b9a90440d0bb30d75a72e4fd623234a2
+EBUILD libaio-9999.ebuild 2184 BLAKE2B 6b0e607d7978885115bf87ede0e72bb89ca78ca4d9b493aa27e3a4bfab98f5dd288c979850d902756fc8baf0ea7ab203b026e3d3b5fa9b2c28d10ba85246a996 SHA512 5c511bcc4aafd5a0952fd1a6816dc94631f198345e7a821f692c9a7d9d76f2d3c2536f9bb9b697c122e9c3579c511b7f7077574a472ea60c2436046c1009597d
 MISC metadata.xml 415 BLAKE2B 5f25806b5b169a85b455a39a9ba1995ccfa3c41e17ce1b8a7f2269167ba477fa0b76abc4ba46d977e5d6bba365b63e342304837a19dd57c0ac8d83e5846a2b22 SHA512 ad7bc8b579f5037c678294b77511af2b9027ed696a814bbbda6e3f630853040092b0abe20967d52fef7f65815c807bd49a2e57f392cd1035d1133e6d48009204
diff --git a/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..20e23874fb6b
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
@@ -0,0 +1,13 @@
+We need to place LDFLAGS earlier to ensure e.g. as-needed works correctly.
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -56,7 +56,7 @@ libaio.a: $(libaio_objs)
+ 	$(RANLIB) libaio.a
+ 
+ $(libname): $(libaio_sobjs) libaio.map
+-	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
++	$(CC) $(SO_CFLAGS) $(LINK_FLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs)
+ 
+ install: $(all_targets)
+ 	install -D -m 644 libaio.h $(includedir)/libaio.h
+
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 93a8952b8ee0..a83b08bd9822 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+	"${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index 6ddf6077967e..232c53681871 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+	"${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libdbh/Manifest b/dev-libs/libdbh/Manifest
index 20933f5325bd..013cc1ea07e5 100644
--- a/dev-libs/libdbh/Manifest
+++ b/dev-libs/libdbh/Manifest
@@ -1,5 +1,3 @@
-DIST libdbh2-5.0.19.tar.gz 1608949 BLAKE2B 405a2903c8f4dddcd66153304bfff5084e549f650846cc2e8afecb6783cbb5fcf391cc251e4805486f9ad62cac4c59a3112fc7a6d0ced6e93e0e88be707e9a83 SHA512 35c368e82f8f7c4c7d4960731214ff3863530795b16716c0be7351e0ca10740ac26a99930369f4df78c8e108d929124c222b5942ce5f521ecb58afd38d55bbe9
 DIST libdbh2-5.0.22.tar.gz 1641669 BLAKE2B 835a1d112ac34ff025002c826fa6f1291a8da2442901396e79abbf5e3c315654cef2a9d45c852821fa373b132e0e8a04695c4cf5c830bac9a3b40dd32ce5b543 SHA512 d0cb69bbd3d54600cd14f4d1d7ee7f87c52c9bea9f475763b1d43c053a7571063f42b59cef8d08632b065f44cd85b5ccb0fcd31052202aa8f8a49f34669c7930
-EBUILD libdbh-5.0.19.ebuild 771 BLAKE2B 2c0cb01aa6ed080ba8fa85d308e0069024a65ff70972f82a5160ace00a5a57e5cadb0df2fe06ebc256df53423ca50795e7cafc17771887ea0db5539e076ddce6 SHA512 27f8345459aa9c6852a386b1ea8384c86116c767674e55fde533b3caf934e25482b3b04e61f3da218cfb98d3328c1fabcce77306c9d0164eeb28573262d5102e
 EBUILD libdbh-5.0.22.ebuild 741 BLAKE2B a980e996e70ef687900f1174a9d485b9e67fb1532153d8298d827361c3f93598083bc08210b43392390323f6bc5ad8eb6a2d2696bff8eaa6fbe0c4bc3d346fda SHA512 443158de2cb28a88ebb5c85e0e705c152cedaa90c341f3b4561ba290c257313ff709b188ed1ffad4ada886e999b3afec74ee1c9f92283b96dfb9491be4119925
 MISC metadata.xml 467 BLAKE2B 384be2f35e1176fa3bdba972d8ec7c9c28958fb5b41faa68a190a72654967dc9dc0e259d8883d18bf5ebbeb366b7c445dc18050a0386b2bc3dd552a7cf3dd119 SHA512 7b75ccb2a04fb846ff020c73d8e59fcff114288cc1ecac307d5d40726553e6028b3e7b47cdeadac03bcd2b90c116c599a2583e5b48af0636a928a0d239f8a5ea
diff --git a/dev-libs/libdbh/libdbh-5.0.19.ebuild b/dev-libs/libdbh/libdbh-5.0.19.ebuild
deleted file mode 100644
index ffa6f88eec88..000000000000
--- a/dev-libs/libdbh/libdbh-5.0.19.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# eutils for einstalldocs in EAPI 5
-inherit autotools eutils
-
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="a small library to create and manage 64-bit disk based hash tables"
-HOMEPAGE="https://www.gnu.org/software/libdbh/"
-SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	sed -i -e "s:-O2:${CFLAGS}:" m4/rfm-conditionals.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index fb32dd440925..87060b5d6d1a 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
-EBUILD libevdev-1.11.0.ebuild 1111 BLAKE2B a441858e338406d2466d8f74994df7df6031361cbf4eab9de748ce1ee59ef326df8337498ca8c3d3dd1b36b262eca501b0904b2605effed1c9190a5199bb1ac3 SHA512 d3172c7f843589d8bd373288af2b38cca467b71793ef323e22726e7e055c9f1a777e962f876814fdba66a4d337b762f0cd02e662fd6b7de00dafc4e1ba7c87b6
-EBUILD libevdev-9999.ebuild 1119 BLAKE2B 4817d8e335bd1f409e33813d03e19ff45727e6902a9340db6b67fc13f03cf2373e989f3ad0f69b77b8975ad90dec1f6c960aece32e92656d9a295b458c4e1caf SHA512 379a7786ee845919e75e1577aabc7f8460723ea2758de577789e73e3b30be0acaaf6461da790fc0ce96a5371e24abf0aa3e6f6e4fd01e1e8da6094eb1986ac59
+EBUILD libevdev-1.11.0.ebuild 1111 BLAKE2B f10e33cfa17f0171956e65da7125225ff1d39d6356f48451465523fab1bb0112f6842aad3986c7720ddfc240e6cdf9162a7394038893ffd23d0b44badea90013 SHA512 9903be70f11c5ea07ac6c4005ad698f3a93068f8d30118cdade48833423ae73ddee35660e2a7d54a4cd2309a5e865d30ad50347af8ea445529eb2b0b4473d831
+EBUILD libevdev-9999.ebuild 1119 BLAKE2B 7454c31abb9ea204726b25bdf082078716cca0e911e3012121c06cb37663ebf911e48765a5e718db2b65ace23cebcc305e34129576e4bb1ff863829520f21b6d SHA512 805de4364e75326dada41594b727af707f8b1682b990cc4871a475a545b43a4539e29b57b26bde18e72620d38f2dbae0139094e8d00b4c872b0bd174a83fe8b9
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
index 01acbddf9775..39c22f360654 100644
--- a/dev-libs/libevdev/libevdev-1.11.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson-multilib python-any-r1
 
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 7a92403df430..a5a5af24e1b8 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson-multilib python-any-r1
 
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index b8c65fbfdf41..b1eb3a26e87f 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -3,8 +3,10 @@ DIST libfilezilla-0.27.1.tar.bz2 568252 BLAKE2B 5ab11e60a3df1e56275b0a1eeb94a91a
 DIST libfilezilla-0.28.0.tar.bz2 572028 BLAKE2B 579881b1bf127f709cdfda61efb71cce3df741152124b74a2f7d718e43d7d71ce678ec6ba10ff61926b275d5b9e69f8df0f9741a0ba1e9b5ff2c51d35472d10a SHA512 e14bc3d5d20c62f0910ab55aa6466590a0d55aedf534e7eb67481a65b372c62fd0015506a1acdc476811aa2c0ce7561f30e79a10f994dfd98014e4ed4b4f471e
 DIST libfilezilla-0.30.0.tar.bz2 578592 BLAKE2B abfef274989b0ba31d9237394aa1e88012e9fe9d071c11e7350e0ada8d5da54d7cdc93f46f65b38fa9a811a638210238f42de99fdd6832f97ede3808723e5d4f SHA512 f05a1ef2be7a6d32a6c5adf8e02f2b17e83deb67bf7c67b1bc1fec539a7235903d91dd3e98412aa1b90f1fcb322cb9ab54d3a1ff4ec44889b4dcdda6984300c9
 DIST libfilezilla-0.31.1.tar.bz2 585070 BLAKE2B b7cd275ee39d5ac62801889adae79515c056a5f838f4348324c0f5a975d3cc45a058b4c7d37f99179efe6808464b7972c31e300ae9e05371134d7a149b5616d5 SHA512 072ae343bc44939deff435078c29954dc60e4bb5079aa705b7445bec17717919d4957858538284e4f131d734439743bd5d39085a618ea41d586be8be887cf2b8
+DIST libfilezilla-0.34.0.tar.bz2 593998 BLAKE2B 3f3563389f4dfe3667c8c1e46d5f4ab76e02f93188bada3c15e974405c49e0d1346813e64457ec5b60bdeca98629e5a05941f76cb375bb229eee759cc6ab5246 SHA512 960908aa570704e983e51e2eaa13a7fb688587bd1f3c37ade6a3f1b3f5379d0b9e5d3c727bcf58f033a1cc0fce2fc34e2fdffdb379ad5be85de917c0a590de22
 EBUILD libfilezilla-0.27.1.ebuild 1241 BLAKE2B bb00084913fae7dae260d3ecff107d4bdfd27fd8b8a5338c05fcbe9cc521a022b2daeedb6e341b97ce529646f0a415190bcccc06564ac017150c28436e959330 SHA512 edb4e98d5d68d6848984eb58c09605ae170f19f7be44bfa183f880364b40363c14dc2a937634696e941b3981f23a1274df731f4864f054f1409b693fa087cc16
 EBUILD libfilezilla-0.28.0.ebuild 1195 BLAKE2B c437655e4fff0fbc8a2b04316f48d0294c3679a532c337af8fe4fb6a521bf79febd33ef366ef1c46746202f01a8b43cef68d65b84da9f1dbe72461d229b50d56 SHA512 00c1b6556ed183280ed87e7c73529440043582ae0e818b06de66e614199c293117794e23443c2870c787ba22f5b7c0b20cc8a95681dc818df7d0fc203a84a48e
 EBUILD libfilezilla-0.30.0.ebuild 1195 BLAKE2B 6542369e8d9785df7603b283e63bc14cb0cbdcc208b4eadc367a89fc286435c62e5763fe6be8de6aec9f17cb9b6a4b52c14f342d95e642a949cb26a89ccfb052 SHA512 e60c681739a20877635e88cad841942eed0192812be10ebfc30022fe9781b3924a635418bcf89099fa02892f196c8366e6596fcd1f2c8fd123b432447d2bbb96
 EBUILD libfilezilla-0.31.1.ebuild 1195 BLAKE2B c24e1fa7f4264cc320a4fd2f03dd16de950f48e5faf750939b2b26e9558e6432b6f0b7baf0e6c5c92907664ed7dd624ebf7dd67dc46e7f4d9fc75f34699a869e SHA512 7b2a20fdb5be7e1d34707c91a241ca820803fd5dc56190fc39ddaa67e200627eea62dbbec114fdf47c456093e03003d1fe3b9e325a1f9f079d25af19c895d5aa
+EBUILD libfilezilla-0.34.0.ebuild 1215 BLAKE2B f28398b8f2649d074e87cbaffa0cb8713c4a0ae97ee0e009f360302ece2c93b544546308c8178a200de8665e8f316f7e554c28850c5289fc6e54689df999728c SHA512 03f1a0a9c7c6a94e83640d751fe909ef9161de482b09d6749ce6d4dfb0050e1fd5c4320e31748d4c9fa447759f2d3e9e35cf4f88c79502df443f43a4404e059a
 MISC metadata.xml 1136 BLAKE2B 9db086df9b33ec49950324ad327f9746b79667dfd61028ec173ac71fe16000549cf6bcf2270f7e8c3f85e1ff2de88620867db9f52cd6530716154cd1ede8902f SHA512 2ccacf35e9b6f503ac4e46c6705cd032ba4895c02c8ab9f3da6898ac20f4dff999bb8a649f71d4a222fca4b9237b0a7d819d6929468390df92806fccb82be781
diff --git a/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild
new file mode 100644
index 000000000000..91f14170584c
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/21" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 7776d5937f47..7602fd0ee8a6 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -4,6 +4,6 @@ DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808a
 DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e9c83acc5547a4d43ef9ada9b0b7c78654cdc24f6cd0db012d50628ae4ec9320dcb63a901ec2dadde6a7ed56dbed7e SHA512 9861f3b5da3cb013eb79efbf2859864f8c2c11b41484b051c981c45cc0bf1569202838226da10ebddeb7a7b7f39ebd3a95f107b9bf6f908074ccc9a51ea94db8
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 EBUILD libgcrypt-1.8.7.ebuild 2307 BLAKE2B 07fbec8932d2aa100e835463a98cae64451eac74ad8e0f9d96d642d7f7430bd4e778b82e6851c537f3e31a11b5acc52a396bb9c86cb21d81556417e0ee49e922 SHA512 8225fbe1f3154766235ae022bae1e0a31287ff6b27f6cd68b549724c13469ed32bd6387817b95bf6e2baa5a6b6be28b0914043b995cd1d0ffd258dfc200134a5
-EBUILD libgcrypt-1.8.8.ebuild 2319 BLAKE2B 44c283a4f060218aec481eb0b2a7ee4254b6cdc9839b9cd2a5bc06d710da512c08eaf8d645649a50aeb7d8670132fc7c0953c1bcc6fde2dfd8e0358fc7eff8fd SHA512 04258e2f8af72ab67a5171e0fc767815b0e000544fe9d289f495c7abe35450458e1fe062905aa6d9400eccb676e208fffcff4cea3886efeecc232e32d5868914
+EBUILD libgcrypt-1.8.8.ebuild 2318 BLAKE2B 335fffac9a01ebe760a019fb668ce229f22ac6bc6aea38d2fd893fdda587d76895b0bf27146a32c4817d955eab4ac5ae9aa032a3157f9dcf3ae07a98599cc60e SHA512 eea978726cb25bb0c9de94b8617cabd3e5c28b20010ccfba2f4124a4609b655d496ea376d9d72bf07c031116433f74c03d69335950ce295d922ae83801a19ada
 EBUILD libgcrypt-1.9.4.ebuild 2802 BLAKE2B 642897f4dbb962c190a298cefff57212deb1ab759570184697f559f97d63bcc93008167dade91d207e08164b5496202f896aa25cac103f7bf70d288c93744cfe SHA512 fb8ade270e82a45dc3f8449af41454310176fd8a72a50ea44399992fb8fdff35fa3e241699635f8353cfd75f3d9ed632da253a6f8666a968f8bba1d1ad98fec2
 MISC metadata.xml 597 BLAKE2B c16e58e302622a51420a94adf5a3f47bf16e49cf5c3e21f5c552d1f64a533aa9ad9a58ae15fb4a314bf7bc833706f0a35ca74305fe96e40a6f8a5b20a267e2c6 SHA512 0d5ea002080a6e0d656c2be39b725168a323ec9536ec85cf791d64d7f0dd8255e3dd541934866c61d61d19789860fc71b2f6fa11ffdfc9b83c8177773f451632
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
index b3ba8ae295d6..45f5a784c691 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 9011ef8909b4..9895bba2af1f 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -5,5 +5,5 @@ DIST libgudev-237.tar.xz 29060 BLAKE2B 5d39d4d26d8c8b3fa877319c294036294dbda96b3
 EBUILD libgudev-234-r1.ebuild 1031 BLAKE2B e9fc631fe3b5d56bf098701f0eb94fd82a79601e2e251905df9092c0650dd4465949be740d70fc5a1948ecc609d58af85695b804897196963ce383dc7a9a7e32 SHA512 d7707c4a4df0f19cfc37395e65b804b1401f7443c4de90f02f72b05e9c348f0dc02115c78a8f582f2f4c01fadc8e352eeae563c8053e3171f91c4ccdb245d22f
 EBUILD libgudev-236-r2.ebuild 1257 BLAKE2B fde97372a639c3a08ca0e63e538c2995f7705d56ef2900031414c9423bec3f42b52e08d375935f7e796df986a3e3fbde3a3c60fbe923f10d577b9a8ead97ed3f SHA512 4b5404579aa1f0548260ba7321ef4ddb6e8344e456d7b5808f82371026e686feb4d8c7a8dc60dc0a714e66ca0f9b4f7753da249d0d4d3f41d2ef530bd4d09fe4
 EBUILD libgudev-236.ebuild 1070 BLAKE2B e353dceec8a5bde960cad17d994f0d861eb2b619a191235f6d8a876cad3daecea52fee39f176d375fdbc0d86c51015c99785e3e4c2335fc5fa707cd8cfa41e85 SHA512 9c84e51ae33a92da3046e6d878379e0574277c656d83382d16c39a466c18ce9ac01ab21c55b1f8e7fb188f63f0a994c34b439575cad62b9e5daac6819405868f
-EBUILD libgudev-237-r1.ebuild 1234 BLAKE2B 65f2b65d51a1719a57469016071c607f35172c65a910bb6a0d3c8df389cd99aaab9ec0d904cebd8e480a30fb064f3df740c6d1132f7431ef371cc2cd293e4e69 SHA512 bbb809ef75fe4931c4d216817c917b216ad107009c6a32aae492f6e3c0e45a83f3cc254facead6474d9c22251e4cb672a5ddf5789ac8d2a6efb33a2f7f39a582
+EBUILD libgudev-237-r1.ebuild 1233 BLAKE2B c9f2a4712c14f1cab94a95fdb72c0cdedefcabc2dda3784bafb4c798b056edd2ce9935f245f8d6f8127b66b70fe746e6b0c4b419414b7bd9cab63cc2d6fa2019 SHA512 f7409b14d67f73cdd8afa5902342550d8b164cd000163d987f72cc2b69993c25107e69e987a6fd5b2cf46a4eafe12bf5eabe91b71577d438320de9cb2ea3b83b
 MISC metadata.xml 334 BLAKE2B 16d65758def16c080294ffb595910025504d5a99302bf2e6901a9e24780ded6358396e7a7376538c5d6236f4fa277d450559d601d2969b417a81a3b54d607a96 SHA512 2ca5619250aa499b2580f036db00a273f0d719dc1ee283e1e6931c1a56d87275e130fafc9ef8f776aa2894b11ed3adb895a1f8cbf75a03bbbd86a3a9b3781075
diff --git a/dev-libs/libgudev/libgudev-237-r1.ebuild b/dev-libs/libgudev/libgudev-237-r1.ebuild
index e9323284f1a7..0e8919dab601 100644
--- a/dev-libs/libgudev/libgudev-237-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-237-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index ef1df19209a6..f3ca120b38cb 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -5,5 +5,5 @@ DIST libinput-1.19.1.tar.xz 654600 BLAKE2B fb1c26874e29fc12d5259b00e0790d65584c8
 EBUILD libinput-1.18.0.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 EBUILD libinput-1.18.1.ebuild 2237 BLAKE2B c4837c5b445f2593b213b08592bb95560ebd951e9c2444ebc372d0e3c43735edae2ff965b27c07eabd148209f8d2ae2c20504297611725aeb8a864a2def8e95a SHA512 ff7d787e1b80672225acc7d82179b9074db406411297b13e9f277fd32965e6e8344043a55272446a702733c51733b80d1219ed40a5d68f21d23a14644b955f39
 EBUILD libinput-1.19.0.ebuild 2256 BLAKE2B a5c89595ed81f17ed42ec1803995eb490c2394ad94449a37c33ea678b6bbbd4acd65423e3b395aae4d150f3496cc75cee4eab18e3b0a106ee192fd7e817fa472 SHA512 7c1b12ff9408f7cb383cbc9fd17665769addfeb5731dda2f2b607964c47eaa22bc2bb6429ba9bda88f7d50a3eea49dbcc6d0dc35084fd39f5dae747e52e05f40
-EBUILD libinput-1.19.1.ebuild 2256 BLAKE2B a5c89595ed81f17ed42ec1803995eb490c2394ad94449a37c33ea678b6bbbd4acd65423e3b395aae4d150f3496cc75cee4eab18e3b0a106ee192fd7e817fa472 SHA512 7c1b12ff9408f7cb383cbc9fd17665769addfeb5731dda2f2b607964c47eaa22bc2bb6429ba9bda88f7d50a3eea49dbcc6d0dc35084fd39f5dae747e52e05f40
+EBUILD libinput-1.19.1.ebuild 2260 BLAKE2B 9babe7b5ddf3d1fec6e0048203cb29117189ac7315358f47ee2eb7ebc69d5a2e891532b8ee2d618c9e2ca845b88d00302d603896e2253af253c71b40f6f7b4c1 SHA512 be57cba2f8dcd093a199bde1c9d28afdf78ce6976b55f73bc07964a537a0f7a5f5864c1fc80ee13fd2cbd88f1edc983b1755c6472b7c11244785071af2ad8b30
 MISC metadata.xml 449 BLAKE2B 677e5fee3bf4047ba47b90aca7f30b9ce57e947e6b5f6903cbb93c214b084f0d93f6253980090544d4ff4a821263c156e0706ae5499cacbb2e52d629f3a7b253 SHA512 103e8b39ad6b9ffde159095dbc4553d8b695db44e49582518055313c79ff6123bcc424c3980cbbaeabaa455e00a828039f73c1f3424ce038d5a2d63ed3e7849d
diff --git a/dev-libs/libinput/libinput-1.19.1.ebuild b/dev-libs/libinput/libinput-1.19.1.ebuild
index c16d3716f3d0..8a59c1743716 100644
--- a/dev-libs/libinput/libinput-1.19.1.ebuild
+++ b/dev-libs/libinput/libinput-1.19.1.ebuild
@@ -32,8 +32,8 @@ BDEPEND="
 "
 #	test? ( dev-util/valgrind )
 RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+	>=dev-libs/libevdev-1.9.902
 	>=sys-libs/mtdev-1.1
 	virtual/libudev:=
 	virtual/udev
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 9ebb9ed7fab2..b70b5a216c47 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -5,6 +5,5 @@ AUX libmemcached-1.0.18-disable-sphinx.patch 264 BLAKE2B 6b26230f2c79d4f9f0cffcd
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 AUX libmemcached-1.0.18-musl.patch 1495 BLAKE2B be213de08d246829d5a017ca4f77c7c4581ead106c7ec817511698f2d66bca3271c2d2ab5f2017a15545538787f0c3a6bee8d0b148b180718fd43809a6bc6b6c SHA512 ddb0594d826d756115743caec69762995fd25e09fd3765c685cfd558e2918ffad0679fc2872d37c8e1954cbcdc14852dd861fcbf9eac645f47a86265ab2bd651
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
-EBUILD libmemcached-1.0.18-r3.ebuild 1608 BLAKE2B 9f2407ed8d539dcda7af004f743f4e99cccbc20d29d6ef1670a5288c51a9137da8ddffb5ea93d4aacee8acdf64ecbdd1e310cd971fd04dab2645bcfbf3efee79 SHA512 1dce280cc7a5d9b3aa3ec5a6880747f513faf5d6390078c1caef1cd3b7617eb997a5fa205bb4866bd8d803dfc57511a230c948a3e1eb23496519f41dba576f1f
-EBUILD libmemcached-1.0.18-r4.ebuild 1412 BLAKE2B 36bac5bd8bdb31b5eab5cd1f64b7d0188020b539c7e308128a345bbb7b948e17c8967851cf4afb1cb00a6a04f8fe6d843bbe7aba3e5765427fcfda15cb01440d SHA512 580b63b314ff87a1ef1dba80c54f32681c60a3d188cbd794abae2d37a18bd31f3331117e67cbdd6e60ebe2be5991faddd9a3d6eafd00b64f001778ec1e9f59a7
+EBUILD libmemcached-1.0.18-r4.ebuild 1405 BLAKE2B 31c13537a1643368d6b61c8345ca831f87f6be44c8b9a91bf3e170598834a8accbda232a4370cfe2ef2c21f81f1bd7184820e4ef0d50be66fea3f08d3671abf5 SHA512 5506713ed94046270f469af8595e31746f6ee7b03ccd9a5cf9725d87cbf5fb2e22b12aa65589c29da7287194dd31e9eabf64b82ceadc2c07866135f3a7347f3b
 MISC metadata.xml 827 BLAKE2B b3e3a04c088a9119eba98099919684fc7b59205259b6cac2301eefbfe3623d4dac1fc9692abce68505af65fb8a5a277337488f18d32bdf6e3823199a3c86391f SHA512 579b472acfc9763e94e7ccbf8173327aa40cc89c7dddb4234e20e9106aab809ccc928cf197c81f5bea096c2c2fb6703aba518e003122d7e552f75e7d59cb2f25
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
deleted file mode 100644
index cca07f3e5255..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.13
-
-inherit autotools epatch multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="https://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/debug-disable-enable-1.0.18.patch"
-	epatch "${FILESDIR}/continuum-1.0.18.patch"
-	epatch "${FILESDIR}"/${P}-gcc7.patch
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
index 213043a11dc1..494ea66b4cd5 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug hsieh +libevent sasl"
 # https://bugs.gentoo.org/498250
 # https://bugs.launchpad.net/gentoo/+bug/1278023
diff --git a/dev-libs/libmpack/Manifest b/dev-libs/libmpack/Manifest
index 9a1a809de606..06ba00c5b118 100644
--- a/dev-libs/libmpack/Manifest
+++ b/dev-libs/libmpack/Manifest
@@ -1,3 +1,3 @@
 DIST libmpack-1.0.5.tar.gz 32966 BLAKE2B 8ad01de11c740c3efc7b42046b89f7691dd32d228e126485bc49224e54789e7f12a611982c0fd9d2bbe8b06d1ce2df1ceea1b302e139e30d0a8c31f251129166 SHA512 6e30edafcacfb580b410bc6749ed7fe8f18b3be0cb98959339853e77bc3ec0cda6df08a0f1f22768cfc773458a2ea6bcef4f0421eea55cf56c58981d13711a04
-EBUILD libmpack-1.0.5.ebuild 1313 BLAKE2B a442d80eadc638b6af35bf7abe6628c9f433d41d0185ad8b935356a696610cd0d9101398e0cdefc245c5c21a7630f5e67f77121e877e17c941e61777e2e92a8a SHA512 8ddc0a4a2d8b408ef12ef406ddfac55ba5662b2efd161d986ea747a26884154f843001d952eea454b09119f440bead40644b7f8836adb8c763f7c9ff1213c158
+EBUILD libmpack-1.0.5.ebuild 1320 BLAKE2B e97ffd6f0577790448f2e13fd534f090b644f1b67321373095377326a42a51f8b8d8cd875aa5d659cf742647fd1287d170c95ef6ffb5e49e6c4ab0d71874d29f SHA512 19c0158d623da72c4346dabe22268a97d80f109b740a5614ea2e3b155ed871ebe97032d2bd47a68b9a1787e22825b03600f9de3cf63e8026d5fb1a32f719b65d
 MISC metadata.xml 333 BLAKE2B f3e54e3a241a85adad55693f7dd3cc47cc646d1432b4281c264c849fb2a2bfc050aee53f5ae766063335b72c3ca91ed9054bac758d82c969acb61913f7282940 SHA512 aa83f4113099ecf8b749a070014b9d9c09fc1c0d4836f2cf621b2966088cf3ee73e26ab4f365063713db353671ad5937f98ffe4c87762c6e196cd57c8eb595ea
diff --git a/dev-libs/libmpack/libmpack-1.0.5.ebuild b/dev-libs/libmpack/libmpack-1.0.5.ebuild
index fdebde99d872..3b35596600f3 100644
--- a/dev-libs/libmpack/libmpack-1.0.5.ebuild
+++ b/dev-libs/libmpack/libmpack-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index 82f430252194..461797a57b43 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -1,5 +1,3 @@
-DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674
 DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5
-EBUILD libnfc-1.7.2.ebuild 1030 BLAKE2B 185e653a815d5682d4dc9f31aeabca00c4ff5612c622f9da6763bc4db30d1d304b7088052e77a47894774a2951db3c89f26a7c066e1674dcc87e8861a9a6ecfc SHA512 6dcde7d4f1af93ac238d6ebab7ecd27b85210c18c61d5fa0d99c6c6f2db75549d7d824ad7d7e723dd5e4a9532053e33147905ec53125582d273ec3047ac940aa
-EBUILD libnfc-1.8.0.ebuild 1030 BLAKE2B 185e653a815d5682d4dc9f31aeabca00c4ff5612c622f9da6763bc4db30d1d304b7088052e77a47894774a2951db3c89f26a7c066e1674dcc87e8861a9a6ecfc SHA512 6dcde7d4f1af93ac238d6ebab7ecd27b85210c18c61d5fa0d99c6c6f2db75549d7d824ad7d7e723dd5e4a9532053e33147905ec53125582d273ec3047ac940aa
+EBUILD libnfc-1.8.0-r1.ebuild 1050 BLAKE2B b89dbe3c9f21a5637836a755b648c0d6e5853b65b380acb99cc81c120e6c08f1e9305dabab00bd14d773ed46da7851edf97086fb204d09f947cede68f2fa344e SHA512 6a4e1fb8df883712b67eec0fee8ee97d93e1eb15aa56a5c981870074eea7dc496a6aec964d16d9829473951f0cd019f8dcd7f56b185b1d1d2d9e3852ff4c15a2
 MISC metadata.xml 389 BLAKE2B 699fb3cd9d37fe58a3f4d4c80bdad576dfae94d3f45318107c08741ee2cf5dd0c66266987e4c80321bfa69e1b7c5ed8e987ffc93e058d0b709c56dbef5477c72 SHA512 abf7bbbf9ce7e0364690079bb7ace4b3db320ee0468f76e80182244432ef8781249b1d7df66c361644fbfe8e0e843fda4014704792b64677769e8b4e48a33d52
diff --git a/dev-libs/libnfc/libnfc-1.7.2.ebuild b/dev-libs/libnfc/libnfc-1.7.2.ebuild
deleted file mode 100644
index ae5228fdac73..000000000000
--- a/dev-libs/libnfc/libnfc-1.7.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Near Field Communications (NFC) library"
-HOMEPAGE="http://www.libnfc.org/"
-SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc pcsc-lite readline static-libs usb"
-
-RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
-	readline? ( sys-libs/readline:0 )
-	usb? ( virtual/libusb:0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
-	use pcsc-lite && drivers+=",acr122_pcsc"
-	use usb && drivers+=",pn53x_usb,acr122_usb"
-	econf \
-		--with-drivers="${drivers}" \
-		$(use_enable doc) \
-		$(use_with readline) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && doxygen
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name 'lib*.la' -delete
-	use doc && HTML_DOCS=( "${S}"/doc/html/* )
-	einstalldocs
-}
diff --git a/dev-libs/libnfc/libnfc-1.8.0.ebuild b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
index ae5228fdac73..fba699e4b06a 100644
--- a/dev-libs/libnfc/libnfc-1.8.0.ebuild
+++ b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Near Field Communications (NFC) library"
 HOMEPAGE="http://www.libnfc.org/"
@@ -10,33 +10,40 @@ SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc pcsc-lite readline static-libs usb"
+IUSE="doc pcsc-lite readline usb"
 
-RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
-	readline? ( sys-libs/readline:0 )
+RDEPEND="
+	pcsc-lite? ( sys-apps/pcsc-lite )
+	readline? ( sys-libs/readline:= )
 	usb? ( virtual/libusb:0 )"
 DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
 
 src_configure() {
 	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
-	use pcsc-lite && drivers+=",acr122_pcsc"
-	use usb && drivers+=",pn53x_usb,acr122_usb"
+	drivers+=$(usev pcsc-lite ",acr122_pcsc,pcsc")
+	drivers+=$(usev usb ",pn53x_usb,acr122_usb")
 	econf \
 		--with-drivers="${drivers}" \
 		$(use_enable doc) \
-		$(use_with readline) \
-		$(use_enable static-libs static)
+		$(use_with readline)
 }
 
 src_compile() {
 	default
-	use doc && doxygen
+
+	if use doc; then
+		doxygen || die
+		HTML_DOCS=( "${S}"/doc/html/. )
+	fi
 }
 
 src_install() {
 	default
-	use static-libs || find "${ED}" -name 'lib*.la' -delete
-	use doc && HTML_DOCS=( "${S}"/doc/html/* )
-	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/nfc
+	newins libnfc.conf.sample libnfc.conf
 }
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 1c840ee389df..28cc485620c6 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
-EBUILD libpeas-1.30.0.ebuild 1968 BLAKE2B 246c675b6753f318a830821717717778e0a7966bf3939f19c6a5edb2abdf50bdd354ffc3430ee3f067a0e86804d4fea60f9669274a6b1777ae6d7dc25250f1fe SHA512 16c8ca60a05107943a79791b28ad256516c6ffceed97075d5b650088ac288e85d3bb1af50df45f3726ee325bdaef4a7c07602a06a881389d58942c52d7f9ed93
+EBUILD libpeas-1.30.0.ebuild 1969 BLAKE2B 70cdf310399ca03c7ad52c01678b5627cf669eec971175c5842c502bc4561ca42997eed6581182ae8ab474b1fd8b86ab179e78f751842b77a8dacea64cb302ce SHA512 9524e9a8904337dd4a15aae436da9ab184265dcdcb8ab5595da19d305bf8a1a0eda5820873e88cb4f76a325d9c2317b711c272f3ac2790ad793eec97b2dcd9de
 MISC metadata.xml 416 BLAKE2B 9383d1583b61f2218efb3b8c7bf6855e30ab8ee3f4e0829b78f17832af533a6839e713c702e0dbdcdeb24a516badb446b935e0ee1abc112c2342c2f0ce321d81 SHA512 3fb271973b7b510983e84c2d0188688f04a1f6a1a80aabc15dcbdb14276608ed59ee3ea1f77feade9b08785651ea4f85e400d928a267651c40f0e490c175da62
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index a267bee72c7f..bfb4cc876dbf 100644
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
 
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 3ad2230094f3..82d367cca488 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,5 +1,7 @@
 DIST libretls-3.3.3.tar.gz 434208 BLAKE2B 74dd3d4e0a1aff8295b4c5023c2736006c2a8a0dab1e82457c5ec9d4c27ae57816557810b3a714bb5bbb9a560eb0dd5667af1097f1727878b1844a3e8bfa4323 SHA512 21128107ce833690f43400b11c2a841373bbe1f045a6db5ad6cbcbee181ddf97c173bb05ba41805ee0324d7435a52ad3027551f20083df9a3d052956a412bccd
 DIST libretls-3.3.4.tar.gz 434605 BLAKE2B 08f85c420952599375ab3905238bb3fac474b2b97b6359517201dc85e5bf2d5dc9825c0ca186560435cf2a6ea5a6733e39d772116a892904ed0cc6f08e0f3f3f SHA512 ae6f1b7bf9f61948e88ce87c93921b2b27652d85a95062f38abe7dfbb30d40c974c79b7d6faab43b3a987abff5e761b5c2a1982af8cc1511fb3136c580a0e3d6
+DIST libretls-3.4.1.tar.gz 435404 BLAKE2B 11b828f5c058b929d1d4bc0cd3c53f17592c113f10f6bb73f8b7e672b5ab376e768e33893c4fcf5c0b447bc5cd30012c8aaaf5b639cb4962f4e0849ac3ee6cf1 SHA512 5d8b8d6cafd4b3c7e97eb417dad35a415bd69d599e9ee720f5598452a6750589b570ffa52718062d2ae3477df81b2316064577a25d2c68fa673082bb766b16ad
 EBUILD libretls-3.3.3.ebuild 660 BLAKE2B 8a49aeecf3e04a40250be81afb3141024fc5a8b5fb2b07a1a417c7224ed08393b334d839579d1ee658241a507d318a1d0117cfa0fd3e4ae8ee3b82f92972fda6 SHA512 3d366fbd6f4cb8ce708da2cf0dde0e94984ddb0f85f4563ae8f46fc315f2e9269834f773f6aa03242207ef61328f51f30f009f31adb2d94f3ba89a53cf1e4596
 EBUILD libretls-3.3.4.ebuild 666 BLAKE2B 4a03d1eb6005f5ce5325d9981345912d737ed39a3bc69537acf6a77e786f2701db555de7c822a2efee4a4ce7ee3bee7eb4af46762e2e7555ad856ce44f28fb44 SHA512 8a17029b9fb3efc80356eca3969eedb1f3ac242d7b52340ab874a29554993354e6f0e0d2f0b33627767724465ed060c1599043cd4e9c8d5d32fe04ab8fee7832
+EBUILD libretls-3.4.1.ebuild 669 BLAKE2B 4e6fb3eda557ffa19559af80e4887693b513202db8f67a61f47618a5d17580fc4502234fc921cb3c627555c640694a90bbd3551e3126614db14f7975d3f505ba SHA512 4710c7fa4fd92e09bfa17757084476e0f8550fcc11a6276d22ee694a479acd27fed20d4109b753a758b6ca35b4b56f8d4026a0e19789d56f1308b50550281d86
 MISC metadata.xml 361 BLAKE2B 9f05ddd1ac3e1a634962c9c800c3bdf60554488c61dff9b215866b24e0b2472d7c0873f0fd6bacec2abbab0e79faca728a4b22e34633c3dde64995b05b86db61 SHA512 c7b186da31da21b4ad5c5662325cb2757e3ee8d7cfd84d75a49b07aebd4dc882cb9b0e16ffce99a8ae2409a53dd750dfb5ec6eff0f9da9f4afee013f102ef688
diff --git a/dev-libs/libretls/libretls-3.4.1.ebuild b/dev-libs/libretls/libretls-3.4.1.ebuild
new file mode 100644
index 000000000000..8ee6adc2c9a0
--- /dev/null
+++ b/dev-libs/libretls/libretls-3.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
+HOMEPAGE="https://git.causal.agency/libretls/about/"
+SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/22"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index a43dade046d5..7bd8e2496c6b 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,5 +1,5 @@
 DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
 EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e
-EBUILD libtermkey-0.22.ebuild 984 BLAKE2B d2026920989f636c339058ac83b0ecda50c82d7a386ffb18840e530c3a6143ef7dbe1318ad5b8efbfee0f028de665eee142196d8477e281a623085ff16e82e1b SHA512 ad9a012b24b91eee34532c8e08b81d936d4e4f85b696c291a00867a7791ce4284b47f40c2789216ab525c492be45ca96d83551ee3e925357491ed1ff8f83e11a
+EBUILD libtermkey-0.22.ebuild 991 BLAKE2B 603a7b0bc41525bd0b8e3b2ebd374e3b96b5f844224934903e8c9cad292bc5cb0e6f7ce8bf919318f03b054d43ca87cca46c778992335124561b2e9722606a75 SHA512 25432f5e2da375485e155dfddcffba3daa269bb6179535e59c9d6da309691b091ac17b70705ac61f8c0122b24d913ded2ae1c6ac8512e2a45eb3830a09eff11d
 MISC metadata.xml 358 BLAKE2B 555dc6dc5edb485ded5e2fec2eef70426c2e693853954c5feb8d39914b1cc88aed79dae13df257df86193701e9f842fad8e4686941d3a143a261e289ebc0960c SHA512 1a9faab554e113b8c3c83ad7a6e24fa71ed7ea3838a11677465cc824c7181d512d58443b5ea2fbd52492345e62db5895e3f17a47dc7e413842b02cdad85c5411
diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22.ebuild
index 5f60647df324..3f15192f8ff7 100644
--- a/dev-libs/libtermkey/libtermkey-0.22.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~x64-macos"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 14a171cb3279..43f442411f9d 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,3 +1,5 @@
 DIST libthreadar-1.3.2.tar.gz 442260 BLAKE2B 2a743fbcd8ae0b462910b7ccde34a3fcb90239df9bf608c9d249dd9bf100315ade3b2151339ae55b1121709446c23044c3fd7bb420efb009ae8d5fe0a21a496a SHA512 6edc3a1a6eb41a3b9ada35327d712fcf3562875dbddd0bd2f3f016492cb0f10fe669ed1ac3a65573d88261b4de50201b2abe8dcbffa0abc5cc257d7a8c3c4df2
+DIST libthreadar-1.3.3.tar.gz 442979 BLAKE2B bf310487fc377d648610157953ff8be4b5ae1d1ba046ac18743c0a83f3cd1b6a1a0fffdb917cb9744f48a241321f52300e6627ed398918a934bfc61c374f8d10 SHA512 0ad4ea503ce55a5482275d6a1a0eb4b7b886a26646db9e21c458d28898a473c1ed028c5c08ce7db82e9daf100bb1944710ae3f67f829cb883265f053385fc8c5
 EBUILD libthreadar-1.3.2.ebuild 912 BLAKE2B 48391b40e27a540218552b5abd895476a1bdba0aec771bd6385f56ae90ce5bb97f0971a11bf4133f4e16072dd8faf83e3404a384cd77ad144074b1853f8bcab1 SHA512 e383c7048c93936ef171bd945fa658350a81aac641a00fefc06b13cafd5bfa48ec0b2c3e20ea035e858c1772ceb7fb27425150a55fef2d60256c2591c2faef98
+EBUILD libthreadar-1.3.3.ebuild 491 BLAKE2B 0576688a8965d61d116eb33040a6eadb27d47df3531a2e8c6209f0cd7c6faba1cdb3a5dda767a44b57087b5d05a0ac682abf7cab526d4100ca719418b4a25210 SHA512 715d4b6daa599ee8f55b232a7a90cc336d79ac26fb04360acae3ce1b0b19fc0c49299341eeedd0f7772090a609a5fea5043fe1b06132c80911d660304d9271f6
 MISC metadata.xml 890 BLAKE2B aaf5d415466806037fcc87f048d8ebecc04d3c04613e828a3783e194f265bd25938d98e1f83d778c0e970e458115654faa87826af0e1af58f02a5cc1660df08c SHA512 7bf58461d45c6c9e00e3987aa7d66202cab8382fc84e775c17c59158404bdd5d179975d0afdf383ed654e34105820fcf2a83436716eea11c3f808a746d7291dd
diff --git a/dev-libs/libthreadar/libthreadar-1.3.3.ebuild b/dev-libs/libthreadar/libthreadar-1.3.3.ebuild
new file mode 100644
index 000000000000..56f7aff09459
--- /dev/null
+++ b/dev-libs/libthreadar/libthreadar-1.3.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Threading library used by dar archiver"
+HOMEPAGE="https://sourceforge.net/projects/libthreadar/"
+SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest
index acde352215a7..165e35d8d41e 100644
--- a/dev-libs/libuev/Manifest
+++ b/dev-libs/libuev/Manifest
@@ -1,3 +1,6 @@
+AUX libuev-fix-tests.patch 378 BLAKE2B fd5f675e9734e10be8c136b44ee8eeb3ef7ce3a4182051c2e38009e004d8854a97c266ec126b5037f66f95961eb485ac5fd2922f8dbdb9a9134f7c2b3df05775 SHA512 85fb791829d08ec42725157f8d90b7101b8520f9c25fe5207db1baec53d340574298f4d288f0940ef4bf3eff447452b98cd0336051f0f87fbe92946d8977f701
+AUX libuev-large-files-fix.patch 412 BLAKE2B 4deb78a3702c0dfa2fc0bb86b21be32abb5e94d3a14a37f5385845cbc8661404a8c896ac1de800e7ddce63af2e1072558f3740af9ebcc349dc52c5228205d04f SHA512 a4536d9f0bc4b877a6e0fd8b404e740f0de492b6a083b59a58da6cae5090f421d2306fcb20644fa3833dc7f07db27f7f3e14bd4d1e01ea33dc34b193822ed603
 DIST libuev-2.3.2.tar.xz 247784 BLAKE2B 30f9ca2d71c2f05173d4c5863e0dce64e7a77987e3472b11ac5f3ecf677712ddc5fe9e9cc9587f73d6a5acfb716d02dfa744bb301d55b834d44e944bf09f3bd0 SHA512 dccf83ea61dd4841d2b7e1e75b8c46f41607b26aeefd49bc3d594d864408a282c2ff4cf6ff84cf596fe3382c02e53631593f12d5b79afd9f2e57fb9d021b60a8
+EBUILD libuev-2.3.2-r1.ebuild 748 BLAKE2B 79116713035e509f1bd113755dda16ed2e39d8628f58115010f5e5124d9d75fa8362c444894321e94b2e2bee0d039f9018d6863a315fc88d2b78c66e4aeb11f8 SHA512 2088a9bb455953c2e839c0507544adeca41051b785a37944dd88f67b5bfcd359c372491bea28b6d042675ee9d702a40c1c68043592be0fbbd57956e586ddcc76
 EBUILD libuev-2.3.2.ebuild 562 BLAKE2B 438adf14a6c25b8a7e2994c761650a02f2a55f976971cf5ad7715881b65a7848ee8e468934d45add587e69d23dbfad3092d4872fb1674f247b5739a80ea11944 SHA512 862d201fc3db9d81182a155f3d30c86ce7b8399ac5315810bcd440d1fad73d65bd88fabcf1ec85992bba3f0b0db355a0eb492b21908f552506263644926e17f4
 MISC metadata.xml 728 BLAKE2B 53b2361b48ee3ec6aefd2df57085086744ae67b1e88a2327d22e3c608165e3147209639d9ed44c4a0fb5fdda85c970d4140211b6f4a3508a079e67b4073a78a6 SHA512 ead8ab50cf78faaade004f31faaa6c5090df43e95afe917d0ca302af45adfa9f6724f14c955bb5685f3434749e1593e1271eed707ffaeace9c2960b31dab81f6
diff --git a/dev-libs/libuev/files/libuev-fix-tests.patch b/dev-libs/libuev/files/libuev-fix-tests.patch
new file mode 100644
index 000000000000..68e4b2c4fd6b
--- /dev/null
+++ b/dev-libs/libuev/files/libuev-fix-tests.patch
@@ -0,0 +1,9 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -14,5 +14,5 @@ check_PROGRAMS  = $(TESTS)
+ 
+ # Ignore warnings about unused result, in e.g. write()
+ CFLAGS          = -W -Wall -Wextra -Wno-unused-result -Wno-unused-parameter
+-CPPFLAGS        = -D_GNU_SOURCE
++CPPFLAGS        = -D_GNU_SOURCE -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64
+ LDADD           = -L../src ../src/libuev.la
diff --git a/dev-libs/libuev/files/libuev-large-files-fix.patch b/dev-libs/libuev/files/libuev-large-files-fix.patch
new file mode 100644
index 000000000000..61a4cdb3ed27
--- /dev/null
+++ b/dev-libs/libuev/files/libuev-large-files-fix.patch
@@ -0,0 +1,9 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES     = libuev.la
+ libuev_la_SOURCES   = uev.c uev.h private.h io.c timer.c signal.c cron.c event.c
+-libuev_la_CPPFLAGS  = -D_GNU_SOURCE -D_TIME_BITS=64
++libuev_la_CPPFLAGS  = -D_GNU_SOURCE -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64
+ libuev_la_CFLAGS    = -W -Wall -Wextra -std=gnu11
+ libuev_la_LDFLAGS   = $(AM_LDFLAGS) -version-info 4:0:2
diff --git a/dev-libs/libuev/libuev-2.3.2-r1.ebuild b/dev-libs/libuev/libuev-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..f8a20c0605ff
--- /dev/null
+++ b/dev-libs/libuev/libuev-2.3.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Lightweight event loop library for Linux epoll() family APIs"
+HOMEPAGE="https://github.com/troglobit/libuev"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-fix-tests.patch
+	"${FILESDIR}/${PN}"-large-files-fix.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for glibc/LFS patches
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-static=$(usex static-libs)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
+}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 7b03c1589a58..39ceee7e6f12 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,7 +1,5 @@
 AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db261f8ae7c4979fc3965d32d7d8acd6c6edad4a4e9afc449e36df0f7544ecd1823bceba17ba456f21b221c78341243 SHA512 23be80dedc692cae3dc67d66834c937a890f781a9f73c68ebc3181130a5f33f981f822ef026464f77aa134701505054cbf76cf852429d0b3194d6a48773a0b8d
-DIST libuv-1.41.1.tar.gz 1281506 BLAKE2B 4102df9559724c4f6bab090c57c8c976b7784bdc28243047c6c4cb2d61ce97deeb6f02e322238b98e9900575c981e8a586db852d5d34f0fd222a0091fc391a5b SHA512 dfd4996a2e8d6cc1ffe141921b2472070c8678cbbb8f0cf333dba7e7a36be0dee7fc3515152a27253252bbe48a9b29766d654f7f77137dd6f6bf0a8330c90fc4
 DIST libuv-1.42.0.tar.gz 1293478 BLAKE2B c2b46492167d759fd781b704dd256de100ca5bed62b0afe74fd8c46d5ecce15c53c4158d2e938314c578f26978e9be0bc69c4ffd0f40b2cd8419fa120df5dc2e SHA512 29982c975fccb99dcf28c8cc0f9fe9f15a0c546778b0723596a790021441b8be1ccece17f63319b5a1f0ccda8a846c0b544f9259d3482e84e14138461a0d882b
-EBUILD libuv-1.41.1.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
-EBUILD libuv-1.42.0.ebuild 1360 BLAKE2B 5af5b931ef11ee6105ff089dae358e1ba9600b1fdb69eb90ec0a14919ca477e34cb5f49202adab873d0164389cb7cd301c40d148a0cd1a4cb33f5b21c183639f SHA512 3b216ef128d41771f4ac01dc4b21823aa219afe68d94b2b318866eaf448f89a739849b03f8e54a21697bf0d40114634b9a1bbaac25d503a3ded305a88d040447
+EBUILD libuv-1.42.0.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
 EBUILD libuv-9999.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
 MISC metadata.xml 1426 BLAKE2B 79a040706bd2e88560fdf7cdd75226c51384f1b27f8f86798f3a694d1d4b02ce309edef4f1921f73e498533e37deff9051ebdaa6ae565defabe9d4546aa33bd4 SHA512 a6fa2c3217de06d7d324b37b00e0cb19e8d0b192cd10736d32f5d459c701c14a6aa296d7d4d292f7c56120953423df0068f3f71495941295c97e86c283b084d3
diff --git a/dev-libs/libuv/libuv-1.41.1.ebuild b/dev-libs/libuv/libuv-1.41.1.ebuild
deleted file mode 100644
index 082ca534234d..000000000000
--- a/dev-libs/libuv/libuv-1.41.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Cross-platform asychronous I/O"
-HOMEPAGE="https://github.com/libuv/libuv"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/libuv/libuv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/1"
-
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
-		eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch
-	fi
-
-	# upstream fails to ship a configure script
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		cc_cv_cflags__g=no
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libuv/libuv-1.42.0.ebuild b/dev-libs/libuv/libuv-1.42.0.ebuild
index c64a64a9f971..082ca534234d 100644
--- a/dev-libs/libuv/libuv-1.42.0.ebuild
+++ b/dev-libs/libuv/libuv-1.42.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 6f0c146cfa92..dbe175004b67 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -5,5 +5,5 @@ DIST libvterm-0.1.3.tar.gz 69115 BLAKE2B befdb173a75652a42f3ba72682cc5c411ee170f
 EBUILD libvterm-0.0_pre20181126.ebuild 819 BLAKE2B 407c20beaada04be4a5ccf381780f9c4f3003a621f6fef0a300a261e58380a1771ab5448c4cdcfa2492dac558b18a083c5ec10bbb8a27b2ab948d08c72951249 SHA512 929568c1d1c5c56c43c39fb502cc1d08691dae6a6da69c6673baee415d8f17e6f0e7a0296d09d51ccac227d1accae9d147aef24762c665b516cdd154a552be07
 EBUILD libvterm-0.1.1.ebuild 877 BLAKE2B d7ccb94b2b5302528a32d1c5eb9cfd93b55a201059f117e5c07911a5f734e05d3b7a62c4694aec0b1e519c820e550ee65a41a28ae57f96454589477d031595af SHA512 f1a89cd21460683084fe86dfb511897ad60a45eae00f5d5f90b5053876f047fcbc4b8d1e81d1278e0486bf1e856f69c43a0673d5bd94e21b6197d5ebfeb5d85d
 EBUILD libvterm-0.1.2.ebuild 856 BLAKE2B f0280c1a73cab89dc1b306df9f2e690bb7ae4a524af4d1b5ba4bc1dfa12c07b4a777bf08214ce5fc27725e334fbd0dcf1a5d8baaf3e7ab808816caaa18620e7f SHA512 2de243264c74a0cb432b49615aa4400eb64833c502237c8eec95706625ca0b2130a5201a4f97c94b50d93d187ad9d79803e09a796a37100ffc31729249b98fcf
-EBUILD libvterm-0.1.3.ebuild 874 BLAKE2B c7950e6791458d4bc90123d20cd9df202552bf906dc86aeafaef30c90f04ddd852740c5dfe8e41e00e08bff76b2d8a93c768cc907c050a5180c8eb78f05cd1c2 SHA512 5dd4c45fa505acedf8be522a01f82bb2d2765f41d69458b56ff63d3412408d7a187f995009d15d7fe669d1c774764541eec9f798583a4957e78f23fd66d7312e
+EBUILD libvterm-0.1.3.ebuild 881 BLAKE2B e47aa30b6d333e556fd2970d15081166bc64b318f0a8e51089209e85e11f7d0c63acdd93c79e9d6164a6dfc9160d8853a284f92f4d758f72e97a6c118d254760 SHA512 591a3ebe5ddfa0f73d575abe1b78ad59205df61d6f4c507ac91c74279bc8a351fa06dd4c6f6d8cd76228176084546b15827d05cab80cda05eea312c70ff94312
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/dev-libs/libvterm/libvterm-0.1.3.ebuild b/dev-libs/libvterm/libvterm-0.1.3.ebuild
index 93b4531f0e54..47bea98026fe 100644
--- a/dev-libs/libvterm/libvterm-0.1.3.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index 869bfb1ec856..5ee2684b8216 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -2,5 +2,5 @@ AUX libx86-0.99-ifmask.patch 584 BLAKE2B 33c0ebeb0ca32b892cebf4bdd91bb2f82fefa3c
 AUX libx86-1.1-makefile.patch 853 BLAKE2B 48a25cd96bacd2e39bc8ecb4fd7988ab3775441f259bfe56fedf0f39f8cb894f3f4bcd64a03a6a5357ed064f9dc0e0b578cccbd760cd2056c564f2502f065d6c SHA512 a61e21ab31b1f22d898799ecc3db57e6816146488d436d3d33817f0ac19d420562830411111bacd8ca4c80a446c088fb931ee293522828076d0a1cae6e7ee0a6
 AUX libx86-1.1-x86emu.patch 1194 BLAKE2B e4f721ca09e081fb9f528ec95ea491a8267a9be8a169a12ebfd05d18425d473b89fe3e6d121ece254b6764a66a4adaeee9d811e619c6db1ce0c62178185d1ac5 SHA512 476d0bc7d3e903c1b1dff75577ea0caa80a5dd06618a08b24300367031ccb578322fcc267746285bcb671583407f22bfb7165374eeb2301ed67177ee18ec549e
 DIST libx86-1.1.tar.gz 87428 BLAKE2B cee90a446994816ce925a5b9edb3de5256f404bcadd9853ad197f13bdf4c86bf4c2def6d38e342ed9af5eba9e87400bfb76cad56852d44583b183853b65dcfff SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280
-EBUILD libx86-1.1-r4.ebuild 1223 BLAKE2B f465918876f219c1eaf76d5a223176c2a82bb1ee3d3cdfff14df433c9410fc6294fe53851f800e9b323442c3e3609683ccd0638cced62de9911912aa42553f98 SHA512 63789d27dc2c5963f24e64f3c7234ba75523f21b70270240d928a011fab4a3c5a1173ff7185f3ff971270fc7a3d4ccb005db217f5624a94ee9889358ea01f0ff
+EBUILD libx86-1.1-r4.ebuild 1242 BLAKE2B f982484fc4e2b7f8d4c8c92171ba039ed808eb503ccd205b366a6a29a4d8f0d0de6048921be7538055948c1fb379b0bbe1241d7dccff07a98e29f2a096ca450c SHA512 1a39f419d07d2bf5200ae07e5a4aa0669a96d728be24f2d2a5e6a1c1d5b9eb371d02c890c1a7c35b6742dc09de254a07424ff68aa279bc9dc7dced4b5b654cfb
 MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/dev-libs/libx86/libx86-1.1-r4.ebuild b/dev-libs/libx86/libx86-1.1-r4.ebuild
index e001fab4a41a..350a47c4a088 100644
--- a/dev-libs/libx86/libx86-1.1-r4.ebuild
+++ b/dev-libs/libx86/libx86-1.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm -ppc -riscv -sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 4c2720144c98..9e7c3131a2a8 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,3 +1,5 @@
 DIST libzia-4.30.tar.gz 633287 BLAKE2B 7ca2fa4eb4e887e77658dc66b455ab830da31634a121d2fc58ec4e038a62d09d2c392ca70dbe7df3740592d82e9861086f398d82fba1af8e4d6066c395dca3fd SHA512 ba04206427c6bfd63c4799e2728fd5487a75757a42281daf87c8aee87d3c685e5fa60a0c77409fa774e4fddaaa3336f96bce002e88e6ad54f9af2c2cc939b9fa
+DIST libzia-4.32.tar.gz 633444 BLAKE2B 60fbc85297b06e109f6c989798b6c5629d6f2d861b52388b134f896ee5232f75dc362fd847fd557d4aacced1c2264554c2861c9af7acfbb1e6837d9348aac30e SHA512 e426626d54c97dbce88e11eaefcee84a4e0a23e17a196f46ed4319a22d0f55bf9524c542bd4d41c376b26b51553d4cf7e0d994125cb2321549620f4b4aea5912
 EBUILD libzia-4.30.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
+EBUILD libzia-4.32.ebuild 974 BLAKE2B b74446348dfd0d0f0c1470349aaa04ae1d59d034c1ecf96d5da37a9507e7200d6e487c427e4312464e90561668cd06274140e74e2a00c46aba0c2ee0d51ed4c4 SHA512 6555ced9e553fc7546163ee0e77f0c87f8421d038bccdca61e290414d3fa30ac3dfadc4d86154933c1926018fcd6b365a29246abf41f66db59432ecc4a2a4e59
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.32.ebuild b/dev-libs/libzia/libzia-4.32.ebuild
new file mode 100644
index 000000000000..0e9b995dd476
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.32.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index c97a6d9f2402..f1e335677304 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,3 +1,3 @@
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
-EBUILD mpfr-4.1.0.ebuild 1030 BLAKE2B a1b8777c4f2fe4ac8afd3976f558337939a8e014ca769ca578e4da191ff9979812d0cac14e07d548e62d6894953745dd5c12a784ba9c6e02155ce24f1cbb26be SHA512 7a72b7738bcdd94af674217928b449350f085e9269ee4440dd4d50d3307cf65f77fef95b4ffb16e5f1ffee5a1703f565a0736d9d5600a12a7a2d74fa5266215c
+EBUILD mpfr-4.1.0-r1.ebuild 1032 BLAKE2B cc2f05e76164efac0956867232086096e20afcd9137953f883835e8f762524328fcafbc306a6d44c45f34086bbf8f11bf5e50cf56dfb4d5aa3bcf1793c98dca1 SHA512 9112a81d34c9e3808eed001f3d567a1534b3e3e1eab9a5ab4f9d4da8c40d8c78cf4ca0717fe089dc57e6728883d6ddd0427bdafb58ca8a764862affcb09ed80d
 MISC metadata.xml 258 BLAKE2B f45bf60ab247635720461e6f8028b41d748c2c0fecea4d5b6eb29a9f532de573e8054773a084b99b2a6a040e980cfc41c8839b13bdeb8ebe6e1de12a1492873b SHA512 2cd16eedd80ae476d1611112f620d3d5eee88fd181fe635d9f9235ac312e24bf8eac5b44f54ff55806ee7a03aaf1d1382a734f7b3496814853d238b9a7b6ee1e
diff --git a/dev-libs/mpfr/mpfr-4.1.0.ebuild b/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild
index 286e23371367..986919466dde 100644
--- a/dev-libs/mpfr/mpfr-4.1.0.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit multilib-minimal
 
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
+DESCRIPTION="Library for multiple-precision floating-point computations with exact rounding"
 HOMEPAGE="https://www.mpfr.org/"
 SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz"
 
@@ -14,7 +14,7 @@ SLOT="0/6" # libmpfr.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="static-libs"
 
-RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
+RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
 DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/FAQ.html )
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index ee20cc76ca8d..285733c17068 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -6,10 +6,12 @@ DIST nss-3.68.tar.gz 82405833 BLAKE2B 0a48c599bb3c97f41e41c5723e6c1b12d7f03469bf
 DIST nss-3.69.1.tar.gz 82426679 BLAKE2B 71948a9fee08536c41da9916e6d2eb82bf52bf688c900eb283f83f0ac60498cce2d936950836b0bfb097ee9315860dbbd402a3b63ab28d23b3bd90523b65ead3 SHA512 26895e542e66bb99965da9832cd7f5b191336aa1027b2e90f194473dd8f6277909102f21833d988fa8d8b0e2178eaca9437b182d1155038abb0743eda2cc5697
 DIST nss-3.69.tar.gz 82427268 BLAKE2B 1467c7f17b1d3d46fb4fcb1d19112585c24ec3d10125d7e954a87c3a6d0e20a300d2084a9480c88dad20274c500e1efb70143bb92b4a8110c2080abf3fe68dfe SHA512 9dd824b3e96aa5a032d5005cdf60a55efac23f69f3857cd1f4337f3ebad92fc2354bb05ed85f04a368e55306a46ebd17a91f7f432f1c191a96e99aecfa62cfdf
 DIST nss-3.70.tar.gz 83917362 BLAKE2B 51de2e2cf5feb11045388b0badec24509d50f8bc8abd4116cbab77ff434f86a44ad4c98e533a1dd7093a9d1be9b7deb45f0426e3a173f9b2b92995cf63f2ea51 SHA512 9766282b36560d2f73ac5e90dbc3962802d6b1e8650ff9c0afbd6d2e1ff4cf8f2bc251f972344dc8a6ac5209b917aae03cc9883cb081011a7dea7bd258a95d82
+DIST nss-3.71.tar.gz 83927933 BLAKE2B a8d683b9f9bff5390e0378ab0d55156f7cc69a52b0667658738e67e920548965e7a276dc4104547b2e6a1a6d18325c3f85b955b9c12d7f071d10930b5264207e SHA512 a4a724dc4e8677965b6245ea2309790d31ec7719658e2b349eb67c9008082132c76277340d15e4fdd8d2fe1f560ae6803fb038d023c3dfd2e3772fa3b77720e2
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.63.1-r1.ebuild 9506 BLAKE2B 28105fb764f1f57e8d06fc8e58ac7cc03534c9a83f939dd49b63a3ae84a79d82a815858680f4bccd03abca8703b39329cb5ddea21bd06648bed9460a68b4af50 SHA512 ddcb298b779ca3430b18eba1da4ad1778b39b7c946f22b92c2857ed0e612e93138a57f486c37980ebbcc53b906beff68d6ebec58e2fbb821930053b78a76e9b1
 EBUILD nss-3.68.ebuild 9521 BLAKE2B de04a237b2980036eaf2012346b4f0b8e9fa83ff0cec78319f9b69fb34861d8047d53045ae7c1b64a2784476292cf4eb34fae99e7b5fbdc9b7920615922345ea SHA512 d9cdb53234d74e823bafc1ff9c1e80538866efe0618f7660ef7f297fda32f1d9a8580e91ff5f28d659dbe995e143538464eaa46c2429b2d6bee6d102505d6c79
 EBUILD nss-3.69.1.ebuild 9547 BLAKE2B 97d1aa4b223070c9f18590cc2c97aae0891d9c32722277a715ef83dcdf6403305eb0436e06e3888d9ccafa37cd3645165fd8481ba3270e9a04f38143e529d4c1 SHA512 c48956c7dab9d0c8298b1b153dd40017c4e5f659a7458cddbfbb7b85f08cd31630fece3164a6df455c3549621bc0b1ada3369f4da88491cdf658a95b59f09115
 EBUILD nss-3.69.ebuild 9521 BLAKE2B 5ad382679f739a612e30c5670df39fcb92306e79307f348c47968355536a65252c3424a90977d18245d4f50d8cab233946389fa6e83f9e3188ceed3ec650d4be SHA512 afccf0a6a2c3851375cb459619e0a5773e4e4ba27697596b057ebe1a0a79adbdf229bd1ef1967bc6e23a82d9a063571c9c3c68d410f50b79af7473044eb108a3
 EBUILD nss-3.70.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
+EBUILD nss-3.71.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.71.ebuild b/dev-libs/nss/nss-3.71.ebuild
new file mode 100644
index 000000000000..97adb106159f
--- /dev/null
+++ b/dev-libs/nss/nss-3.71.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.32"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index b35b4218dcbc..3a2ebf71c3e5 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,12 +1,8 @@
 AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131
 AUX opencl-clang-11.1.0_version.patch 404 BLAKE2B 31d8f90de04be1d563caf35534b86fb5f9aba08922be00b9685a402550eaf09334fb7ced28e7ba05d840e389b8d0b315d4809cd26763b4d9a76410401dded687 SHA512 57f59db22b33d856bec6deba6c04ae68d9e5da2c0b2da4fad5053c6915a5e634bb0206eb3c933f2228947df92a633ee2d051164b696803a8e6c330a9218ca6f9
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
-DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
-DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
 DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
 DIST opencl-clang-12.0.0.tar.gz 25292 BLAKE2B 6979ce3f37b0e29e6b7ca9b015c04af6e01ceb6381158492a928d805b26b9bddf00b7a7a3edd987924f1c3a8ad914b7d6e9d9fea22b12166afceb25365edae6c SHA512 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31
-EBUILD opencl-clang-10.0.0.1-r1.ebuild 1135 BLAKE2B 1c99942d66a2bf1e3b9e8f4e8f778b2af0452529f6bfa1aab10e1fab66739296613853180e9b22a8aaea8c5f53dc84cbdd235a79b8d5fed479787f48e4148e8b SHA512 631065c3510b38de41ea37663bb95fe49fbce708f363a654ee532f50f5743b115b1c73d1b2a40258d3aa6f9ae38de196ba32aac31db6bf76ca97df44b2fbbdcb
-EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
 EBUILD opencl-clang-11.1.0_pre20201222.ebuild 1262 BLAKE2B 4b130083a32b8e696a70a6f1058409596823de40432ae2925756ba901223981bc92f32380e74874ac67a0e4001dc1304939329ad34f901fc564ad2bca2c7c96a SHA512 44ce33fd10db3aedd36c892815326cd1295983cf267ec9fa57518067d8d974463953313bcea915a0d16cdcba8ae7935a94c09c10eab0de7825dcd90b203af205
 EBUILD opencl-clang-12.0.0.ebuild 963 BLAKE2B 75f81c1822e9977fc38a8bb296e209e7ecbed243a66874773e6d04cb44cfb832fcba1bef0df8338c7bbc68f79f23c1bc933325cf00a8969a3459402d8e55ea88 SHA512 3b46e1fd9878e169c800ed4cc5115f1ea8f10a80c6c221b2ef4931ea20c8328249b2e884085eb63cd209deaf58ef54151d55d692de9b4c881c26dec7eeca20cb
 MISC metadata.xml 251 BLAKE2B b22019593bb3b4bc147601f4bb0d9b1b581cdc60b044374d440221c23a56dd8d66361e70a22f91445b364a91e5082a103107c9b17e25370d9e5da54a38031438 SHA512 0ed66fe371eb8158e69a8bf0cbf9b184e7d04450c034121fe45d200be9285ee4e6347c5fa9c7bfead588bcfdbe4928556418e3cac6d3e55622eb30d47c186a78
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
deleted file mode 100644
index 8d0b22328075..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib llvm
-
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="10"
-KEYWORDS="amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
-# in order to work around Bug #743992. Hopefully a one-time thing.
-DEPEND="~sys-devel/clang-10.0.1:10=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
-	dev-util/spirv-llvm-translator:10=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=10
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild
deleted file mode 100644
index 1c81dddfcdf5..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm
-
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="10"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
-# in order to work around Bug #743992. Hopefully a one-time thing.
-DEPEND="~sys-devel/clang-10.0.1:10=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=10
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 408e746b4f44..6daca253b2aa 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,4 +1,6 @@
 AUX vendor_opencl_libs_location.patch 962 BLAKE2B 6d0e3f070fa2022d95d35fb1563f72f5dc1b544c7f83417dbb5e3d100dad07bdf3365a48ee92e856de4edc4b7c25674b45efd6d0ace1ac559273641ca175a269 SHA512 2ae144e7590049cc1eac8fa30e360cd511331abba0dfe683867d6a089742ea12cc3bc48dafe41a1c1c9b891fdf35aaac8b14cc1e10a78d2ab49b5e14635bb258
 DIST pocl-1.7.tar.gz 1577676 BLAKE2B 50d4f50236b1c81f319b5559ca2b1df529209f07899acf51c487820d97cc6766c5130a55afca910517c7db63d8041ac8306062880c3a821cbc1bf9108bf13d65 SHA512 23bb82b25a222186c001b2ed413f26253e1e0e16518e98c95173f51491e15d107e6ab1b334ffd490b41199743267d9ad64882a22fea327e17ec9604f9847fc38
+DIST pocl-1.8.tar.gz 1614545 BLAKE2B b0ccc08d1f899719f5def731c61727440035a879ebeebae89dd406423eba6c12b866f34cd47dd0e0f944b7f0c4569c57c44a9a62bf02552de5c4c3b8c9fb3b48 SHA512 bcbb3fa3d2234d4c5b0c17863eba0bc4c8f13f863cc58cfd1de49e21fa7bf0aec82b81aec143c81885e3a39274c8ae783b2f03b9a12846e024204d6ed0e59a9d
 EBUILD pocl-1.7-r2.ebuild 2862 BLAKE2B 23f201f50ac726297c8bfdc3408c3f1741989f78d8dfdccf566759fa3fd362127c28f524f6752f0f2fe882aeb431352af1f0fbc891a297c26fd66edfd44f04d4 SHA512 e7587d0f337b12e22e408b30f55b2a5ca887697529a1be5f734edf2ff37ea10c671002b7ef6e17569cd7deacfa8d37a097ff3b86f8538b47fab7f25446483d34
+EBUILD pocl-1.8.ebuild 3117 BLAKE2B 4b1cbf0f14995f0e7c77d1df60735cdd13b23d5b6b5cd60eedcd98fb9ed1fae892f860199da19706ce89b8830fecf45012876a33ecf132eb136fe4dac32f1761 SHA512 64f564f725f281d70ebf47309a1bb294877cce08028d2dab9f3f524ce8b2d6c7faca8670934a02ec1e7ec8fb8bc60858a4ec6ed4975a57f683a4c218160d8827
 MISC metadata.xml 1199 BLAKE2B 90d31048bcc33a76837977547ba818b2d2a268c408e7ad40eb157864d7c561d0bbc8ad40a013e28c74092f27f7fc3d23ae52322a2ca2d681c109ace154e29214 SHA512 98341aa0795cf9439ed4c0b8e2575657eaa5898e21b64d7d73592badac0b2a82fe061005a6adcf4e9d3318a4f20b80c62bd379f587dd4fcf993a95017f8ce867
diff --git a/dev-libs/pocl/pocl-1.8.ebuild b/dev-libs/pocl/pocl-1.8.ebuild
new file mode 100644
index 000000000000..6f112bf49132
--- /dev/null
+++ b/dev-libs/pocl/pocl-1.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCS_AUTODOC=0
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/sphinx/source"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+LLVM_MAX_SLOT=13
+
+inherit cmake llvm python-any-r1 docs
+
+DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
+HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
+SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+# TODO: hsa tce
+IUSE="accel cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager test"
+# Tests not yet passing, fragile in Portage environment(?)
+RESTRICT="!test? ( test ) test"
+
+# TODO: add dependencies for cuda
+# Note: No := on LLVM because it pulls in Clang
+# see llvm.eclass for why
+CLANG_DEPS="!cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= )
+	cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )"
+RDEPEND="
+	dev-libs/libltdl
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
+	virtual/opencl
+
+	${CLANG_DEPS}
+	debug? ( dev-util/lttng-ust )
+	hwloc? ( sys-apps/hwloc[cuda?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${CLANG_DEPS}
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/vendor_opencl_libs_location.patch"
+)
+
+python_check_deps() {
+	has_version -b "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
+}
+
+llvm_check_deps() {
+	local usedep=$(usex cuda "[llvm_targets_NVPTX]" '')
+
+	# Clang is used at both build time (executed) and runtime
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}${usedep}" && \
+		has_version -r "sys-devel/clang:${LLVM_SLOT}${usedep}" && \
+		has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_HSA=OFF
+		-DENABLE_ICD=ON
+		-DENABLE_POCL_BUILDING=ON
+		-DKERNELLIB_HOST_CPU_VARIANTS=native
+		-DPOCL_ICD_ABSOLUTE_PATH=ON
+		-DSTATIC_LLVM=OFF
+		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
+
+		-DENABLE_ACCEL_DEVICE=$(usex accel)
+		-DENABLE_CONFORMANCE=$(usex conformance)
+		-DENABLE_CUDA=$(usex cuda)
+		-DENABLE_HOST_CPU_DEVICE_CL20=$(usex cl20)
+		-DENABLE_HWLOC=$(usex hwloc)
+		-DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
+		-DHARDENING_ENABLE=$(usex hardening)
+		-DPOCL_DEBUG_MESSAGES=$(usex debug)
+		-DUSE_POCL_MEMMANAGER=$(usex memmanager)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_test() {
+	export POCL_BUILDING=1
+	export POCL_DEVICES=basic
+	export CTEST_OUTPUT_ON_FAILURE=1
+	export TEST_VERBOSE=1
+
+	# Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
+	# But couldn't seem to get tests working yet
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc CREDITS README CHANGES
+
+	if use doc; then
+		dodoc -r _build/html
+		docompress -x /usr/share/doc/${P}/html
+	fi
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${P}/examples
+	fi
+}
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 2c368470928a..745522abc40e 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -2,6 +2,6 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43
 AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
 DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
-EBUILD poco-1.10.1.ebuild 3772 BLAKE2B f80f31b0f0996f974de2dbde09264d803aacb1d2245b3fb425cbd0c18e1ae333ca011ca1bb2074368a6120f95b92429b380588d5f44b8a82bc430ac454a6cbd8 SHA512 7722395e53d00cdd7ef38b3ced7c25713c7f88bdb5518ccade1a297f7b09380e18ee0b8000f2fd6d83422e2b70c06b76f247b44c1088ed5dee87d9815c820610
+EBUILD poco-1.10.1.ebuild 3771 BLAKE2B 74964571e0a493a721d1336f7e039f2e6da6e2f0bca7da2131188746e669f30cb6b6cd9f649ac643ab9199598d5ef40eaa24fa10bdf60899b538d75ace82a261 SHA512 33f04c62da4d52c6c72e58e57c683e8532ca2a3eb8aa79d6734b17e31d224f742b61a9dfbab28c17a0ad65bc600762e5ab24dc0efa116932085bdef66b00a013
 EBUILD poco-1.9.0-r2.ebuild 3784 BLAKE2B 0e03a468a231f441c59b2e5900ef3b47694b822ef01abde89aa3d5d142e0db2a776c8f2c817e84ee890338b87cabd8f89d07fc34c41d7709380a3664f94bf8fd SHA512 2f9918b32a2fc7a78569f305a4bc270f6d2f80aecffbffeac2573c98d0981bfdd11b65e757a1f8b78965b2009d11e43fb73eff15a13c9455915158db1d55cf20
 MISC metadata.xml 2584 BLAKE2B 666f63e00f654571eece88d1d4679673323570c5b68e4dda840ec94413461307a1b2eade7acd89852e0bf5163cafce9ed7d75c55fa3be7071a2d9445ffcbdca4 SHA512 c6526c758b0d06cc5b2b57b56f6e61f92950f88f62e38967948edcaa2b3fc618836b667ff57dc9b8c52e71e5921b14181376c79a8cfead7e607cfbc554f73dfd
diff --git a/dev-libs/poco/poco-1.10.1.ebuild b/dev-libs/poco/poco-1.10.1.ebuild
index d615fee58123..47a8c8a18c4c 100644
--- a/dev-libs/poco/poco-1.10.1.ebuild
+++ b/dev-libs/poco/poco-1.10.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}-release"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/qqwing/Manifest b/dev-libs/qqwing/Manifest
index 770856a6028e..432f89007b58 100644
--- a/dev-libs/qqwing/Manifest
+++ b/dev-libs/qqwing/Manifest
@@ -1,6 +1,3 @@
-AUX qqwing-1.3.0-autotools.patch 5417 BLAKE2B 9314f4e0c85b8bf646b22ebd13409b305f05a25eecaaced65ba76b307a0c062eee7a9dbdc79c4ecab69d84756c646caf6e69183ad3621379aef14492b91f1ad6 SHA512 cdb88b9a07cf5c68790c4ce7e6f1156dff4c985c0f65bd73f81556d41570be5789d8fce53594bcd698fdf182dfa0f88618f49fbdaee153b5dcb4c833553ff515
-DIST qqwing-1.3.3.tar.gz 89629 BLAKE2B 5583318d15a4bf31833576bec037ab27fc17a57c95ef42be828ae0de9d6d86709fdcb63f71cf51b737b45c39657220e1e14a817094065f29b17c668f53b16075 SHA512 cce6e3122f0620b4a27f5c4186b468906006b6f9deda0b3fc474d40e678722bbb07474c479a75cbcac0812a097e5be4d7ae58339810a897f966d5a73b07a6833
 DIST qqwing-1.3.4.tar.gz 352060 BLAKE2B cf78a3d06c529ab1d47739ee0914e268fe8375d5dd7eb73a05ed91fcd7231b0f2103ae2490a8edf438ebce5ec77457f2686338edb61c38a804af34df78763c31 SHA512 6762b97d7595e7831edb80d9fac06ca784c6dfb6c5717e72adaac6973ec94bec417806f8ae4b80ed95b876388c8c1a00906b0fa8653a115998c5170db25aab0d
-EBUILD qqwing-1.3.3.ebuild 489 BLAKE2B 6a7a6bb5ae79a76ec00bfd818c15817c3ec12abbc580c8a6358f7e323056d95450908363bf562f1af5f9704b0215a8559e0e02fcab32529857344335af15ba03 SHA512 3d78c8ef369708afd53aab36d7166add1b9f009ce68cbf25b621db4e9e3ad57412f02b341c3ee773e67deeeeace069c0588693df95bbeac207d45d61d4b60684
-EBUILD qqwing-1.3.4.ebuild 364 BLAKE2B d8c9a7f0e534fa4587d89b264d25a1fa6b43999a896ebd73eb88dfbbd84c5b7aba4871792d98de323c6054d0a13415c7ee6dbebfee63317ab339d5f936fab0a3 SHA512 f2adb6a4bddee3545bb7d2480808d97df181e751637e8aa09814bd705cb4106f143f5f81d6c0561562285a0f5cdb92a21789a3af18c7fd49d7f52a6846b541f6
+EBUILD qqwing-1.3.4.ebuild 364 BLAKE2B 1c1c9704e93059764f543364122fc5bee16e1d8553804b8de8f0806dc235d8631445558268b13bbf0d4f7aecf4e93b943439ddb44e2173001bdd8ca607650dd3 SHA512 e3d5857fabafebc2699d4243085a2b1fad7c5f3035522227705b3352e3d09a43d32aeba2604948b3be209d33afd7b860f56593637b07d5c1e61b8706fab458ed
 MISC metadata.xml 344 BLAKE2B 7ccab937a954c7bf6a62964af9cf5da988d468441feea89de8c82870e4d414b8d916e63db83e026886c636d5d204d4415581a84b408e8e453293285e94d3cd38 SHA512 d3bb75e12aee5f1d3126b583c178048d365f28bb219953e32d20b1b59e809d24e916ae81617b16f3e31a5ba9f9ddd87cac9fa20e38a65d757fa41184f8f51640
diff --git a/dev-libs/qqwing/files/qqwing-1.3.0-autotools.patch b/dev-libs/qqwing/files/qqwing-1.3.0-autotools.patch
deleted file mode 100644
index 1a7bf41aeaf7..000000000000
--- a/dev-libs/qqwing/files/qqwing-1.3.0-autotools.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From d94d718154c065218bc9db8ccfe638d84b86bdb4 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 18 Oct 2014 13:02:58 +0200
-Subject: [PATCH] Make autotools a bit saner
-
----
- Makefile.am        | 16 ++++++++++++++++
- build/Makefile.am  | 17 -----------------
- build/configure.ac | 47 -----------------------------------------------
- build/qqwing.pc.in | 10 ----------
- configure.ac       | 47 +++++++++++++++++++++++++++++++++++++++++++++++
- qqwing.pc.in       | 10 ++++++++++
- 6 files changed, 73 insertions(+), 74 deletions(-)
- create mode 100644 Makefile.am
- delete mode 100644 build/Makefile.am
- delete mode 100755 build/configure.ac
- delete mode 100755 build/qqwing.pc.in
- create mode 100644 configure.ac
- create mode 100644 qqwing.pc.in
-
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..d6109ba
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,16 @@
-+ACLOCAL_AMFLAGS = -I m4
-+
-+include_HEADERS = src/cpp/qqwing.hpp
-+
-+lib_LTLIBRARIES = libqqwing.la
-+libqqwing_la_SOURCES = src/cpp/qqwing.cpp src/cpp/qqwing.hpp
-+libqqwing_la_LDFLAGS = -no-undefined -version-info $(QQWING_CURRENT):$(QQWING_REVISION):$(QQWING_AGE)
-+
-+bin_PROGRAMS = qqwing
-+qqwing_SOURCES = src/cpp/main.cpp
-+qqwing_LDADD = $(top_builddir)/libqqwing.la
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+dist_pkgconfig_DATA = qqwing.pc
-+
-+dist_man1_MANS = doc/qqwing.man
-diff --git a/build/Makefile.am b/build/Makefile.am
-deleted file mode 100644
-index ef647d2..0000000
---- a/build/Makefile.am
-+++ /dev/null
-@@ -1,17 +0,0 @@
--ACLOCAL_AMFLAGS = -I m4
--EXTRA_DIST = debian
--
--include_HEADERS = qqwing.hpp
--
--lib_LTLIBRARIES = libqqwing.la
--libqqwing_la_SOURCES = qqwing.cpp qqwing.hpp
--libqqwing_la_LDFLAGS = -no-undefined -version-info $(QQWING_CURRENT):$(QQWING_REVISION):$(QQWING_AGE)
--
--bin_PROGRAMS = qqwing
--qqwing_SOURCES = main.cpp
--qqwing_LDADD = $(top_builddir)/libqqwing.la
--
--pkgconfigdir = $(libdir)/pkgconfig
--dist_pkgconfig_DATA = qqwing.pc
--
--dist_man_MANS = qqwing.1
-diff --git a/build/configure.ac b/build/configure.ac
-deleted file mode 100755
-index ca75f59..0000000
---- a/build/configure.ac
-+++ /dev/null
-@@ -1,47 +0,0 @@
--AC_PREREQ(2.59)
--AC_INIT(qqwing, 1.3.3, http://qqwing.com/)
--AC_CONFIG_MACRO_DIR([m4])
--AC_CONFIG_SRCDIR([config.h.in])
--AC_CONFIG_HEADER([config.h])
--
--# Before making a release, the LT_VERSION string should be modified.
--# The string is of the form C:R:A.
--# - If interfaces have been changed or added, but binary compatibility has
--#   been preserved, change to C+1:0:A+1
--# - If binary compatibility has been broken (eg removed or changed interfaces)
--#   change to C+1:0:0
--# - If the interface is the same as the previous version, change to C:R+1:A
--QQWING_CURRENT=2
--QQWING_REVISION=3
--QQWING_AGE=0
--
--AC_SUBST([QQWING_CURRENT])
--AC_SUBST([QQWING_REVISION])
--AC_SUBST([QQWING_AGE])
--
--AM_INIT_AUTOMAKE([foreign])
--
--# Checks for programs.
--AC_PROG_CXX
--AC_PROG_CC
--
--LT_PREREQ([2.2])
--LT_INIT([disable-static])
--
--# Checks for libraries.
--
--# Checks for header files.
--AC_HEADER_STDC
--AC_CHECK_HEADERS([stdlib.h sys/time.h])
--
--# Checks for typedefs, structures, and compiler characteristics.
--AC_HEADER_STDBOOL
--AC_C_CONST
--AC_C_INLINE
--AC_HEADER_TIME
--
--# Checks for library functions.
--AC_CHECK_FUNCS([gettimeofday])
--
--AC_CONFIG_FILES([Makefile qqwing.pc])
--AC_OUTPUT
-diff --git a/build/qqwing.pc.in b/build/qqwing.pc.in
-deleted file mode 100755
-index fcc4c45..0000000
---- a/build/qqwing.pc.in
-+++ /dev/null
-@@ -1,10 +0,0 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--
--Name: libqqwing
--Description: Sudoku generator and solver library
--Version: @VERSION@
--Libs: -L${libdir} -lqqwing
--Cflags: -I${includedir}
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..646494f
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,47 @@
-+AC_PREREQ(2.59)
-+AC_INIT(qqwing, 1.3.3, http://qqwing.com/)
-+AC_CONFIG_MACRO_DIR([m4])
-+AC_CONFIG_SRCDIR([config.h.in])
-+AC_CONFIG_HEADER([config.h])
-+
-+# Before making a release, the LT_VERSION string should be modified.
-+# The string is of the form C:R:A.
-+# - If interfaces have been changed or added, but binary compatibility has
-+#   been preserved, change to C+1:0:A+1
-+# - If binary compatibility has been broken (eg removed or changed interfaces)
-+#   change to C+1:0:0
-+# - If the interface is the same as the previous version, change to C:R+1:A
-+QQWING_CURRENT=2
-+QQWING_REVISION=3
-+QQWING_AGE=0
-+
-+AC_SUBST([QQWING_CURRENT])
-+AC_SUBST([QQWING_REVISION])
-+AC_SUBST([QQWING_AGE])
-+
-+AM_INIT_AUTOMAKE([foreign subdir-objects])
-+
-+# Checks for programs.
-+AC_PROG_CXX
-+AC_PROG_CC
-+
-+LT_PREREQ([2.2])
-+LT_INIT([disable-static])
-+
-+# Checks for libraries.
-+
-+# Checks for header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS([stdlib.h sys/time.h])
-+
-+# Checks for typedefs, structures, and compiler characteristics.
-+AC_HEADER_STDBOOL
-+AC_C_CONST
-+AC_C_INLINE
-+AC_HEADER_TIME
-+
-+# Checks for library functions.
-+AC_CHECK_FUNCS([gettimeofday])
-+
-+AC_CONFIG_FILES([Makefile qqwing.pc])
-+AC_OUTPUT
-diff --git a/qqwing.pc.in b/qqwing.pc.in
-new file mode 100644
-index 0000000..fcc4c45
---- /dev/null
-+++ b/qqwing.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libqqwing
-+Description: Sudoku generator and solver library
-+Version: @VERSION@
-+Libs: -L${libdir} -lqqwing
-+Cflags: -I${includedir}
--- 
-2.1.2
-
diff --git a/dev-libs/qqwing/qqwing-1.3.3.ebuild b/dev-libs/qqwing/qqwing-1.3.3.ebuild
deleted file mode 100644
index 8755e040c441..000000000000
--- a/dev-libs/qqwing/qqwing-1.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-DESCRIPTION="Sudoku puzzle generator and solver"
-HOMEPAGE="https://qqwing.com"
-SRC_URI="https://github.com/stephenostermiller/${PN}/archive/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-src_prepare() {
-	# Make autotools work out of the box
-	epatch "${FILESDIR}"/${PN}-1.3.0-autotools.patch
-
-	eautoreconf
-}
diff --git a/dev-libs/qqwing/qqwing-1.3.4.ebuild b/dev-libs/qqwing/qqwing-1.3.4.ebuild
index 02c5bd8cc293..8fa1cf43c1b0 100644
--- a/dev-libs/qqwing/qqwing-1.3.4.ebuild
+++ b/dev-libs/qqwing/qqwing-1.3.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Sudoku puzzle generator and solver"
 HOMEPAGE="https://qqwing.com"
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 3720b166a997..8651315aa945 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,5 @@
 DIST qtkeychain-0.11.1.tar.gz 41001 BLAKE2B 155ca333d403e6ad91c2f733dec06e7957d3998c8124156cf33ea9b79521a6838e9c5a317b591897543b820d436d89ce3eada6425318d801834c133b6c55c982 SHA512 45551003000b8ed76d44767c54d18dcbb956d5aeb63d8bf2f0fc06c61eab4d7d2e70b894e9c0729722dfcb5004f818f4f4c9a413444fc2aebe0271f104b500e6
 DIST qtkeychain-0.12.0.tar.gz 46070 BLAKE2B 42ae7b1e86cdfd26c7603c7bf3dfda9e0b856e44e531b92436ba260e32d51be9884602afff996c9cf5837c3cf6453fec70a9d06ac2e51c7e028305706e0ceeeb SHA512 ad8f7b3e8f59894a09892aeb78118f5ed93aa4593eece782c1879a4f3c37d9d63e8d40ad4b2e6a2e286e0da39f45cd4ed46181a1a05c078a59134114b2456a03
 EBUILD qtkeychain-0.11.1.ebuild 912 BLAKE2B d3aadb60a1d4f2bb71e5c375e295b52604d56ba985f7c1deffdeab62cf5fb2a6bc1251aadf2ac165b257fa8365f9c6e9624f6e02db0322127b173a0a4a793024 SHA512 c1a328752f37c523e5f9425d9a15110d9bc24fbc6759b99d3fc7e60a2bbc36472321d3f765a8c55f76fe6536011c5857cdda6e5bda86c462132e0b38b059979a
-EBUILD qtkeychain-0.12.0.ebuild 916 BLAKE2B baaac58f1edbb08b5f756d0055bad24b41647bff975a81f21554e0677c5c7464177acba98d624ae2277d4f65db70d696626a1c1698cfb27d757f4cc797b71e9b SHA512 b560fcfdf0be1305c959c5ebf7e910c7c86a5c12ee92f6ab4d31271332b5d32801cbb7ea8b155a05ef1095284e3dc8b588d5d272f0b81734d2364ee5176a1939
-MISC metadata.xml 336 BLAKE2B c44b0f04c0aad2382c06bcab4257d49e7143d78c7575feb9225df0ac8f572530ad44cd24391c71cd97fe788aec862398276b34d6f4f630b6a3f10cf0fd3a679f SHA512 e56b9c10ebdf60c9148b26346b62c0586051578819c010edff5b3a38d9e04c0715afd9a54bef31ece58c2f6550b52050aed86eaba568634038894cab88185e8d
+EBUILD qtkeychain-0.12.0.ebuild 923 BLAKE2B 6a52f2a8ab12abd4c5bfa1865559fe1480407c0c34535e308d57e3f25bc25ab7b8f98dfc7f4e5a9ef927ad4680dc85051395969793ce58cf42dc9b8344b7ea5d SHA512 f544618b1e12adf1cc8b09713e5858bb6875c7c914a3b84fcd0335688d44ad016c10eaa9c82b46fcdaad72a45bf021fcba29428e765e87fa00699dfeae212f72
+MISC metadata.xml 340 BLAKE2B 4ae9796b7c395cbb0dc0c4a06d203db9a270ec00dba635bdeb0f46b350fffd3784f98a700f645238824cf6b474215c1cbed4c1ede1df16f47185598c81de5610 SHA512 3bf8c371c3268190a04f67f2213b89efe9f1dad96cbf2ee5ad3d112d5ea6b164ccbfefabaed55a6e0cdfa3e4bb06d6e7959b88513567a1d619aa1138957c5027
diff --git a/dev-libs/qtkeychain/metadata.xml b/dev-libs/qtkeychain/metadata.xml
index d4921375172b..a892d85458ef 100644
--- a/dev-libs/qtkeychain/metadata.xml
+++ b/dev-libs/qtkeychain/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">frankosterfeld/qtkeychain</remote-id>
diff --git a/dev-libs/qtkeychain/qtkeychain-0.12.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.12.0.ebuild
index b2a7c0bb00b7..c38e507a0711 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.12.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.12.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}.git"
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 63892f8e9e3b..651863f83ce1 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,4 +1,4 @@
 AUX quazip-1.1-cmake.patch 3279 BLAKE2B 5b596da742e87c00c742881a8585d4f48955d99dfd868451ad2eacde64b7f035dfcf38efeb21335ee8c2e68a6aa0606a7d18e2a23198efc5e1d3f3068a93261d SHA512 5c28adf3e6ae96c3be89dab18092be2089e2b622a9c88e9423abdd505db306680c97abc861d4b90829efeca6b3a85907ad927512e95da575eaec39bd231a8b5a
 DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
-EBUILD quazip-1.1-r1.ebuild 934 BLAKE2B 3bf86d7872c881b8bce8b141e6f6c807e37d396ad54f103e240bb167d22e48ba62124700bcc2438e9ddcf242cc52e9490a839a77cec69f866ed987ced5d476af SHA512 5373be3092940b55575cca3f28645ee8726cc066a71a546964d50e5d9945ddb28f6674eba3ca636178c70b50cf5f3a3ebccc70c309e2553bc961ad8f88b35c32
+EBUILD quazip-1.1-r1.ebuild 941 BLAKE2B 19855983f1cfcfd549bfbd4e183c570d663492e507ff1daed5821d76c75dc9bf18b55697cb4e555091e8f2e538111d400979d4cc175556269dbd6ff46d1b0ae8 SHA512 d8545a52bd5ec70501514f3fe45808190c393c892b8a8e3abe0810bbd1d091378ef4d397a8239413f075d4f0453a9ef2a9ef57379180ec13808a3172f6f16eb1
 MISC metadata.xml 348 BLAKE2B 756252686a3a4888fa4466e59594dc39bd40675d1a9b4b98124ec014d6fdaa14ad5dfd0659712fe5c2e7d338753d7b101fa3183831964764f68e67bb7b950ac7 SHA512 e10894c3e476992491b0692fcce8091450deee9782c7b580e2b956276b000a851844f9a0c408708c9508be607e3744be4f6849162ee362ac818a2e6ad05eb9a7
diff --git a/dev-libs/quazip/quazip-1.1-r1.ebuild b/dev-libs/quazip/quazip-1.1-r1.ebuild
index 069d025af9ad..29a58b0ea105 100644
--- a/dev-libs/quazip/quazip-1.1-r1.ebuild
+++ b/dev-libs/quazip/quazip-1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 5238a2a56458..b06c4e747710 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,4 +1,6 @@
 AUX rccl-2.7.0-change_install_location.patch 894 BLAKE2B b38635d2eaa2e3f342c9db7ede66eb91a6170cc486ce90f487820895879ad6666a35ffe3673dcc2ee610ade9c8b5fcb6a65f0469aa971aa3c0994ee347d22eae SHA512 97b1d3799e3eb105045d1c29df498c1255bd008433f56dd53cedd602fef77d9cee61b3b9db9281d72ec297da19058e86e74b66380b321f1727053e8c6148e698
 DIST rccl-4.0.0.tar.gz 741814 BLAKE2B c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07 SHA512 d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
+DIST rccl-4.3.0.tar.gz 836631 BLAKE2B c7fede9cf92d3e75b79da2874c0a1e45c5fd4ad9d24b11c9870e9fdef8d571a286cbf54ae0a033f2aec3d21b06cafc2b1c097aaf87ecd628f0c33e9267103be1 SHA512 1a27e6441955f01c853861f83743da2fc9597978c3ff99f238734d4bafb1e277d626811b72c6a12563d69b2b8265960b8a2566df618921557837035b92993f0e
 EBUILD rccl-4.0.0-r2.ebuild 791 BLAKE2B 1d2b95f2086c0f14ab87779e5d8d0304ec030dd985e8161aa9467455e414457508eac9a9450638bfa43499e38d9c597302399e4a08474568752bb47e6b378321 SHA512 79f6f264b5466b4a8c4389923487c4378fe8c59c9c34f5bbc0f5ded01beb2793b9981c982ee1598b00d5a16668f44a5c226e0d2cb40ed0eea1efd871825b4851
+EBUILD rccl-4.3.0.ebuild 967 BLAKE2B f20905c502a65cd81931e72565034932f11c0946c9d49a81a5a727b7681be6777d2a34c048715a7e5c117aa9190a5ffe04c1a658bf2af67fb01cfabad2abff21 SHA512 bbb740273d7d2c3083db2b165fcb773c52328ec3036e9f9173aa43bc69f4c573015513e88eedc79e78aefa948c12aa3d10d269b20a43e550bb985b9f1f88abc8
 MISC metadata.xml 598 BLAKE2B bda73827e412b7addb0788cb2bd769138f8872f9be48abc482a455dd88de8bcccce6687041e15d27d79301459cb8455c773447d6cab64fef97ccdaa60c929c90 SHA512 66d6c53cb8f15c595d3c3a2de8eece79460cf0f4c0f5c0a082539a409aadd17f05f5b5561c7d65864db60b56117270c2c36e1ad547a91495f6628bf04f78d015
diff --git a/dev-libs/rccl/rccl-4.3.0.ebuild b/dev-libs/rccl/rccl-4.3.0.ebuild
new file mode 100644
index 000000000000..532bea5d7dfa
--- /dev/null
+++ b/dev-libs/rccl/rccl-4.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
+DEPEND="${RDEPEND}
+	dev-util/rocm-cmake"
+
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/rccl-2.7.0-change_install_location.patch"
+)
+
+src_configure() {
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	export DEVICE_LIB_PATH="${EPREFIX}/usr/lib/amdgcn/bitcode/"
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=OFF
+		-Wno-dev
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index 3a0dac81d231..64b046f78142 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -4,5 +4,5 @@ DIST unibilium-2.1.0.tar.gz 121971 BLAKE2B e035eab4343ee779218c302b3cae3ff5d443f
 DIST unibilium-2.1.1.tar.gz 121998 BLAKE2B 0bd032d0cc32011fa66604b39412116824b79aeb3cebb394efcad7591d5bd18031d465f7736ff1e65914f2fcf7beca1cbee4c7ad07426cdbf45e1c82e1894d94 SHA512 ebcdcddc6c3a540d086b113bb83470c1c17cf59056b28308a484b20dc3df71de0f5d6e5bf105f9e4a8347c78500c65ae46c2b53ec87692a898c321a047664ee2
 EBUILD unibilium-2.0.0.ebuild 784 BLAKE2B f8decdab42671f3f9891ae9f019692f0c658c527c902ee2499395c1b0ec34b49f0056deec87396ed439ea1cb0a25d12b50d7727da739d4db5f4d9d11add57d43 SHA512 2c1f1edc2b1e0ace8f7dc54840636558873004f44d68ce0f434cfc403437d9fe5873ca1a66841febcaf4923bff2c82ac9d0c7937c180f11cddc721783d6eef66
 EBUILD unibilium-2.1.0.ebuild 879 BLAKE2B 03c1096e39a86fbd1a5da4f5cce318008e40fad7006de440a22a44a22412bc780253c2d4474ff5b2b2cce43d8fe2fc69bd5429e14c844a87d7c08ec673f580f4 SHA512 8a9d47758dd30e851575e487797ac435b94c57e01730710ee09d6ea10d0bfda0a613167be5554bad6dc390c36fef0cce77078dbb32d2e072b211c5c881447527
-EBUILD unibilium-2.1.1.ebuild 880 BLAKE2B 6c157de6197fca6388426d2f68fdf69abedd123c77fcdfd89be72fba636b38b396284ad4abdaedc994135ed111b5115aee8fdfcc70a3f5c200fc31b80ce5583a SHA512 909682dc33579c7be3529769d5d8e1b8221501f33f59faebaa4dbfe74a0354dc2d1f4edcafcc2997a8374685ac08b27a337baf952fc7d7ceb0a1483adc60838e
+EBUILD unibilium-2.1.1.ebuild 887 BLAKE2B a7fe78c7a903fd9c4526ddfdb7a6c64abc7c5adf75d6191e5a5104d7b37a8e0ad2716e6c3a8370b4380bda1c5e8429c1f6159bf7e6a5a07b84a776d077449ea2 SHA512 1feccff6e13f7743074228a929947ed4c804a7998e16c6f978a6b0d73fbbc164068248d4602d444c1f76d4969291d5ef0cc1e68a1138e7797e155b10c896f9be
 MISC metadata.xml 340 BLAKE2B fbc2fee17ce03a1aafb74a76eee00909ec9d6ab01a62bb0fc0fbf7a9e0e30fab6390ab964d908b9d3b3c22400e5720856da6aac6a3c5ac77a0f3c8e1493f7316 SHA512 bb01973af5dc1a5240f268e62428a227fc4f575bb2d359c4b1f9d129d5c5693a17054aca080a72dcb938b325c493d9690bcfc5e15feab675f02c50bc855f8dc9
diff --git a/dev-libs/unibilium/unibilium-2.1.1.ebuild b/dev-libs/unibilium/unibilium-2.1.1.ebuild
index d064fcfbef8c..d2448195ad85 100644
--- a/dev-libs/unibilium/unibilium-2.1.1.ebuild
+++ b/dev-libs/unibilium/unibilium-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 27df48171cb4..73fd7f984dff 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,3 +1,3 @@
 DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
-EBUILD uriparser-0.9.5.ebuild 1408 BLAKE2B 3cb84c56f0572692bdab1b579f47ed492d6db3e368fcabf5d128f414a1a9e3c9c32d6e2e6899d9c441ebe7dcd2faa5a03e5e95211b595087f277d3f6903d7e25 SHA512 e6dcd85c451b8ce0e2afe455b121cb8ce09002e7738792d405f6668131a36fdc22de3abab2b75c568c0c14411e9b9bacba86857497703ad3563a2780075c90f1
+EBUILD uriparser-0.9.5.ebuild 1407 BLAKE2B 57422dee563f1a8ba6e8a60b415d71b1a23011cee1bf7576df37d943436056f84e8a40f3e8d2331c3a03d45fbfa9e0da3e2d1cfe3eae5126a582e27b3da25056 SHA512 940372852b7e53c41eb5cf90ca0da08b1c3e789ce303fc68fb0d77c9eed06981e54ff09ec5c9790dae028edce839b1e665a59979d0b394c5c77b61349e3e857a
 MISC metadata.xml 543 BLAKE2B f58d06655dac12b918bc151308a170bd3b1f2eecdf54e1ca38badb1b4fe26966461238e5975fb566a3e8014bdfe2133ffafdc322b4664d18ea657a30fbba3aee SHA512 8004df7b46cc798bb654f62b4ca9de1a26302e901f0fd77bfee5c9d8b6fa52a2084666b21c7b84fce09d9d197854383eafe20766ae0a5f181cb29b2e8ad530b3
diff --git a/dev-libs/uriparser/uriparser-0.9.5.ebuild b/dev-libs/uriparser/uriparser-0.9.5.ebuild
index e300d61b8425..9b07a35769dd 100644
--- a/dev-libs/uriparser/uriparser-0.9.5.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 0d89bd8ddbc2..43c8d9991fe8 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,4 +1,4 @@
 AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f727546d7c1c62f72c6d85a38c477c7a439d1924188f046ac263f21153f5499a1aa29aa0b9061b0e683f101951f1b53 SHA512 046e619a75a8ef28c7c18d078ffba1653971536a287ded36b22c6700358351fd95b2709318ed05d68e81edc13a8f7abdb03d0c5616a01817752fec45605215c1
 DIST uthash-2.3.0.tar.gz 191291 BLAKE2B 473e263df9f3555c9ef41c2b39cf2ed33a4624ce7325bbe52db805ac741b8383e64f84a9e249f96faf40e0b94fa4a7fc6c0e83bebe8b3677a90cdca82a4e3f51 SHA512 3b01f1074790fb242900411cb16eb82c1a9afcf58e3196a0f4611d9d7ef94690ad38c0a500e7783d3efa20328aa8d6ab14f246be63b3b3d385502ba2b6b2a294
-EBUILD uthash-2.3.0.ebuild 668 BLAKE2B cf07d7e7f25b55d2d325e0dd6f81ab8f135f5752d1e84f325536f517e5f19fef457ce1e4e6bc6746c7a894a4613eba12b7b7ce997ef361e68131ee60b303e2c9 SHA512 ee109e34c19e834f56ee97c158610ab5d47247c984e62fd1d1b2e7ec5ec548bc8a49068531084fce0268974357a2c80ea40b6080e145f07a73d9003775ea0fd1
+EBUILD uthash-2.3.0.ebuild 675 BLAKE2B 9013878b8498ca948eeac87173c7c6b71359cd8ff2d6833d7853fee7d195d4644f03f1a97c5da5f994f3e819d51ece3e2ef0dbba8ead56fb373e213874188bd5 SHA512 0c8f59e175f27a73cb993a0cf3315f9cec5a7f9efeb802717939674f7905a6dc47e7f4b12eb1964419cb3f62890dbff8e366bf1541a061de7fc9a004fb5535cd
 MISC metadata.xml 333 BLAKE2B 3c81a1a696bb53654558b17bb88f9b1c7c5086a07ec61148924b4ce062846233d5642304cb770b51d823de1d1bf86de538009d66099302d0a3a62e25b1db172c SHA512 bb882dac43b09c488ee541c90b05e8a4c62aa8700d3b85c3c491a2e5bb918b7b6032a018ed5a23f6e5c093c8e2b32bae8c7416119f12243e7a1700e83febc900
diff --git a/dev-libs/uthash/uthash-2.3.0.ebuild b/dev-libs/uthash/uthash-2.3.0.ebuild
index 6a3882e3aa85..f9db43ac9176 100644
--- a/dev-libs/uthash/uthash-2.3.0.ebuild
+++ b/dev-libs/uthash/uthash-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-20 10:22:14 +0100
commit	46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
tree	db33a91259730be84999e13a8d8168c799f50ac0 /dev-libs
parent	e23a08d0c97a0cc415aaa165da840b056f93c997 (diff)