gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /dev-libs
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
292 files changed, 3526 insertions, 3575 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5fe71b9d784e..069edf6618b0 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/aml/Manifest b/dev-libs/aml/Manifest
index dddc0d826d47..71b3ae531eaa 100644
--- a/dev-libs/aml/Manifest
+++ b/dev-libs/aml/Manifest
@@ -1,4 +1,6 @@
 DIST aml-0.2.0.tar.gz 20358 BLAKE2B 4be63726ea9069cbfe36fbf04e3a0b2229066d7df039aea1a41fdca27700d012fda9eda348115f8c0ef9d3f201640123722d0b96bc7b171841d920357a292152 SHA512 196cd891fdbaad47340d8b4ca9eb62a7f9e6b0969ae9ad744a3c9ea110a532691d53a1e39fde583bad0f8fdae4b51c3a4243bbdab65e952e5fc79ceb6efc3262
+DIST aml-0.2.1.tar.gz 20413 BLAKE2B 62f8cc0e75f23ac7dc8835dd874f584cdb5b394b0d7af08feded06b99ccff66395e0ec04bdd26917ef7784457dc170c2c99bc98a118ecff947602e4d9a60bf21 SHA512 0af4a50cafbddd2a593dac437e6c8121de5265d0383139818bcda97d672a7430cb410ce32552b6842bc82eaebb061bc6cc0ee1b45a483754efbdfbc2103fa2e3
 EBUILD aml-0.2.0.ebuild 547 BLAKE2B 69e6def9bcd3f4cd7c1974f37e1d82a5cd27d0dda1844d101f9561eac3c97b6ca02f41a78d7e48002749b83c6595ec62e3e921ceca4b33d0575be26b3b701e27 SHA512 62b1069313afe519ae724d78e6fef94a7427a31e5faa2d5924c972d5b9b684b689c5b1beab181c88ab26daeb351c3c2f7af838e69707917d54323cece303f70f
-EBUILD aml-9999.ebuild 535 BLAKE2B 3ab2c148d97b733405e6ae622681e48834944564f0fcb7306337938440205765c1c45d16e9dfbddcd9f9dc85d99a0c093090fd4d45e3647e6b3f869a673774be SHA512 ee09a25d9331fe35d9f867780b05aadc03f18fa53ebb70fd69f6782e187dc7829f1112366b198fdbfb810147de3498ca3c4a3570caab942551f506a0925b018e
+EBUILD aml-0.2.1.ebuild 781 BLAKE2B 84ef1a03bef5871649d70370a596a4581d1c925a4db5513217b6ebb904cb9a16951c45a6fc0f5832499bdee77f9e5e112b2471916d91377df131accb0fad0f3d SHA512 f7dbebee00b2692cf4d617c4d5863c28ab37160bfa2f250b3061c192bdf6a6cf8739b3b2a18138c3a1d99036f25a3684c5427e4ebc217ffc1f7961f6c3f74c60
+EBUILD aml-9999.ebuild 781 BLAKE2B 84ef1a03bef5871649d70370a596a4581d1c925a4db5513217b6ebb904cb9a16951c45a6fc0f5832499bdee77f9e5e112b2471916d91377df131accb0fad0f3d SHA512 f7dbebee00b2692cf4d617c4d5863c28ab37160bfa2f250b3061c192bdf6a6cf8739b3b2a18138c3a1d99036f25a3684c5427e4ebc217ffc1f7961f6c3f74c60
 MISC metadata.xml 241 BLAKE2B 846f82e50a664313c50b12a55e75e373c741f992d300613e78ff61acacc9c26ce73fd9fc3d8e195eabc2fb3ce8f4b327b667e02f96cc7937c3d8d2805c80768e SHA512 65d4acc3b715ff5e9929bee91adeebae522449519fc091cbdaa3afd74bdb36cb7f8f13d96ca7e95757ad9e66ace68727ca96940a4187ece4c7821a5f8992e64e
diff --git a/dev-libs/aml/aml-0.2.1.ebuild b/dev-libs/aml/aml-0.2.1.ebuild
new file mode 100644
index 000000000000..5ff10f20992d
--- /dev/null
+++ b/dev-libs/aml/aml-0.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Event timer executor loop"
+HOMEPAGE="https://github.com/any1/aml/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/any1/aml.git"
+else
+	SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
+
+src_prepare() {
+	default
+
+	# The bundled copy includes cdefs which breaks on musl and
+	# this header is already available on glibc.
+	# bug #828806
+	rm include/sys/queue.h || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use examples)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/aml/aml-9999.ebuild b/dev-libs/aml/aml-9999.ebuild
index db62c0b53724..5ff10f20992d 100644
--- a/dev-libs/aml/aml-9999.ebuild
+++ b/dev-libs/aml/aml-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
-DESCRIPTION="event timer executor loop"
+DESCRIPTION="Event timer executor loop"
 HOMEPAGE="https://github.com/any1/aml/"
 
 if [[ ${PV} == 9999 ]]; then
@@ -13,16 +13,28 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/any1/aml.git"
 else
 	SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="ISC"
 SLOT="0"
 IUSE="examples"
 
+DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
+
+src_prepare() {
+	default
+
+	# The bundled copy includes cdefs which breaks on musl and
+	# this header is already available on glibc.
+	# bug #828806
+	rm include/sys/queue.h || die
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use examples)
 	)
+
 	meson_src_configure
 }
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 0f7fdabb0740..4a629e6374f9 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.5.tar.xz 2344820 BLAKE2B 714f7004db7579fb293c68e8574f0ebb8cea230e090edbaf459e6e2e0833656d7dd6372bd55c39c5e0b665117015c768990ac8b182a51219823c9cf90360263d SHA512 3f2fff8ee98a5689534802136b9fc8368422ce73c72458924b49beeb5b01170dadf25308bee692cfbc0b0a6cd4b3ee3047e46668a1b76a16b23faec4bf8ae78c
 DIST AppStream-0.14.6.tar.xz 2403088 BLAKE2B 1eb85601c1782fc47ff21983517f301dc9493fb60347cfe8072c277cc4415e80bf6c11a93db80b6d7fe1eeda7ff1fa414fd10ce7ef0d7379b415326407d805b8 SHA512 810aa7427df50793f4bed27cc3cb5b72c156f0c582f241e06131aa8eabe82d59c8ac0bcc37a22877f7a19ac4640a9a831f8b567ce3e2d26a41ce999515affdb0
-EBUILD appstream-0.14.5.ebuild 1788 BLAKE2B 6caa408ff4ce96c547fddae9396d6e92d9721febf16d73c32052a93bbfe47add052c4b49185d8616eee1aa79ad3f69a9cac2caa5c6f4ff807063746f3db4ddb6 SHA512 b615ef8dc0d8ea2f87cff9c7b98c3c14eb2dd08369f69ff0119e735a40344fac6b370dcddcf78dc6e74f7433b7c0c81d5868d544cb1450affd846c8e694a377c
-EBUILD appstream-0.14.6.ebuild 1791 BLAKE2B 0ea428d3df6a13465aa4fbe3b6d9b0f40b856549f3d1934c548e7611397dbc2a76023ffe180cc600bb6972da351b24d3f1654f78d7dc651c1e1c14bc63c44992 SHA512 91197c450782f4bb70f52e38195c68f7793d2bf14dae858449b3afacc8e1b57f4e1e141b78aba3a5c62d8a469b3a6d555f6bfbe162e8dd6ac7c2d29b09bc6328
+EBUILD appstream-0.14.6.ebuild 1788 BLAKE2B 6caa408ff4ce96c547fddae9396d6e92d9721febf16d73c32052a93bbfe47add052c4b49185d8616eee1aa79ad3f69a9cac2caa5c6f4ff807063746f3db4ddb6 SHA512 b615ef8dc0d8ea2f87cff9c7b98c3c14eb2dd08369f69ff0119e735a40344fac6b370dcddcf78dc6e74f7433b7c0c81d5868d544cb1450affd846c8e694a377c
 MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
diff --git a/dev-libs/appstream/appstream-0.14.5.ebuild b/dev-libs/appstream/appstream-0.14.5.ebuild
deleted file mode 100644
index a67f828fd48f..000000000000
--- a/dev-libs/appstream/appstream-0.14.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv 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/appstream/appstream-0.14.6.ebuild b/dev-libs/appstream/appstream-0.14.6.ebuild
index 0354ce9412b7..a67f828fd48f 100644
--- a/dev-libs/appstream/appstream-0.14.6.ebuild
+++ b/dev-libs/appstream/appstream-0.14.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
 	S="${WORKDIR}/AppStream-${PV}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index a83738c1a32d..0d387cab5ddb 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,5 +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
+EBUILD boehm-gc-8.0.6.ebuild 1414 BLAKE2B 39d14d9eb6dd56b021ac9ff23db3f0ef8d773acbe4459c6ce357a3bf2fa9556f52b3ee173d936260e44a90b6ba39c04fc6785031000474b8dc32970794da62f8 SHA512 3d5e02947dcb1b35dcf4bb207671294d07f58fd41aeb46a1ec702d1ee8016038aafd8d2e2bb40a0c842924fb7efe9148a1c97b4671ae31da608ce945a9c5809e
 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
index fe999330ff0e..b06d52f90cb3 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
@@ -16,7 +16,7 @@ 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"
+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}]"
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 88cb0272652f..120dc2d2a947 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -10,6 +10,8 @@ AUX boost-1.77.0-python-3.10.patch 1934 BLAKE2B f40633c08512f45f63f58cf029aea259
 DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f040832829e63fb0ae47f02fb1aa54720311f56e68b4d4d53557952bb280d60316ecf64ffc1a1e9c9411b70a733690270b85c2d2 SHA512 1358fa6d3afa45fe414f0c11bb583cc8b95737405c6fc3831f7485e22edac990e98849c06c851a4d0fe26bbeec7b8b40103090dc80417ae717ba33caa2088d86
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
+DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
 EBUILD boost-1.76.0-r1.ebuild 10966 BLAKE2B 90d0fdd0d832da9f503999914fec8c8d6c49aeee20ac7bab0d943eaa42ce518fb9193da12877304693d55a2bddc62605ad40c7a61b92a202737b43b751f7e590 SHA512 1910cdf860922e7794ccf2a7a7afe316c96e2ae2a2b4b0ee2f87571ac3b44202aab7d328006f962d5ad970bd295bb0b387d2969578e7f14c23a123a9817256cb
-EBUILD boost-1.77.0-r4.ebuild 10841 BLAKE2B be67ce28dd04bc9e41f07519b7750bbd65bd1e6830bf50619fce6e41446a726ace6918e934832d1bb9db986618f2f0a6a08d2aabf07211377ec85def41a3dc98 SHA512 e2bdd9d39901c9bab8b16227e85e10afe0a1d906ae1b388d2b6ed42674d80838b243ec2b9fb1ef806d18b07a563a499cfdda2402247ef4714bc53261a70cd5db
+EBUILD boost-1.77.0-r4.ebuild 10891 BLAKE2B fce56456f1ae6b23af5836ee5a1e7ee6a3a8bad63fece1f4b18d8188f289a7df758de128059a734a09512262c52d994526a5992eddaf341e7c2b831a361a1c80 SHA512 825bcafe7fc201600d46fbf10355577bee3cce3e7a9ba2e542af1c4e75c99167197d6521adedf7f73320b72f5e7a3b93c55b299cca47c10e48ff0d49a2a05423
+EBUILD boost-1.78.0-r2.ebuild 10632 BLAKE2B 56294fdf2026d10ab0d75067c4a2af42b75aa40157cb5721010fecc7aa4b72986911f8c45d0253b4e68e3de90b2d87b797cefeff206c44cf384ff0bd40c97022 SHA512 3a6ba72384db6d25d873a1361113e5d25bed48c697d63ebe385c569071c4489d79941460c3f8657d9b6092628f785b9f3a4da1442e450f4d73b490ae4702e505
 MISC metadata.xml 1399 BLAKE2B 118d73d46a29003761ee30d2166e747d192010c47bda8b13448dc3b775ec40e47c51a234fe6eb0994387ce01b5bbe9e5fb1aaedccbf09674e654952400a85b03 SHA512 a82bd9de9e47c55ff4b131549d693443b6ea1986c74afa1a6b2eb2ae7885e5438db60b4c2f5620463b78b8e461942647070729ffc92fcda7fe4a9d0e8c8def66
diff --git a/dev-libs/boost/boost-1.77.0-r4.ebuild b/dev-libs/boost/boost-1.77.0-r4.ebuild
index cebd955d5882..5ec5337f1703 100644
--- a/dev-libs/boost/boost-1.77.0-r4.ebuild
+++ b/dev-libs/boost/boost-1.77.0-r4.ebuild
@@ -91,7 +91,7 @@ create_user-config.jam() {
 	fi
 
 	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ;
 		${mpi_configuration}
 	__EOF__
 
diff --git a/dev-libs/boost/boost-1.78.0-r2.ebuild b/dev-libs/boost/boost-1.78.0-r2.ebuild
new file mode 100644
index 000000000000..185d0046dbf0
--- /dev/null
+++ b/dev-libs/boost/boost-1.78.0-r2.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!app-admin/eselect-boost
+	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+#BDEPEND=">=dev-util/boost-build-${MAJOR_V}"
+BDEPEND=">=dev-util/boost-build-1.78.0-r1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	# Boost.MPI's __init__.py doesn't work on Py3
+	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
+	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+		$(usev !mpi --without-mpi)
+		$(usev !nls --without-locale)
+		$(usev !context '--without-context --without-coroutine --without-fiber')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build/src
+		--layout=system
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=shared
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	ejam \
+		--prefix="${EPREFIX}"/usr \
+		"${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			--prefix="${EPREFIX}"/usr \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		--prefix="${ED}"/usr \
+		--includedir="${ED}"/usr/include \
+		--libdir="${ED}"/usr/$(get_libdir) \
+		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				python_moduleinto boost
+				python_domodule "${S}"/libs/mpi/build/__init__.py
+
+				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
+				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
+
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+pkg_preinst() {
+	# Yay for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the Boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 9b20f3e5f814..bab40316d7ba 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -4,7 +4,7 @@ DIST Botan-2.18.1.tar.xz.asc 488 BLAKE2B d7e6f18ba969b1fffe5aec27ec28839bb6eefac
 DIST Botan-2.18.2.tar.xz 5996928 BLAKE2B 5c5ac1e8e2de16a012aa5716138f4c2d2b8178f0a811993e5e297aa5ae9e7f6d5a4f182d50566f5848a4f93a88bcec622291a15370c4c017361ca65d3bb189bf SHA512 ccf9286ee891fb201065a0a6a991ce78ef7f5dd0caf04010527cd524b824ea470e5ce302853c1839e999a1b3dafb2e82eb298036a37d11f0cf3df5fa09529d9c
 DIST Botan-2.18.2.tar.xz.asc 488 BLAKE2B 03744e95f52031295162b63dc34d7e0fd9a6b01ae751a809eed5f24c46017fca253c8d42c88b568566f393f0e6dd55d488ef56223d164941386690e2accdf296 SHA512 6764bcdb52a3a28672bcf22f8c364c926511a7b7c9bc227ba15f1e4b2feb9b371a9a4bd9bb1ee43e85faacbef4df5ce39a158357b4ce3706a00f4220bea8d926
 EBUILD botan-2.17.3-r1.ebuild 3081 BLAKE2B 8f1566d33d79f8c580bfc50ff282a54d1ad779f6394f9f78102f8364c39fe45902f04ebf41f14ff5c91a9c6ffe7c197727c86ecb7ef00b89b6da30a33a365eb6 SHA512 157e5dc7e0e502b06f23bf9c2961f5b3db6b85ca1e118a5035261a19ed11ebbc9105631ee332b1af4d70d83fd90d5806fc7345639b33609c22327413428d8cc2
-EBUILD botan-2.18.1-r1.ebuild 4153 BLAKE2B 2573fb8a14539b3bcccdfa1be03d83565266b0c8e7bf741615ddebca84f59f0b23f3228f61190655a0f9e6268da6ca9ba34fcb128b858f230e1c775e9809ed1e SHA512 79212f1525a920c0a28149f9a1cc81d23c1e99aff1565c3b12dd91e424c9dc5cbb441df7344032d272f00719a2ae2eb2af439c9f3d6f3d030aa428f053f662a0
-EBUILD botan-2.18.2-r1.ebuild 4079 BLAKE2B 96ecfbacd8f1b8c3d64ba8eaf0cf79aab59e3cc77752e1d4da60f8f15bc8e69714193fa19bbbb5474047eba0e3d89f460f00651af8347f4dc25d6f8da40ff10f SHA512 24094a76df3a2c980d86395cea161ab52e76547153c6bdd8697b12147d4694ffe9d15f7551ceba3b9f29ea3b24be822a6d87b6d3b85a2be6f879ffeb81efc46b
-EBUILD botan-2.18.2.ebuild 4123 BLAKE2B 1b703857b1f9a106b274f15bb3167d64e3d09f5d14c8204a72d0a370ecce8de5038170360671133b0791c0ae283d6ac3796fddc000a0419c3e26b3c7474709a4 SHA512 9c1793823667ce4b996ab4166e617e8e832b2dfd7564c346a432e48fd0a5e9755ce43481cb6cfdd0ef843723711e0694034361eae0a4648e88e682b868faebc3
+EBUILD botan-2.18.1-r1.ebuild 4152 BLAKE2B b68a3086361a2ab57300ff34a2183fd44b59eabb8767bd4c52823958ee4c8245ae342ecc41843f376267f28d356ab16f5a1057724a937c636f7a8d6a234ddff4 SHA512 7424a416c63774a7c0b1b7a5bb2442cb8f05ba47e35bd414785ca07ee2835fd6ad853ff93992de844e35cc69ec643de37946f3ee13268576d83227766d9f5b78
+EBUILD botan-2.18.2-r1.ebuild 4074 BLAKE2B ad2d28abbf64514ed31b13920fa302274b7e142e635f3ad4c5200695bc63f945908016c2f532fbfd008cd71f3824e0c40deed9f235fed9760733ccde90f2601f SHA512 c92b0f2f1f249174368918e6614dae17108be3a8da0dccacbe27bb2eaf45d097187e2afb1ed581f471c4dc7f19198fa27b3f41cb4ec6e7d6062b90840fa4216c
+EBUILD botan-2.18.2.ebuild 4122 BLAKE2B 8272c0668618a2941736e52aaf021baa66b343b2556739aab54c4f618670a4884ffdcfb92dffcc16d94620bbdbb4815a25f5c6d4a49c37d0710e309fa3674a65 SHA512 f445a6fb473df1440b84dc3319ea5cbaec171edcc2611139d54a3ca92daaefbd4571ef351ce9d931eac7dcffeaa12bad1e2edab978653a199a8f852258f0e2fa
 MISC metadata.xml 519 BLAKE2B 78e28054a5c35b101d1f1b20ce1095a8a4f0ee8cf312e8d4f3aa711310d34d48878040ffa2a5a7a6600b071cfb5898b69508796aacd3f1d7658c2f30cbda1200 SHA512 9b039acb51f28ad8f21ed310e34d0d36fa7c5dd763fe8661a7ae21dc8dcc08c55d1eb9f1d0e519773697fe18600ffb3424811244e6f7ae243f6e675988006142
diff --git a/dev-libs/botan/botan-2.18.1-r1.ebuild b/dev-libs/botan/botan-2.18.1-r1.ebuild
index 8c5f0701e2f7..2bd62f0815f7 100644
--- a/dev-libs/botan/botan-2.18.1-r1.ebuild
+++ b/dev-libs/botan/botan-2.18.1-r1.ebuild
@@ -45,7 +45,7 @@ BDEPEND="
 	$(python_gen_any_dep '
 		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	')
-	verify-sig? ( app-crypt/openpgp-keys-botan )
+	verify-sig? ( sec-keys/openpgp-keys-botan )
 "
 
 # NOTE: Considering patching Botan?
diff --git a/dev-libs/botan/botan-2.18.2-r1.ebuild b/dev-libs/botan/botan-2.18.2-r1.ebuild
index b6eed68539ce..9cd3e6481fa1 100644
--- a/dev-libs/botan/botan-2.18.2-r1.ebuild
+++ b/dev-libs/botan/botan-2.18.2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 IUSE="doc boost bzip2 lzma python ssl static-libs sqlite zlib"
 
 CPU_USE=(
@@ -45,7 +45,7 @@ BDEPEND="
 	$(python_gen_any_dep '
 		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	')
-	verify-sig? ( app-crypt/openpgp-keys-botan )
+	verify-sig? ( sec-keys/openpgp-keys-botan )
 "
 
 # NOTE: Considering patching Botan?
diff --git a/dev-libs/botan/botan-2.18.2.ebuild b/dev-libs/botan/botan-2.18.2.ebuild
index 9a5b8846dd45..c13bf19a1196 100644
--- a/dev-libs/botan/botan-2.18.2.ebuild
+++ b/dev-libs/botan/botan-2.18.2.ebuild
@@ -45,7 +45,7 @@ BDEPEND="
 	$(python_gen_any_dep '
 		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	')
-	verify-sig? ( app-crypt/openpgp-keys-botan )
+	verify-sig? ( sec-keys/openpgp-keys-botan )
 "
 
 # NOTE: Considering patching Botan?
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index ae9053920640..a9befcc39fb1 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,4 +1,5 @@
 DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
-EBUILD boxfort-0.0.1_pre20200902-r1.ebuild 964 BLAKE2B 7b8924aa4257f5bf75ac8f1865b36e57d04ab3f995be5bb5431fc89a5e8a7d610e8e9aee518670e76c584279dcf5670387e95203244fbd7a9306b1b567b2cd34 SHA512 9716d2f4c907439d47ae310e9082a81778c90865abd0e1946af7e6f2d7d300ad6a9a09f7cf33f518b20019fe4aaa9043e3e7f53027c5b983febcee135a04f204
-EBUILD boxfort-0.0.1_pre20200902.ebuild 955 BLAKE2B e2bb6d346fdd0287d95b370035067b320720105e6c082d98fa28552df6339fd3b00323ebe531bdcc30d551bf8ced1d87c5e80d029ec67f9d49469ee0fe31c4bf SHA512 fc62cf164a55fce91e97b8cab102951ff33d51ea2f19bcfcbf28d400a29a7d3059dc17d27770b00704c5271b2c6c48e41dae8e86597c5dc1f45c11e707d3a5f8
+DIST boxfort-0.1.1.tar.gz 41993 BLAKE2B b9153a6330cecb781e2b5cd20554df3d0aad277dfc01174fd5d375211896b2912f26a76b0ba6ef7143c7101d844072e1a857caf5a8191893f22c0528c0a203d4 SHA512 48f7a0a52d03f36307271c8f387613dd53aebb19d0379e1758d557b043854c89068776ca4c22e64eb518429dd629c9a082476ecd2a548ac95e6aebef512a50ca
+EBUILD boxfort-0.0.1_pre20200902-r1.ebuild 963 BLAKE2B f79546fe561570a0da7cba09c72d5e0e7b3f23c020c30f2d7a602bed60df267e96564cdf1044c56a317d14f0134f458523694e835635c7b6eca2174a27f75f37 SHA512 b5dd8932584ce89160de6884640e8a828819c28f90d9375bce754f7c802271d4d1075e6e8796f3d4628cf9243b63252b1e865862b8620d65e8a80deae84696ee
+EBUILD boxfort-0.1.1.ebuild 882 BLAKE2B b9776e45a8cff6d5fd3764aab576429a157bc877ee86ebbec21ff97267d1ac7562672e5d6d9bc9bdd224f2ecf7ba45c3d465759effcf2144b8033973c5fe1adb SHA512 d8741fa3896c594040d7cbbd5efd5716fe97b26c47917fdaae5f274619540dd04c7f10568561ea74d59aead04bf159ce98351ea5195d4f9b577433796ffdded5
 MISC metadata.xml 493 BLAKE2B 26ae62742b6461f52ff68fa741cbef36de3e27d9580fae5265d02e089b1403d1cccad76b09d53b707454a9bbdaf60bace25fb1f0c115ee42d17362d6fe6543db SHA512 5f89cc0f108d3971d7b1cac8c9dadc0d16df0b6b643f484fcb214c04f772a5e071ef34699c6b0ba31c2783a3cae9e2cf166799224c3ed70cc2b7cedcf43d49c3
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
index 5acd33a66766..693c2ee3a362 100644
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 -riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 -riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild b/dev-libs/boxfort/boxfort-0.1.1.ebuild
index aa3165f2c70d..45a22331a50f 100644
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
+++ b/dev-libs/boxfort/boxfort-0.1.1.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit meson python-any-r1
 
-BOXFORT_COMMIT="ac0507b3f45fe58100b528baeb8ca04270b4a8ff"
-
 DESCRIPTION="Convenient & cross-platform sandboxing C library"
 HOMEPAGE="https://github.com/Snaipe/BoxFort"
-SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Snaipe/BoxFort/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 -riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +22,7 @@ DEPEND="test? (
 	)"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
+S="${WORKDIR}/BoxFort-${PV}"
 
 python_check_deps() {
 	use test && has_version "dev-util/cram[${PYTHON_USEDEP}]"
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index ae35a3fd0846..718606530996 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,5 +1,3 @@
-DIST c-blosc-1.21.0.tar.gz 907199 BLAKE2B 08c52ce5f0d285798aef8720378d1cc3f2d2b0a99cf47f0a49dc82757a0edb4a37c5c0d226a80bae5f9be74b5c2a070906387b9677df71ea6b825662997168a1 SHA512 76758176f91979794dc3b8d46c21294d81e33fda4f2e299b031f2dc059d77e351e3f5f1c984b0263713d6e04c48534984d580244573dd96f0198dd3838b9f376
 DIST c-blosc-1.21.1.tar.gz 1456777 BLAKE2B a6a48d79fc8cb3df277e878a69361a5d12552be4b8ae50a4a95d2fe48d5b073c849724913a20c2834de7cf3cac7f288ddfec977ed1e4a1875fc3d21975907b44 SHA512 e06712ffaeaa6892415a6b01219221426c20af4191db6ca923301313daa8f5b0a83a7a3cd273f7013766349ace4e4869590e9c44bd892e57027ca45de53779e7
-EBUILD c-blosc-1.21.0.ebuild 1138 BLAKE2B 1b370754cf3d92078e4047978521cac5f17056266abd035c68a70b6eb37cb1afdb1dc9332ef4cce6a571b5e671a00e7c06f048c6d53c4588d23d8128562b2042 SHA512 884a1c91ff12d6dbe0ed18a8cd7ab162c546e3042e09da88ff6fcdb86f9591899d36e4c2b5cf45ca18851c8f16c6f234d58d3e8ccc1ac3e6ca6fd55c0b6d4944
-EBUILD c-blosc-1.21.1.ebuild 1156 BLAKE2B 1364f246bba168ad647feab69c1560438824efc466d6e1ace215231cc882264658982a990bb95374d5aa0a3e9c3dfa03956bad20574f55655d1f3fb6226d060a SHA512 fe769deca5e2299bfeb3060f135b3674c76f9aba3ab8209660d2a03fe429bd5d8ae3dfb7d377c9288bbe6c342280d4f2f2fe2c7ce8b33274dab1a808c9b014f9
+EBUILD c-blosc-1.21.1.ebuild 1150 BLAKE2B 94fb2d9327806ef105328bb5b7714b1c9864c693623c1f0f8fb4be58e771d81147cbffa093ca5cf7b8f8f1cb46f417df846f26e465ed35ee452ff9dd25d6fee0 SHA512 0522f88ceba2c2acb65a33fc4aebb0a866e979abd8feeb0742679c5030cc9d7aa97fb16888b2b22e893872fc345d1fb63e106b5e06ada2edb2b893e9935568e4
 MISC metadata.xml 839 BLAKE2B 108d89a888ba31f03eb42a0717c7c9458d599cdb67cf98940c88ff943ce2079c736b6a52ac4206d4ceda17f56ea67e52dae1c77b304d39fbb9ec249a8ac38576 SHA512 f4ed6f93992492a98499ad1dff54b3fcd14e35710e0307041e606ddfff54769c5ed6ccd3ef90a5ce7943425bcee93ea9b46211f643da30d94db88adb6be7d5f8
diff --git a/dev-libs/c-blosc/c-blosc-1.21.0.ebuild b/dev-libs/c-blosc/c-blosc-1.21.0.ebuild
deleted file mode 100644
index 42530236404a..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.21.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DBUILD_FUZZERS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.21.1.ebuild b/dev-libs/c-blosc/c-blosc-1.21.1.ebuild
index 0626635da618..ff5e50e77c0d 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.1.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 1a2128eb52fc..39b6be2a91ba 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,6 +1,8 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
 DIST cdk-5.0-20210324.tgz 548203 BLAKE2B 7a944f347bf30a6bf602b9ac61fa547c7b4aef073db54272e4a8d2bd7d83093888f2ca9e5ee9c2d067777472d2abb87cca42b2912b0491b81472cfce086640b8 SHA512 72d62307824708858ca4fb3865d332cc81e987d7ef685011cf127c8f77cee3e19fe9dd6a35009d4416769cb00f04e937ebaec686c61ca0ba58655f522a175a59
+DIST cdk-5.0-20211216.tgz 552041 BLAKE2B ce82ac22d4ec2ed37079d3de52a4f93a4206e5228aa952a3e45294d260c1ffef7c363b2c290060cc909bb8ab4ae88cbedecf498db7bd0f13e2d2822d87d7e4fa SHA512 622e99681af8468aaf8638833d0821c743667fb9b41716fe16acb8e78e8a3d5ba4eb7aced0bc213697e120dcb6e96067d6b75d53531555c3e6d90e4961cb99aa
 EBUILD cdk-5.0.20160131-r1.ebuild 1184 BLAKE2B e291fd42419df39f3dedf3482235634d0841d0fcea6188c2f248bb6ed346482c2c47b6e2e2995cc66d2705811bfd805a82accaadcbde06c190f51e302c03ede7 SHA512 5ff631f36aa0a2c53d189556236e084b8b76fc8d7ab423d8874319f511b4fe05a96b41f4840824764979fcc33bf798f71f18b9fdb4715604a40d8be1f044fc69
 EBUILD cdk-5.0.20210324-r2.ebuild 1362 BLAKE2B 0ff00368623c8c023b8469a3dc0f85198da31d3c2bd15144350e46839310cbc9119cd5ee4afd8ea2d54e77586759727a3b4846ff36601cb5c53ad52c04647db5 SHA512 c034330fca16516d8834e6f53b7c615f77084c8c6abd64ded902f8f44cc21de5c9dc1c5b8f59847bd4fbee0fe74a1023186ca6b9454dd1eafee8844d5c2fe80c
+EBUILD cdk-5.0.20211216.ebuild 1301 BLAKE2B 0873a884b56c4ccc60bdece33094b4edead705453e8f9ae81d573224b58a2a3bb7fee2f87bac6dd4f3d6ea9851e4e0b8db72888d043ae9e8e7fb5423fe01d4e9 SHA512 9bf9bf2cac64a0c35ad934a238e17486a3dafdff7e0ea3f4f0403f720fef740bfbdd3f9054164edeccbe79666961e10e206277005792274eb82c8168a2891494
 MISC metadata.xml 258 BLAKE2B 9eea1c1dbc095bcf42ec12aecd34edb7eb5555036e5c4df6f2a99bd4b347b01d29a836383ea1c84766da09449f1f3b5d384ae88d1eca3a5b4bdebb443714ebf5 SHA512 5c828c062e4484fde8de46a476e9a3cc653b8c2863a1fc12a696d72ae81f50e2327e7ec4533085f6bae68c3f85fa6bbe0935a7f286d25363b8f60a99f7804dd0
diff --git a/dev-libs/cdk/cdk-5.0.20211216.ebuild b/dev-libs/cdk/cdk-5.0.20211216.ebuild
new file mode 100644
index 000000000000..26411f13a51a
--- /dev/null
+++ b/dev-libs/cdk/cdk-5.0.20211216.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-$(ver_rs 2 -)"
+
+DESCRIPTION="A library of curses widgets"
+HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
+SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples unicode"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)?]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	if [[ ${CHOST} == *-*-darwin* ]] ; then
+		export ac_cv_prog_LIBTOOL=glibtool
+	fi
+
+	# --with-libtool dropped for now because of broken Makefile
+	# bug #790773
+	econf \
+		--disable-rpath-hack \
+		--with-shared \
+		--with-pkg-config \
+		--with-ncurses$(usex unicode "w" "")
+}
+
+src_install() {
+	# parallel make installs duplicate libs
+	emake -j1 \
+		DESTDIR="${D}" \
+		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" \
+		install
+
+	if use examples ; then
+		local x
+		for x in include c++ demos examples cli cli/utils cli/samples ; do
+			docinto ${x}
+			find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die
+		done
+	fi
+
+	find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die
+}
diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index e3bf22707688..e5f8f58fb33c 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -1,5 +1,5 @@
 AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448b5ab2b6d28a1baae28cce45a6c0e051bf190217ccd29539c6c40db9690b0845f9c797e7e2929f8fb1 SHA512 c8bbf4c5eac8d3d67f4017d8b5097925806864d54914ba3472f0c589bcb72b4d8d4330845170f8aa6051296285abbf8e404dd19103a3e4552fe41bc615ca0487
 DIST collada-dom-2.5.0.tar.gz 4509266 BLAKE2B bf09937680897850dd5c288fd4245b403f11d88a0dfecb8f22d83b82759078f2dce201ed871fb644b165deefce05893354badf75911ab56bb2730e318c472407 SHA512 f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
-EBUILD collada-dom-2.5.0.ebuild 769 BLAKE2B dca7e0ce0b524c1f5705f70cbf839ea2848e8ccae522750d51fcc98c435b42b28386d30259da4c4c8d349a29387b9173b0d995904da3d5585dbacc867c7dda6c SHA512 829c1f7a5915da1daeb48e98b20245f1f5a59f9164038f40c2de04facab8b2fa99d34b2c88200b2486cd91793ecf9d00f75cc6b49bd83af6c3c5a07df03edb2e
+EBUILD collada-dom-2.5.0.ebuild 776 BLAKE2B 9f24c8fb610b836b6a131d2e31cfd7b7094018f33a4e79eb52877400d906fcd89e456ee4c27e45510ee651ce026940a1dea656ef83ebc08c4b32baf1897d901c SHA512 c57942a605a09b30be83ac8a21f2bb67a9727ee615efba64e39dddd0a3f6a3dfe304a83a659c5ad6d4618b3a7df8d51fa22063ad52c8e64b696706c857915b11
 EBUILD collada-dom-9999.ebuild 773 BLAKE2B 8c3ec525d5982699f998634ba3e03dc7272695e45b93792ba7f496f0b3a082e5737255af41096ed2a54c86dd8fe01ec6ec096eeb355c2090f7544285459580c4 SHA512 9d8bdc470880f4afb2a7ebec9838f1307aabdeb3aadd7efaf77950265548cbe08b875c438e3e73d8e35bbcf27dbb4ae3f17edae762bea83cd2959ec1f35187b1
 MISC metadata.xml 403 BLAKE2B 7401cd008bf9c7a690597217a09f31f2223f1af9c71c72d0f1324a71e6abf8b23edfd7eea16fe63e2f78fb8b7ce3f4f13ef6531582085b03dea19f51c472898c SHA512 c415e46dac6f00d5e853afe0c1cda14c4e6dac7c58b1e034f90a97c05e2258f474254cb508a055667b53f87ca9e7f9b2e10476cee9fc185fea804743155770eb
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
index dcecedd6ab00..f007edd29daf 100644
--- a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 681cb5ed1f3d..588a83e7248c 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,10 +1,10 @@
 AUX criterion-2.4_pre20200110-gcc11.patch 370 BLAKE2B 63b68e20cb7d2b84df561bc308e61a6dc3b0398c52f2f575cfb5750b80aa6d83209d770c4feb52c53245e85d6f8b9268a89cfb1892cc26ef9bb79824e5a9b9a4 SHA512 25008b50b4b9b957083fc14537b76f8015264f030a3902ec70629c58ee491f4eaa92009004316f7a2b70b110e498c942d9cbb6ad138fbc599669940b74a5a652
-DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
 DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21
+DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821
 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
-DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
 DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a
-EBUILD criterion-2.4_pre20200110.ebuild 1936 BLAKE2B 188447cc2878f4933ef220f7b5282a35c3e47c1d38fe32fe8fe509d5a6e8a76626f3d7d1e8caaa4114ca962981a300e0cc3b66f33c3099698bb06014d5254533 SHA512 313dd311531830f92952874e5c0a712a5d55b18816f6681c919d71db6a2eadcee9c927f6ef646afc8c35ede0fa6c20d79716f408347992e233dd149e6fba3e48
-EBUILD criterion-2.4_pre20210114.ebuild 1929 BLAKE2B 15da10459a48a1d720d4c7ffbdbbe3489ab851d8a537e42a63342391d1d21a7994c64b3b728b9ec52d7fe8b7b96a8d4ff01a7c4ae8265ba57fe9c8459eb93bd2 SHA512 d2b23b09dba767caed1c9ce2e06b0c2894a2a28c3ef94473d37e4cfebbb92b578f322f0e02dae6c61c78f654e86d63e741568f03aaa08b50c15cbe61134dd1a4
+DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbbdddd34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62
+EBUILD criterion-2.4_pre20210114.ebuild 1928 BLAKE2B 494af9c52b899784e4beb95f2d65571d099ce8fb63d47cea3adbfd2875dfe6a26145eeeaf6ceacb867429b9d9f0e979d88536396ac80fc02eba71539bbbd164a SHA512 b771c5e2e378e8f1e8c352da31c6d11f4b86aaf8667cd28f0076aac8b3e8a1d043da244fd6653d8d459a33a003832569f2fcd896ae65e09101b44f9e6cf6a981
+EBUILD criterion-2.4_pre20211218.ebuild 1867 BLAKE2B bf804369017b1aa912cda8cbd9fcad5403597030ba06c9d7b5354ec3e9cb011927412dee57b7012414b27dc650a7a014e8e1aaf209865174b040839a5cc26a80 SHA512 e3fe21efffc4a804984e8546ba2d6944136e763d1b322a46f59b26cbc361cc687c27f2c7384417e494462a3166ba7ab225874037b57e2b29d53534baa0b38373
 MISC metadata.xml 495 BLAKE2B e26a19888a85984288468d569c85fc5076c0e78fa79c759ef0fb4f62e2c84453200f819459a9b85ac3dd7d4a08017b4c61bfdd01b73288ed4663332030f9a8aa SHA512 9602e9b6e0405dce29b8e90c72d95ce64fe0c4f54df0ed01416cc9562533195c2fcbde1fd139547387b3aabda8b4896a05bf4a277bb3a2921bf02cf66f81b744
diff --git a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
index 2a210335a427..220b6acc2d46 100644
--- a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz
 
 LICENSE="BSD-2 MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20211218.ebuild
index 54b81b96c9dc..5140accac9bd 100644
--- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20211218.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit meson python-any-r1
 
-CRITERION_COMMIT="4b5174ebda04ab76fe65eec25b5b6ea0809055e7"
+CRITERION_COMMIT="a91a69f65006c057812fdd850b100ff28790ea73"
 DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
 KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
-NANOPB_COMMIT="6a6903be6084bb3f5a98a3341acef2aa05c61df9"
+NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818"
 
 DESCRIPTION="Cross platform unit testing framework for C and C++"
 HOMEPAGE="https://github.com/Snaipe/Criterion"
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz
 
 LICENSE="BSD-2 MIT ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -37,10 +37,6 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch
-)
-
 python_check_deps() {
 	has_version "dev-util/cram[${PYTHON_USEDEP}]"
 }
@@ -52,10 +48,10 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	rm -r dependencies/{debugbreak,klib,nanopb} || die
+	rm -r dependencies/{debugbreak,klib} || die
 	mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die
 	mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die
-	mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" dependencies/nanopb || die
+	mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die
 }
 
 src_configure() {
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index cfd655d211b2..a8a932fbfaf3 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -8,6 +8,6 @@ DIST cryptopp860.zip 9274149 BLAKE2B c93998e2deb93abf12b801877404f0f82547bfbbbc5
 DIST cryptopp860.zip.sig 659 BLAKE2B 591a535092c61964c0fbb1ba31e44e70fc5f15757b9b56476ff64de0c28d47a13fe99d7f5819cfeb52e514ade1454622451b267bcc751868defcb080ddf79e8c SHA512 6231816b1ccec75cbcdd09daa8895830c5f4c595a4a0aa24dacc3e377832d8db5efa1aeadf815e53db32fc5263b09dd1b249668f34da4bfad5d5cba6f031ce21
 EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
 EBUILD crypto++-8.4.0.ebuild 1190 BLAKE2B aaeb8f3171c59e2e8061b01fc8e515da289017720b162614ea77d0d7c49dd4c0d558cbf8042272f736a2786e2eb32d05b49669c5df6a1990dcadcae60004613d SHA512 1ec1a83bff3e783106705dfa46dad55bf80026dc0665e58e325f4b43fd314036f33e94a60b392b6fd9b48aae5e2c4534619ba22d4a072ccdfb4e497dd9df1cde
-EBUILD crypto++-8.5.0.ebuild 1447 BLAKE2B d9d8f823078f8bdbe335cc305a11c4f8d4d40b2c23614133a43d330cc183e8af7efe065611aba160e7eb3d8dff264eaf3afae6f26b4b171b2101380d8cc8a273 SHA512 3c7e7827dad7c689926e048349d11f3ada622687ae32813fe9bc9604eecebc04f251470364978ff44170133112a82b07693561f17d2678c61db70ea703b98fd1
-EBUILD crypto++-8.6.0.ebuild 1485 BLAKE2B af5d71ff66b85afe974b4d8152a12c8453be92b69abe98eee3aeb9b762825e4490583ecde2d8ef4af342737d1e90cc8f4075ffd5cb826f734a39ce9f0963a999 SHA512 c4527ee11924249315dc8ba37adc2484976c9de1ef705ad16cf381732fc1065b3ff3872378e6542e94b59f624ba950a1d087b3d16fd48c633dc5abb1786f54bc
+EBUILD crypto++-8.5.0.ebuild 1446 BLAKE2B 0f3b1636a874deba4ddfbe68a77155154eaade357ec1347fce2b3500612f134115bb38b6b52389b33e3aa16213f7f77537f631d03ed967b857fb0b889d86c61d SHA512 3e570722fb2dd098957d883e85f250abbf075e7498be37042ebc96446424e09b8b9e9040b9eda72dca054f87d2128a318eb569021d6cf49c6b1f2e5c377170cf
+EBUILD crypto++-8.6.0.ebuild 1484 BLAKE2B 3ad6b804dac04fa8b2e4f5cc302f62c432a8ffccf9db10784fb7cea48820dd5cf3b094e189cf339158107a6fc2680fe658d9bb847638584aed98011e682c0811 SHA512 37eed0f2ad965b8c6f82ec1163095e83212742dea7b0f8d037fcc968206b2878cfc21708c2a515cd06dff2ce90f1b825784e2381b2bf11c723fe30b63219767d
 MISC metadata.xml 506 BLAKE2B 5d6a8770ad53c178e43d30c04be9924718eaf373e8d9945f637db7af71fccf9b21bf46141910ec1cb1ea12e3817dfef4c7881d935fb6f441898ee949ac13ee5f SHA512 8d195dfc2d4f627f59d3a37d4988a0bc59e420a64f8615b819760e32449640eff2f357160b2b9797817d38b0e44c8d6bc04bc4f84a2bd20cfdb7fb5d12df7f2d
diff --git a/dev-libs/crypto++/crypto++-8.5.0.ebuild b/dev-libs/crypto++/crypto++-8.5.0.ebuild
index 60d82af5be8a..af996cfaed97 100644
--- a/dev-libs/crypto++/crypto++-8.5.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.5.0.ebuild
@@ -21,7 +21,7 @@ IUSE="+asm static-libs"
 
 BDEPEND="
 	app-arch/unzip
-	verify-sig? ( app-crypt/openpgp-keys-crypto++ )
+	verify-sig? ( sec-keys/openpgp-keys-crypto++ )
 "
 
 PATCHES=(
diff --git a/dev-libs/crypto++/crypto++-8.6.0.ebuild b/dev-libs/crypto++/crypto++-8.6.0.ebuild
index 442c22f0aba7..23fa80f92eba 100644
--- a/dev-libs/crypto++/crypto++-8.6.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.6.0.ebuild
@@ -22,7 +22,7 @@ IUSE="+asm static-libs"
 
 BDEPEND="
 	app-arch/unzip
-	verify-sig? ( app-crypt/openpgp-keys-crypto++ )
+	verify-sig? ( sec-keys/openpgp-keys-crypto++ )
 "
 
 PATCHES=(
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 6ba347943383..dc0f5cbe362e 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -1,7 +1,4 @@
-DIST cudnn-10.2-linux-x64-v8.2.4.15.tgz 1010215841 BLAKE2B 582d06f70e537a28527a5d9a39c7a7d9debf832c972c6a318d70b961aa5402f108234f920512acdcc6a56aa715c2aedd9d6c08ff9469bed05698a6a0431b7b29 SHA512 bc83bb02e53b111486ff5a028f3d4866e47c75c2c0cc3271f6d8c647ca3aad8234c635f4bb24ed4305c67017a64b841be981334c3b08d2ec4f3442180c2dd9f4
 DIST cudnn-10.2-linux-x64-v8.3.0.98.tgz 742140405 BLAKE2B 648849c041e2e7d87a8d804a35d9e0fa1d9a454977aaec4545386ee0c8b57c502b98583a357a70b7096905f82c2a8dadc252f8b363a7975d572167f4f7f2f121 SHA512 e0c6967663bdaf0e7539b550f1aa84aaf35efe6192fc524d78f6a1bc980a79b05eeb0693e9548f4d3433864f88137ce2ff1489d7dd0e8cf883000d6c7b9a62bb
-DIST cudnn-11.4-linux-x64-v8.2.4.15.tgz 1876975307 BLAKE2B 50ad2f1de631c3e6e476b25283fd7f80382e7c311694512cf0c6e8b52c9d50513dc6179c8e99907200d98e510a77adfa42caf6cf76892977c70347e102f6fe00 SHA512 3a9438952be0396f68703dc5ccb77b38445589e4f2c2ce3fb628533d0a78e425958f7825558086873f93ee8dcdcb31329e2362f6427aec5ec797e78e280f470b
 DIST cudnn-11.5-linux-x64-v8.3.0.98.tgz 1477554466 BLAKE2B cd8b7bdca8ef08af971d56b43b80f0fe721f76cb744bfef43a9369f81a2533b00651f2c89e9084026991a1cc1c6db13b55914d966b723edbfc104c3e7626a087 SHA512 46af7d47b40a2c0ee8d5b893514755f803b5a0c7426b8d88b258e71ae6312cb553cba7dd68f63e2060849c70713330d52f93f56121f663213c16030d39b2fc1d
-EBUILD cudnn-8.2.4.15.ebuild 832 BLAKE2B e555a5c058fe8dddbb8e290de859c9dea098a299be572e9fd85fa71dc8a036982d5e0cbb00756e6e8f89b908d0871a76dd737baf8cfef58365bd4f127519f3a9 SHA512 808005a94f97733befadc4a9a9abc44fdfe01a065398d88cfdacea258e5f04fea5206ac2a6f4a494bbc6251f978e365d28631f303188009cb8fece3e8795355e
 EBUILD cudnn-8.3.0.98.ebuild 832 BLAKE2B 70584e11eebea6788dfb5f1d9586810e85cbcd93f128546fe926ca39ad23a29c2eae24fdd78d7cb178de195982ced709d768358173b343a3fca6f870bb25c73e SHA512 16af64f86ac442b3ab5adf62fbc1e4da5ccb8d20b656125edb8b1de0bee29b197c48215af1d00ba00c50141f9e355a2d4194523d5778cdfe2b45a93399139fe4
-MISC metadata.xml 422 BLAKE2B 8d108ebc395f829e24f759b821619a4d0157737dca9335811cd3ab4e5b4fd712aa677d326c68b2b75a98ec96410aa8e6373661c2ac33972b709a2cbe3a747371 SHA512 f7ea10740ecea611189d41fbabbddecf28b0243ddaa27f2a0d66983f30cf6b1aac34d160561e5578d2acd60fe7039bd3048c08edff7a868ada9f3ec77ae67d2a
+MISC metadata.xml 371 BLAKE2B 07b65e38f232d9b70e9769516ee4e535b2ad6a1d0deb1d6103c503aa0bccf34d1171e1d66a5c7415dd2be3cbbf33619486b18dfd69cefe8c3e5a3bac4387bf1e SHA512 c811a6d843e7c24a2c6c0763db24ede4562e33d797ae8d531b9dee890cfa3acc0f46f58fa595d92bc862a58a930023456e1fbdc31c63d5411bbd688f7ad0bf54
diff --git a/dev-libs/cudnn/cudnn-8.2.4.15.ebuild b/dev-libs/cudnn/cudnn-8.2.4.15.ebuild
deleted file mode 100644
index 9420d5595de5..000000000000
--- a/dev-libs/cudnn/cudnn-8.2.4.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-SRC_URI="
-	cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )
-	cuda11-4? ( cudnn-11.4-linux-x64-v${PV}.tgz )"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-cuDNN"
-SLOT="0/8"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="cuda10-2 +cuda11-4"
-REQUIRED_USE="^^ ( cuda10-2 cuda11-4 )"
-RESTRICT="fetch"
-
-RDEPEND="
-	cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )
-	cuda11-4? ( =dev-util/nvidia-cuda-toolkit-11.4* )"
-
-QA_PREBUILT="*"
-
-src_install() {
-	insinto /opt/cuda
-	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
-
-	insinto /opt/cuda/targets/x86_64-linux
-	doins -r cuda/include
-
-	insinto /opt/cuda/targets/x86_64-linux/lib
-	doins -r cuda/lib64/.
-}
diff --git a/dev-libs/cudnn/metadata.xml b/dev-libs/cudnn/metadata.xml
index 0686d6ba5a9f..410aa3e4aeb9 100644
--- a/dev-libs/cudnn/metadata.xml
+++ b/dev-libs/cudnn/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cuda10-2">On Nvidia CUDA 10.2</flag>
-		<flag name="cuda11-4">On Nvidia CUDA 11.4</flag>
 		<flag name="cuda11-5">On Nvidia CUDA 11.5</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/d0_blind_id/Manifest b/dev-libs/d0_blind_id/Manifest
index 20e299cf4e51..ca069b32bcf2 100644
--- a/dev-libs/d0_blind_id/Manifest
+++ b/dev-libs/d0_blind_id/Manifest
@@ -1,4 +1,4 @@
 AUX d0_blind_id-1.0-slibtool.patch 1564 BLAKE2B 60aa46c04897ac10b57b67cdaf0efcf93468a089d0b0bf735abc0d97af734821d24139825600e20520e6a15359de236a0e010aa2a8d5dffb3c7502662dba6fa8 SHA512 b0c082358bae52efcac9774198a2c8f75d804e9cdb88922a81548c19bbc9b03f1c4cc20c70e5b75eec3ca822d297ba01092d72fc49e4d41023fc384320818a5c
 DIST d0_blind_id-1.0.tar.gz 49110 BLAKE2B 1977bb9c71d6655e8a84aab9daf5aee470ac3f3e140e7beff3555a41a81baebab5e4e5019b0550594b8c6e8b936706bb9790e5e3171c1348abf3212349d07109 SHA512 dbee0bec44a008a6843ec367211e4cdfa25f6c4577b48d942d19301d5ff885d4fde8d40ea304a114d349d8e90283a50854afb2fb322bf19640842ded025849f2
-EBUILD d0_blind_id-1.0.ebuild 989 BLAKE2B 3933e658ba0516397e72e4350e261852b8a870e02ef68049426b386c12b2c2cc26ee53a52dde47b31e2c8c5f95dfde8ac72edb33f6c99f7d92e195082622e856 SHA512 550ba6ddc37800442f864dcc08231a88ef20b5fff27c4e9d0368631363408efa476b7f673a98c8a848fdf801812d0ac1cdf92f597da117c8e01e104f395c1a1f
+EBUILD d0_blind_id-1.0.ebuild 996 BLAKE2B 2bbc7b5023392c8a8e9f70d9db033de5441b724de4a38ac7fd35c2d430b4abf0f0115b7f89913addaa758bb3931306fb98ce5eef461b2ba2b8e1123b1289fb36 SHA512 eda309a54fbc10a92ba37946e9d903b313ba1a970af830f2fe37c6864d1903157dbd1f78d56bcb43a9281f198e166a074e95c4c39ec381f9cd215fd9558a3e90
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
index 04e9e80c4412..f44ecf9b3de1 100644
--- a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
+++ b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/divVerent/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/gmp:0"
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 2dee8d72a16e..31c8c3893e0c 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -2,6 +2,6 @@ AUX 0000-INI-Fix-detection-of-error-messages.patch 1761 BLAKE2B bc1002e9ff7963af
 AUX 0001-path_utils_ut-allow-single-as-well.patch 1247 BLAKE2B fb3be441ff1066010043a473c184bc0a4e3a85ead8eb89d38d9731c40f33045a47ac59a6b281223f69f4e173baa9193edd65db7980db9ea031db87ced6a191cf SHA512 1d8e5cd540cbb9be1422274ef9318edc256be3c439b5a320f53913b2322319f67acf58a3e2d308dea12b925ea4a3956d8454a0ec7680412dc68e2aea77b0f65b
 AUX 0002-validators_ut_check-Fix-fail-with-new-glibc.patch 1944 BLAKE2B cf1971b715eb37bdb7b5ff3fdc54b1df4d1c9afc5994f6c48b48955cb534573f38444af81971334c1d39883d2a44d635e014e8a5fe1e54f6a03d2e0d597362f8 SHA512 4bdd24c21d99497cdc751a2002bd6ff29d20d3e51b877d0519a7d3134a2cb4edd81fc33ca577d06b52039c87d520e3f81a56303e6a0cad214915503270599593
 DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628
-EBUILD ding-libs-0.6.1-r1.ebuild 936 BLAKE2B a99bc02f571082f4e76d504116e5da87dc241edf0fbaa8e0e676d47f4336ee397ba5dfe438d6498cf1434385039270cd0b6e7591397eeb1a55e22b1449f23291 SHA512 d6a622c338c6f7fd129762863c917340f3d5a0e3c347f7f3e6633d9291a97724ba172ff05d0a9bb62c5b71cff3eff72c1325ab7f6af35ce9fd996117209e0dc4
+EBUILD ding-libs-0.6.1-r1.ebuild 932 BLAKE2B bebbf6d14a083ce22b3121f796353427889dd2149b3760487467316171b73eb37964d9f9fe5605d801d660f4ff5ff0f58167d59826b6eb76e46ba90c8766bb9d SHA512 decbaef04bd6023a0f5a2aed6f811781b1db6e8d455ae9db21b65b07c4c4587a788c36af2f20770b352608d11cbd10603b07e71ea7270aef7d188a30f0c74733
 EBUILD ding-libs-0.6.1.ebuild 825 BLAKE2B 789e20ec00d527df4087230e4707ed24c89ac47399d3c65d358d74c7e68be5bb598c1142d83f7eb6ec092866f97d1733eac92b884f8949b24a1cdf16160a8484 SHA512 b0456b1f28c306c437fd418cc536cef8cb5798febd2e66952101f3cbdf82ce3af34832283d2b460a590d1e6c1a70779b1d6f056431ef0edd5b8a17f7972c43f4
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild
index ea8ee26ead4e..1445f869fec7 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index d5dc8496bd4d..5bf2bbf77bb6 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,3 +1,5 @@
 DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
+DIST double-conversion-3.1.6.tar.gz 7030812 BLAKE2B 8572c4c127bca57c85075a1d308c81e22d133ddbc9c691538dc9a5564f82cf0b6e9009f0d223db0fcfd9c2c662059b8866cb26e8510187f47fe8b56101bfcc82 SHA512 2282e9838f916a0e59011e1b7530c32fb392e9bf07f370df419f1a8c59c88d66f7e16fa6ecdc3785af86591639d1201144feb0c60a5de54482da936f6c0c5534
 EBUILD double-conversion-3.1.5.ebuild 475 BLAKE2B b1e21ecc8dd0452bdc7d3bc77445906e938b194ead9944290ac3ad98087f80864a47591d291dd0f45c8619b60bbf4cc2d6018b869c01a5da1cdc844e8586c1b4 SHA512 09d500e702a461236917e4a0861c6af0bec5f8651d3a20a2fa971a96dce07aab64ebd8c5b05271d96df6d7671fea44cd02893c29b2c225fcc747cf0337c85512
+EBUILD double-conversion-3.1.6.ebuild 482 BLAKE2B a38b28b95ddc705baa7894c0f430fb571c12bd906b9e71f3e01dd31a7d73fe42d1c4e15e8663d70061f83ac5af3540fda21639730b16cb7f8caa9c7eb39a12de SHA512 a00a9d93bed2ddee4c5408221c3297bfe57a4bb69c59c7a8261089a81bfbde748a7e417dafa60714976e30d1e33007fbc745618f02deb5b818c600d091cae4f6
 MISC metadata.xml 682 BLAKE2B d16297d56e3609d9c14023e754fbdfd4a41d1ac91eb9e66e9b5122bfe7758d59d1b1ce92845d866e989baf8716bc425a6229098868ecdd2d8ce10c0af7808860 SHA512 f2c25b81770d33fe86231cb4c80cbfd5495d9ef493f6710c96732c4ad72523b362bd1c22316e326c500afc0f5c4ca22e77f07601a552b52ab71f24ceb4ca7e71
diff --git a/dev-libs/double-conversion/double-conversion-3.1.6.ebuild b/dev-libs/double-conversion/double-conversion-3.1.6.ebuild
new file mode 100644
index 000000000000..199d6bdc3447
--- /dev/null
+++ b/dev-libs/double-conversion/double-conversion-3.1.6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
+HOMEPAGE="https://github.com/google/double-conversion"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 83d0b289c57c..4b521ecf9332 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,3 +1,5 @@
 DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
+DIST expat-2.4.2.tar.xz 449664 BLAKE2B 627ee86bd878b8f0edc50bdbeb26d347ec8bdd06fc369a3ee378ad133d38eb7cfe9018a5839843ba6757d727e84229c84c51d618b5de7e92197bdc7203e09b73 SHA512 c27f2b54e9babc6bd24283b62cc65546f37fa40481ac55b84d9e3ecad1b58d3c52055c71d56600b43aaf20ad142c70899a8dc424dba804b1699077c38dfe34a3
 EBUILD expat-2.4.1.ebuild 2536 BLAKE2B 9972eb17fabcb88abbef831e3788c65ce24145784da964de422b04a3662a534573e2f6b9570ca0ce9ad3f545a252fcdedcf09ddc350f7f8142cb04e3f91acb8a SHA512 dff4de479c889a0f68428e9bc5d0d46a452212c1c3cc2aa57c39021a1d4a216c1abc4854ac229bf5b14384c356d405727d3b7af9e02b689cd342eb42bbfeed2f
+EBUILD expat-2.4.2.ebuild 2544 BLAKE2B 0777eb63704f05f583b3d296826fa7606598590bf257118151e9b13185e73f4b9423812f21a4cc5644b4f4ad9c59004786bf1eac4a1422366016f44ed5e803cc SHA512 c45b5f96f1086bc286ec6c70e85439c6d6345a39d03672401f1e22636c93e82f84ea9e2c9a2be7c07bedf09c25aa43bc1261fd5b0937ff9f6e975d9470ab82ab
 MISC metadata.xml 514 BLAKE2B e38c182f42192e0f3b567423b148733b59ed885cca58d36829dfd57bad88565baca743024aa5fc701f368fcfc8886a92ae20a94f549e190a3d31e2ca5c0e28af SHA512 6248f12ed1f3e2bc10d7f11117ad18dc86ccb5ecc1fc48aac32032a062d1273e956cd22e712a1b14cc670642047f9dcaf63606dbad08895e1e3b94b0573bd74c
diff --git a/dev-libs/expat/expat-2.4.2.ebuild b/dev-libs/expat/expat-2.4.2.ebuild
new file mode 100644
index 000000000000..b92f19631735
--- /dev/null
+++ b/dev-libs/expat/expat-2.4.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+AUTOTOOLS_AUTO_DEPEND=no
+AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
+inherit autotools multilib-minimal usr-ldscript
+
+DESCRIPTION="Stream-oriented XML parser library"
+HOMEPAGE="https://libexpat.github.io/"
+SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="elibc_FreeBSD examples static-libs unicode"
+BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	# fix interpreter to be a recent/good shell
+	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
+	if use unicode; then
+		cp -R "${S}" "${S}"w || die
+		pushd "${S}"w >/dev/null
+		find -name Makefile.am \
+			-exec sed \
+			-e 's,libexpat\.la,libexpatw.la,' \
+			-e 's,libexpat_la,libexpatw_la,' \
+			-i {} + || die
+		eautoreconf
+		popd >/dev/null
+	fi
+}
+
+multilib_src_configure() {
+	local myconf="$(use_enable static-libs static) --without-docbook"
+
+	mkdir -p "${BUILD_DIR}"w || die
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
+		popd >/dev/null
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib install DESTDIR="${D}"
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+
+	if multilib_is_native_abi ; then
+		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
+		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+		use elibc_FreeBSD && gen_usr_ldscript -a expat
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	doman doc/xmlwf.1
+
+	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
+	docinto html
+	dodoc doc/*.{css,html}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+		docompress -x usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index f6c1a727f898..b104523fe3b2 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,3 @@
-DIST flatbuffers-1.12.0.tar.gz 1145348 BLAKE2B 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6 SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063
 DIST flatbuffers-2.0.0.tar.gz 1538022 BLAKE2B ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
-EBUILD flatbuffers-1.12.0.ebuild 709 BLAKE2B 570b8680fe48220728539d9bee3d5bc2c851e4105b4f2d8926d5564359c32dbafee39aed662c311621610f75f64bc4464ded9ecd0571f541eed883d053cb9b8a SHA512 fd7652dc1a6a721965027ffcbfcee9826e2c1728fcc94e69735d14487be1b073c388baa1c56c98de6e5989e7feed3b908ed73fb4941365a9e5aff4a23ca69c0b
-EBUILD flatbuffers-2.0.0-r1.ebuild 834 BLAKE2B 97b108f7f9f030dcff0cf2af923fdea9fc138c57923cd561edef30410bf01042c4752a75dfd7f00e8e949c59ad7756ef2662b79ea8f0dac76dee5c75f1a76f05 SHA512 334f557e992f5c475f29d03cd0089a4845b72eaf6612e1814bb3c1cfa4493b200c7237ce2f50672494a60851132bfab40fec359d7d7ef285aedebc67a519322a
+EBUILD flatbuffers-2.0.0-r1.ebuild 831 BLAKE2B 68d76c63ca1b7e7952029c697401b27d3d16917a1bace1b98df7ca5a4751f4e6d0c9be6f85a655c517add23d13b60c804004f243854a46cd2bf9feef71bc956a SHA512 dd77a7b4ede065ae9e6e8494a85f47f7350cb31cf5d861369f0e0f1f233b3e05847ab03ab528f52134caccae90b63dd8bf02f6e4672785592044eef5229d9435
 MISC metadata.xml 333 BLAKE2B 406420eb792181bdf5e8c93153e9306c84fd6f3fd1148454ec57e858b411b698cff132f5ee4695866ab8984d665201a8ebc942ae425545bd67641e9c1d364b21 SHA512 b9d41f9dc12a72fe220b3b9673fac2656d060be1ed80b1935142e4706e6dc0663dc2667e84245328c8968b5a534fe48800b9b2e8e2b2635365ae741c126f757e
diff --git a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
deleted file mode 100644
index 5bb8e0e5a754..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( readme.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-	)
-
-	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
-
-	cmake_src_configure
-}
diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
index 4be03e4e789d..66d76389cfc2 100644
--- a/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 # From 1.2.0->2.0.0, incremented SONAME, although the interface didn't actually change.
 # (Apparently to adopt semver.)
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 9ae47eef9bf4..af9955bc7467 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,3 +1,5 @@
 DIST fribidi-1.0.10.tar.xz 1147588 BLAKE2B e40e16b4b6167d0c7cc26b72ed21a7b4b2ba78dcce56eaf5dee94835cd2d4770401ac17bc2b5f13227e41e8f19513a0616f49edab07ea8fb2969eab30e24f653 SHA512 cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360
+DIST fribidi-1.0.11.tar.xz 1077004 BLAKE2B 9de3e170e2b6cf90623c711e16f6595f6ca91e14707cbfd36dda7df92689ea79ec36c4b658199e9046eedd07c9ebfde18617525c83cf4b0e9e2ccb4d9f82ed84 SHA512 6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c
 EBUILD fribidi-1.0.10.ebuild 1036 BLAKE2B f2e1ee2d0d667379e2eb4b73636059f8f965c88e398af200ed67338ef7694c08ba84ac1668a8d97c957b5fedbe7a889b0fe331d37990ab7ee7b693b49fa558f3 SHA512 e286612b3598892cd735c801084113d9c0efa301141e55c02da4463cbf8893bb7c2bac63b99bf4d24f8861b87a2bcd012d31695cc6cb70657b1562b660bd2c60
+EBUILD fribidi-1.0.11.ebuild 800 BLAKE2B 5039b43dfbfdff710623d0162d48d55fdeb9be7d87ab0658930808b92b64df86c0dee19465d22d011a8b5f66b9b8ce08b121be9cae8ad9813bdf5525b0f5343e SHA512 e7eaba0f24e030083a03325d5b2fb2de56b54fc7871c4625c7f29ec3d585e869ac782e2978f49cd5d7fdca5e3e5a60660506d55d7bcea6e526f31537831904bf
 MISC metadata.xml 342 BLAKE2B 71ad2adf0909be22d8d55ed37c2ea05e7e2fdbdb14e2eee4bff83447d400b89996403a2c4875d30330e56fd857d3672574006c36ba8b23b91ae0de3e801609f9 SHA512 a4b5a69dea823758640fd15374ddb4e5840bec92cbdaff8f8b62554b472a9b7006f77f0771d8410fc076e67da005a4e153fde7443059ccf9d7d85244c8cf2912
diff --git a/dev-libs/fribidi/fribidi-1.0.11.ebuild b/dev-libs/fribidi/fribidi-1.0.11.ebuild
new file mode 100644
index 000000000000..2022757529b3
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-1.0.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="https://fribidi.org/"
+SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddeprecated=true
+		$(meson_native_use_bool doc docs)
+		-Dbin=true
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 12b3370515dd..c058f9d5552a 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,4 +1,6 @@
 AUX geoipupdate-r6.sh 1085 BLAKE2B f093f49881fa86bb81ac8b7c2705568a186e51c669a3da85114e0985ea7b2cc3de7ab5b6f8ef2e73ccd46af89149eade9b9b116506c6d9891e70dd8613a3c7a2 SHA512 97cdeadaf42510b88e00b3187e51089f62838c87d11500f572ed19232aedde1cb51a4183a84d7421773d8248072c2ef7197a28b0fe9a06cc10624b0f5d00a21e
+AUX geoipupdate-r7.sh 1058 BLAKE2B 1b8e12245ffdb9140a437aca19b8a34d2c700980330c50316a50774bcc2d71df0fd86789f73ee3e61bdd4993a333ef9478e201cabee7508cb49cd52d098928c9 SHA512 7d53aa88d3048431bf9caff37ab61cde737d0bb59e776bd6544e1ef2c51aaf8d36db6ad2a3a674e7226c4d2e26a92940f68c1ae932076e6d0e2ad94e80775f3e
 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d
+EBUILD geoip-1.6.12-r1.ebuild 1276 BLAKE2B c78ac5627607f5de2f1ba2b76f50136a82a3754a99f92ec0bb70eb6d64a1d8d26663052d743bd81e9897fb611b4c38308cf212108b9db6cbf92cf9c0206985f9 SHA512 5b3855c91596e09e9f467c759c6571ce32dc8e2cda7b8bda34fce15253394988476fce269e6790a9c38794560631546325147333c6bc799432e56567d3d04567
 EBUILD geoip-1.6.12.ebuild 1269 BLAKE2B 3f1138520480a81f491554d11553bf3b8c743058218dc7fdd8b3e4eefa2572eef11fa2714822940bf6d9ba358b0efb292b5cba81e7c81f1a983856978231a2bc SHA512 bebd29e5cfa06ebe7ea4d66febb106c5e1759710ab931ee51c4f7fb244de695f14a60f3de1352bc9596845746471119d87c0f6e7d54e9d025e711fe8867a2709
 MISC metadata.xml 375 BLAKE2B ab965301b6b1e134e5f760ee64f84fd9c854d63b278d35f311d8afd7c80034d146cabf57fbbb2a18831a08d114cb0baf10b80b16484affb94ed6f8572e23e27e SHA512 dfaeae0d24da6ae8c0bd1f88ffb5b219e60e14c764816a61c3654c2bd6b60d8cae6648e65ac46ca4cc8ac8e25dfb30f2f8a902f372aa582dd74b37b66e3efdad
diff --git a/dev-libs/geoip/files/geoipupdate-r7.sh b/dev-libs/geoip/files/geoipupdate-r7.sh
new file mode 100644
index 000000000000..67d26bdc2ed8
--- /dev/null
+++ b/dev-libs/geoip/files/geoipupdate-r7.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+GEOIP_MIRROR="https://mailfud.org/geoip-legacy/"
+GEOIPDIR=@PREFIX@/usr/share/GeoIP
+TMPDIR=
+
+DATABASES="
+        GeoIPv6
+        GeoIPCity
+        GeoIPCityv6
+        GeoIP
+        GeoIPASNum
+        GeoIPASNumv6
+"
+
+if [ "${1}" = -f ] || [ "${1}" = --force ]; then
+	force=true
+fi
+
+if [ -d "${GEOIPDIR}" ]; then
+	cd $GEOIPDIR
+	if [ -n "${DATABASES}" ]; then
+		TMPDIR=$(mktemp -d geoipupdate.XXXXXXXXXX)
+
+		echo "Updating GeoIP databases..."
+
+		for db in $DATABASES; do
+			fname=$(basename $db)
+
+			if [ -f "${GEOIPDIR}/${fname}.dat" ] || [ ${force} ]; then
+				wget --no-verbose -t 3 -T 60 \
+					"${GEOIP_MIRROR}/${db}.dat.gz" \
+					-O "${TMPDIR}/${fname}.dat.gz"
+				if [ $? -eq 0 ]; then
+					gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
+					mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
+					chmod 0644 "${GEOIPDIR}/${fname}.dat"
+					case ${fname} in
+						GeoLite*) ln -sf ${fname}.dat `echo ${fname} | sed 's/GeoLite/GeoIP/'`.dat ;;
+					esac
+				fi
+			fi
+		done
+		[ -d "${TMPDIR}" ] && rm -rf $TMPDIR
+	fi
+fi
diff --git a/dev-libs/geoip/geoip-1.6.12-r1.ebuild b/dev-libs/geoip/geoip-1.6.12-r1.ebuild
new file mode 100644
index 000000000000..fd7343e19b73
--- /dev/null
+++ b/dev-libs/geoip/geoip-1.6.12-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="GeoIP Legacy C API"
+HOMEPAGE="https://github.com/maxmind/geoip-api-c"
+SRC_URI="https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-api-c-${PV}"
+
+# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
+LICENSE="LGPL-2.1 GPL-2 MaxMind2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="net-misc/wget"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+	sed -e "s|@PREFIX@|${EPREFIX}|g" "${FILESDIR}"/geoipupdate-r7.sh > geoipupdate.sh || die
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS.md README*
+
+	find "${ED}" -name '*.la' -delete || die
+
+	keepdir /usr/share/GeoIP
+
+	dosbin geoipupdate.sh
+}
+
+pkg_postinst() {
+	ewarn "WARNING: Databases are no longer installed by this ebuild."
+	elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from"
+	elog "net-misc/geoipupdate) to populate ${EROOT}/usr/share/GeoIP/"
+	elog "with geo-located IP address databases."
+}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 5e7d48dfb6d5..c590e3c77cc3 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +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-0.3.6.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
 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
index 712c70f1c1cc..67aab558816f 100644
--- a/dev-libs/girara/girara-0.3.6.ebuild
+++ b/dev-libs/girara/girara-0.3.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	KEYWORDS="amd64 arm ~riscv x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index c516df2787ed..19ee918f68b9 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,11 +1,8 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-AUX glib-2.68.3-glibc-2.34-close_range.patch 1102 BLAKE2B 4f3b747288a531d36b85aa648847892e12744c8e18bd71803531397f175dacfc99f22fdb4a3a8c6ad7563673e789aacd431dd7c5c9a300f34868f2047eacad7c SHA512 737941830ec974d0a18fec69ecc2ebdf6144021984c8f8237cf607cd1417b10f2233747ad470fe9fb14b46e2b3c5081a6d5bb1bd8992030653d940ce0cec6b00
-DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
-DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd347c9025e5663ca8f493092cd2723aba6520bb4f85687491794353685eccacc4dd34339962e5cb717e6130c025 SHA512 be17d79b41d17fd2b144184d6e793180667b7d9ba299215ea6d4948b4c05f6d888b4868c48643e25935a34ee2f85ee1d03e53325151b7a61819437cbd3c84b10
 DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f
-EBUILD glib-2.68.2-r1.ebuild 10165 BLAKE2B 70156b306a52ff61a7f0c998849d28bd088b118e560029b73d9f163b180f02e45d63d9093d78eee4632ee34fb899900fa480b2bd456754c8855f221ce430d28e SHA512 33b9630d5ef59b88f39c62fb1f23c571b7ddb04f46417099037e89565a04f981b611e7b81c99075b8c6bc2c6571792d1dce25459484d1577ab7444cc18e2c2f2
-EBUILD glib-2.68.3-r1.ebuild 10212 BLAKE2B fd76fd20a4107f6209aef8a19ad45dac691ddf5daf990fdf5f3c2db613bc7c1fd5cbf8b335990dc558ec49f5b4d27721a8ecb7de605e6e946125b02d7ea9b207 SHA512 bdd004866a6e2c1e7b163c14fd1edb9ca067704b3211af1d5f2218623829e563ceb3f8e5585015baac65ff942bdbace7359ebd17427fcd4e715295a3cb9191bf
+DIST glib-2.70.2.tar.xz 4822356 BLAKE2B 63b1f4e05f26cd51c3345bb042e2175ebcdb22afa3fef85bccae530581a378070e6c7ea48eb957bcc73142ea228ddb70bdac2679ca2f81155a668560397aaa37 SHA512 872e3f06f87f21a32446b41aac7454fd6bf4d665c753121f6e9772cddebc592b79d88713fc6b8d510636af9f9c4528a9d508d8c4225c6dfeb928390120fb4809
 EBUILD glib-2.68.4.ebuild 10156 BLAKE2B f86fb6ec3c12638df45e91d62d62fba8e7c42a3de4ccaff59b06841c728fc1013ccdd0b2f69ff30f811c249e0a637d7a31dd143c8e4eed4fd15546c97f098622 SHA512 1a208635a8fc5d7273962a37f9f5fb6667af9af2c0e16e7f0d92eb1c33019fb88bfda43225a1ba80b8ecf9154b93c69beb9c88b242e05f584586134e79668872
 EBUILD glib-2.70.0.ebuild 10140 BLAKE2B 791776ba23adf32fb10defb74aa57479715f48a19fa3417db10697e06e17f281d42c864ad6be1ac8294fd7021c5c8128af36b17e4b69bf058098d85cb1be1724 SHA512 80c442c11398e951aed8001a30f6eabaa8d317598fff33643d5b719ed10ba5e680d1442d50ec296985869d8f65765ad656e9a5c2e0ce8868ad429c12c0bb7a62
+EBUILD glib-2.70.2.ebuild 10140 BLAKE2B 791776ba23adf32fb10defb74aa57479715f48a19fa3417db10697e06e17f281d42c864ad6be1ac8294fd7021c5c8128af36b17e4b69bf058098d85cb1be1724 SHA512 80c442c11398e951aed8001a30f6eabaa8d317598fff33643d5b719ed10ba5e680d1442d50ec296985869d8f65765ad656e9a5c2e0ce8868ad429c12c0bb7a62
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch b/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch
deleted file mode 100644
index a84ccaaccbb9..000000000000
--- a/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/803632
-https://gitlab.gnome.org/GNOME/glib/-/commit/63e7864d1a0ddbead3c18872e95116e3843e81be.patch
-
-From 6e59d21b273f026e82adc56fecbec67d1ffa72a4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 8 Jul 2021 17:26:43 -0700
-Subject: [PATCH] correctly use 3 parameters for close_range
-
-libc implementation has 3 parameter e.g.
-https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- glib/gspawn.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/glib/gspawn.c b/glib/gspawn.c
-index 95f5b868e..a15fb1ca1 100644
---- a/glib/gspawn.c
-+++ b/glib/gspawn.c
-@@ -1494,7 +1494,7 @@ safe_closefrom (int lowfd)
-    *
-    * Handle ENOSYS in case itâ€™s supported in libc but not the kernel; if so,
-    * fall back to safe_fdwalk(). */
--  if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS)
-+  if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS)
- #endif  /* HAVE_CLOSE_RANGE */
-   (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd));
- #endif
--- 
-GitLab
-
diff --git a/dev-libs/glib/glib-2.68.3-r1.ebuild b/dev-libs/glib/glib-2.68.3-r1.ebuild
deleted file mode 100644
index 1ac19210fd64..000000000000
--- a/dev-libs/glib/glib-2.68.3-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-	"${FILESDIR}"/${PN}-2.68.3-glibc-2.34-close_range.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	xdg_src_prepare
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dinternal_pcre=false
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use fam)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.68.2-r1.ebuild b/dev-libs/glib/glib-2.70.2.ebuild
index aa1479e53d82..6dbfc0036677 100644
--- a/dev-libs/glib/glib-2.68.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.70.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 
@@ -15,7 +15,7 @@ IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
@@ -36,7 +36,7 @@ RDEPEND="
 	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
 	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	!kernel_Winnt? ( virtual/libelf:0= )
+	elf? ( virtual/libelf:0= )
 	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
 	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
 "
@@ -162,7 +162,6 @@ multilib_src_configure() {
 		$(meson_feature selinux)
 		$(meson_use xattr)
 		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dinternal_pcre=false
 		-Dman=true
 		$(meson_use systemtap dtrace)
 		$(meson_use systemtap)
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 16d222caa538..8d21d340d927 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -6,5 +6,5 @@ DIST gmp-6.2.1-arm64-darwin.patch.bz2 2520 BLAKE2B 3d4e9dbd29dc9aa81f0c9e0de4a59
 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb
 EBUILD gmp-6.2.1-r1.ebuild 3055 BLAKE2B bdf730b52a04c49b9fec9fc98766f12e081673358194aeb3452772663f954a21595682fee523bb4d776b1a8b5eed1dcb716f12cbb87c18b2642c6dda66f4a567 SHA512 414446ce82bdd928f8c559650264733a9081cdefbd5e0d4d8a5c231db8527850a5b2427e15ec905d3826903f88478867b27000e1abe959cb66d23f69983aa928
-EBUILD gmp-6.2.1-r2.ebuild 3238 BLAKE2B 277137a0d026baccd95d93b7364c0406840a7816f9a23b0eed8b5952a7058629e42e990ffc40cd5ad535a9c0fa8adca895783d46f1727bcc082534ef60fe2706 SHA512 e56ea4a105680d4f5e59e7400eb2297ec3c69131dc4408f07ddcdde9095a10346d64f67d8173b701ccd09dcef08e1fc0f11e9daa4fe4488d6a8773a2d4a3f418
+EBUILD gmp-6.2.1-r2.ebuild 3230 BLAKE2B e0bf5ee082d66efd631397a615271f1d5d9dd73dce8910586c4e8dfdeb1f0d58082273f0a782181b54582a1d07cb9608f9e9ef5c43085d0c05bf28c23049d8be SHA512 fd530240ce9c349f4d83041d0bc8a006cfadb4dc23cf2496ee0ffc44fe2be4e8560e3f818b01b96f534165a8fddc072c8f1e649ab6da27af8f7ace7133268122
 MISC metadata.xml 524 BLAKE2B 3a77f2e179805eef99b6f04b0f155bcde9d80504b83108fa98abd121a395b45ec37342a73d8f47bab993d2b73d91f8998196ff605fe5725ad3b506583b34628d SHA512 503d1d0f5248b7c7dd7f48121a68005a077035691e04f1e40aecd7124438f3eaf20454c712af867cf0c4257f3fc36c1b785c84a50aea61180336b4e4b1139b98
diff --git a/dev-libs/gmp/gmp-6.2.1-r2.ebuild b/dev-libs/gmp/gmp-6.2.1-r2.ebuild
index f228e714b6e2..9911396d0077 100644
--- a/dev-libs/gmp/gmp-6.2.1-r2.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-da
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +cxx pic static-libs"
 
 BDEPEND="sys-devel/m4
diff --git a/dev-libs/go-fuse/Manifest b/dev-libs/go-fuse/Manifest
deleted file mode 100644
index fcea8cfcee5f..000000000000
--- a/dev-libs/go-fuse/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST go-fuse-0_p20140812.tar.gz 111389 BLAKE2B 13cc74fb8844b0486e593ab62e5564111d0a01361edfb3be4c8b0ae3bc298d0043ad80a33318a407236e74f0d9bcea2f87ba4681db4d34ad8818a32b8fa0e459 SHA512 d951094e290bc914b418c165106368d6b73634ffb177b770ce53baaca4cd6026967f11d602b3e687e59a49323c7af1af74913ec1a911093e4e32503025842cb3
-DIST go-fuse-0_p20150422.tar.gz 110741 BLAKE2B 4c01af2a86a97ea9d0309066bc032aa41847b74edc18bc91483fbc789e143f297c90c7fe89f7c376ec0f12859d337a271122884bab79b4e9a94f95bacb63e426 SHA512 a0c9fa666ab39632db258baa5bf6ba1546aa847beb0d4a4b812a96e66d8573e3c0a0600ad24e16e314fbd8082b36027a3e1bc2092667766f611b1321aaea70c5
-EBUILD go-fuse-0_p20140812-r1.ebuild 1378 BLAKE2B 864e049e76dcb7108bccb553fcd76854b0b110c829d5f1b45138492669c9841f6dc22024aae1244cdcafa32cb5dba9bb4c5f7c521fc1e6c25008b824f09fbfb7 SHA512 0a157e7664d801c3b2318c4ec04f5ffe01a2e2406f64b6edd5dae60b178bec75cf04ff44f6a56b3da29d331ddc98d6e7a2208ea0ba916d6d6cebc352cb1eca70
-EBUILD go-fuse-0_p20150422.ebuild 1173 BLAKE2B 434725573159f029575a857c8182227a039af469dd584a56da1e1445703b71ea79423ea1619c0d9bfcf5b3f148d018a922018ae99cfb448ff179118cb10fad1f SHA512 8af3d601d8741f7cc7223c75db5bd3ecf281920a113555449cd5b494ad567969d8ff7a5a1b3c10d7fa52e59be82a9fff8236eab5f64f1a0628b710eadec7539c
-EBUILD go-fuse-9999.ebuild 1252 BLAKE2B ef765f5b5aae88905322863d107a4a0e93ee27951b5012db404ec74368a7252905ddde07e83aed654bf2d7a58bd69eef985c1e3c32f53cfd6a4a6510c5b0232c SHA512 cd0e37fb26f4ca74dd257977862417d7995fa5d6a2e08a2050325465506c484f3f016f7d96391cd06da926ad4bc1cb3610b6721fcee7f446454776f3759ea325
-MISC metadata.xml 252 BLAKE2B 27f76196891876b131efab2ee91a373a4be28501e24b75c97bcf486a64938c1e87f1e047c6ba506026133b425a91eadc7f8dc9b778ce44120b1dceba0e8d395f SHA512 ba6b0c313e9744f9b0cc7c29849e9adb9ce5b725a72dc30de22b7a4bad5237c18ae7647cd7d75fd5d8855a4bdf0dd45cea7f6c79722660df63395bed1217b967
diff --git a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
deleted file mode 100644
index 0ff5a2228922..000000000000
--- a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.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
-
-inherit vcs-clean
-
-GO_PN=github.com/hanwen/${PN}
-EGIT_COMMIT="8c85ded140ac1889372a0e22d8d21e3d10a303bd"
-
-HOMEPAGE="https://github.com/hanwen/go-fuse"
-DESCRIPTION="FUSE bindings for Go"
-SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-lang/go-1.3"
-
-RESTRICT="strip"
-
-src_unpack() {
-	default_src_unpack
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${PN}-${EGIT_COMMIT} src/${GO_PN} || die
-}
-
-src_prepare() {
-	sed -e "s:\(go \${target}\)\(.*\)$:\\1 -x \\2:" \
-		-e 's:^for target in "clean" "install" ; do$:for target in "install" ; do:' \
-		-e '17,26d' \
-		src/${GO_PN}/all.bash > src/${GO_PN}/all.bash.patched || die
-}
-
-src_compile() {
-	# Create a filtered GOROOT tree out of symlinks,
-	# excluding go-fuse, for bug #503324.
-	cp -sR /usr/lib/go goroot || die
-	rm -rf goroot/src/${GO_PN} || die
-	rm -rf goroot/pkg/linux_${ARCH}/${GO_PN} || die
-	CGO_CFLAGS="${CFLAGS}" GOROOT="${WORKDIR}/goroot" GOPATH="${WORKDIR}" \
-		bash src/${GO_PN}/all.bash.patched || die
-}
-
-src_install() {
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go
-	doins -r pkg
-	insinto /usr/lib/go/src
-	rm src/${GO_PN}/all.bash.patched || die
-	egit_clean src/${GO_PN}
-	doins -r src/*
-}
diff --git a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
deleted file mode 100644
index 2a069dc0c67c..000000000000
--- a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vcs-clean
-
-GO_PN=github.com/hanwen/${PN}
-EGIT_COMMIT="ffed29ec8b88f61c1b8954134cc48ef03bb26ce1"
-
-HOMEPAGE="https://github.com/hanwen/go-fuse"
-DESCRIPTION="FUSE bindings for Go"
-SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-lang/go-1.3"
-
-RESTRICT="strip"
-
-src_unpack() {
-	default_src_unpack
-	mkdir -p "${S}/src/${GO_PN%/*}" || die
-	mv ${PN}-${EGIT_COMMIT} "${S}/src/${GO_PN}" || die
-	egit_clean
-}
-
-call_go() {
-	local d
-	for d in fuse fuse/pathfs zipfs unionfs; do
-		GOROOT="${GOROOT}" GOPATH="${S}" \
-			go "${1}" -v -x -work ${GO_PN}/${d} || die
-	done
-}
-
-src_compile() {
-	# Create a filtered GOROOT tree out of symlinks,
-	# excluding go-fuse, for bug #503324.
-	GOROOT="${WORKDIR}/goroot"
-	cp -sR /usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN}" || die
-	rm -rf "${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
-	call_go build
-}
-
-src_install() {
-	call_go install
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go
-	doins -r pkg src
-}
diff --git a/dev-libs/go-fuse/go-fuse-9999.ebuild b/dev-libs/go-fuse/go-fuse-9999.ebuild
deleted file mode 100644
index a745fe10ed3a..000000000000
--- a/dev-libs/go-fuse/go-fuse-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3 vcs-clean
-
-DESCRIPTION="native bindings for the FUSE kernel module"
-HOMEPAGE="https://github.com/hanwen/go-fuse"
-EGIT_REPO_URI="https://github.com/hanwen/go-fuse.git"
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND=">=dev-lang/go-1.3"
-
-RESTRICT="strip"
-
-GO_PN="github.com/hanwen/${PN}"
-EGIT_CHECKOUT_DIR="${S}/src/${GO_PN}"
-
-export GOPATH="${S}"
-
-src_compile() {
-	local d
-	#no examples right now
-	#    example/hello example/loopback example/zipfs \
-	#    example/multizip example/unionfs example/memfs \
-	#    example/autounionfs ; \
-	#or tests
-	#fuse/test
-	for d in fuse fuse/pathfs zipfs unionfs; do
-		go build -v -x -work ${GO_PN}/${d} || die
-	done
-}
-
-src_install() {
-	local d
-	for d in fuse fuse/pathfs zipfs unionfs; do
-		go install -v -x -work ${GO_PN}/${d} || die
-	done
-
-	insinto /usr/lib/go/
-	doins -r "${S}/pkg"
-	insinto "/usr/lib/go/src/${GO_PN}/"
-
-	# for this ebuild, to fix bug #503324 I have limited what is installed
-	# another possible solution would have been using adddeny to the
-	# hide installed filed during build
-	egit_clean "${S}/src/${GO_PN}"
-	doins -r "${S}/src/${GO_PN}/fuse"
-	doins -r "${S}/src/${GO_PN}/splice"
-}
diff --git a/dev-libs/go-fuse/metadata.xml b/dev-libs/go-fuse/metadata.xml
deleted file mode 100644
index 1b36939c7907..000000000000
--- a/dev-libs/go-fuse/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">hanwen/go-fuse</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index 9eb4a9d3c908..7f1055b71f0f 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,7 +1,7 @@
 DIST granite-5.2.5.tar.gz 392987 BLAKE2B 507c3b810b750257a66195b45842a7664eb544f86a8606124d30d277c03680296f1ace7a9233d6e094ad5ce3357564e13b61d946f8ed926ccf22a5d9b5e98648 SHA512 64a08293bc4b33d77206c7070b4e2002dd8e2da8a358e43074b681a9228790dcb342d3a705cfc0309a7e1e7f498a2a656e972c2fee085ba99fb5214e33758fc3
-DIST granite-5.5.0.tar.gz 421478 BLAKE2B 9b6e956fcacf5dba722dd999ed3de527a99bd305a2059bdc39fe00d767f0f855e8f3a4d0854fd441203bb5dfbb250669356f85b64e067ddc08e3d6dfc3fb389d SHA512 981ff9aa42146153d8450989513dd6b63cfb6cf2e52cf3e1d2d6380373b30754d9b357418810cfd14a53689a050f08337ca766b5b8496a4063106f78b377f139
 DIST granite-6.0.0.tar.gz 442902 BLAKE2B b142e13467f88522b910338f7921801914186ae567e99dc640474f0edff2ee464ff98c755fac742cabee90dba55a302e1642fc65989f50fe4d0eebc509b5c78d SHA512 7e856eed992a81b896c39c753897f95997682a8c754d33c0c4b032645a77d191111767968e07831948786088fb0cc52441551ce1c5f585f58a25cc147196f0e4
+DIST granite-6.2.0.tar.gz 462780 BLAKE2B bb0df3649eab212e36a20ebd365521fc4ad87d1d10e54155905585fdb39874525b3a59ec2b9a1fd19a427c9a67a94bc6e4df433560a6208370dd90d27125e24f SHA512 4d9c21a653505812c8d99508166b411d1931bd251bf51c4bff8e6a0d905b5efc60832f3e7fbf6f8d52b67b55edf299969865542db33a8276b90e05b3b4731a87
 EBUILD granite-5.2.5-r1.ebuild 1860 BLAKE2B 2d1137832f99c220ce6893bcbc7af6ca471551bd35d9890837aab0f4d5938c7d6f418a47f869d8f729f4145cbdd099aa9796e3de96181e76ecda8f748fc2ef7c SHA512 711548b6e8a56962667195b4f67a55acd125fbcf0751a9e4d08c647ec978db88f50cf1be60d3a064586f3ed30955a5055b7dafb16b439ff19ef6e26eac028de6
-EBUILD granite-5.5.0.ebuild 1322 BLAKE2B 9bf5cce71d79ab7779091cc5c077c32541011c257396e7d39677b572a89ee84ef7d99835e5100d09845fdbff21fbcad56634b50de2f70c998e5b32e4141b1824 SHA512 3f3417d6e83a271b801393490178f7f5586f77a28e114a22646e5f53bd3cadcebf186834b7811244406c0dad1c513ed2f39ac5c8ddf39c7b72942ce202bc47d4
 EBUILD granite-6.0.0.ebuild 826 BLAKE2B 8a8720efd9c6cb7ed8a1e46f0e22fa6de6d645f488a3771713391b5a30dd955dbb0af3ad5bb459b92e48f92755a18559c0946ed3b18c786ea7d312ab9de93fa7 SHA512 4489acb0fc3fea97259fa7752a60abe78e41d6bb8fb52342aaba09c3725d6b8834f3af7758441d7509f1d7cc00e31180482f06faaa4b39b0bcca7a51141f4df5
+EBUILD granite-6.2.0.ebuild 832 BLAKE2B 634804328cd13c8f2708671ab8b301b525991b7efc3ebb6a92bfdac5beb362ce6d4396fba59c2ad0d6480e228f2bce686247b10d8d04515c8d0bb83c9c856859 SHA512 1e78d6303fba5ad2ad000be62ad48dee42e235ea7aff6d87c6628c00aac6535f9f5fd9486db31f57ac8d30adf754437dd8849e602cecf306b7289ce72de984f0
 MISC metadata.xml 575 BLAKE2B 3cd927e8e8857da5988748e9bc4c9532afafeab6f336a0c30afd8e988d94881cceb02650c11ca005f9aeb37c79d92756f8472a16c005a5cab231306a6ca1a204 SHA512 0967bfa3f2aa54be8b69bdb75ac907d3c4b60c8e457970a13d9fc75cce90d86666cd596e57f382402042c3aa63b8e8df4409ed84fa1ac1a58fdab5b641d42ab6
diff --git a/dev-libs/granite/granite-5.5.0.ebuild b/dev-libs/granite/granite-6.2.0.ebuild
index 985b8383dd0c..2f782968adcf 100644
--- a/dev-libs/granite/granite-5.5.0.ebuild
+++ b/dev-libs/granite/granite-6.2.0.ebuild
@@ -13,17 +13,12 @@ HOMEPAGE="https://github.com/elementary/granite"
 SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc"
 
 BDEPEND="
 	$(vala_depend)
 	virtual/pkgconfig
-	doc? (
-		>=dev-lang/vala-0.40.20[valadoc]
-		dev-util/gtk-doc
-	)
 "
 DEPEND="
 	>=dev-libs/glib-2.50:2
@@ -35,26 +30,12 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 	vala_src_prepare
-
-	# Fix docs
-	sed -i "s/find_program('valadoc')/find_program('valadoc-$(vala_best_api_version)')/g" doc/meson.build \
-		|| die "Failed to replace valadoc"
-	find lib/Widgets -type f -name "*.vala" -exec sed -ie "s@{{../doc@{{${BUILD_DIR}/doc@g" {} \; \
-		|| die "Failed to fix docs"
 }
 
 src_configure() {
+	# docs disabled due to: https://github.com/elementary/granite/issues/482
 	local emesonargs=(
-		$(meson_use doc documentation)
+		-Ddocumentation=false
 	)
 	meson_src_configure
-
-	if use doc; then
-		cp -r ./doc/images "${BUILD_DIR}/doc/" || die "Failed to copy doc images"
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/doc/granite/html/." )
-	meson_src_install
 }
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index e85a765925de..f03864800796 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,14 +1,6 @@
 AUX intel-compute-runtime-21.31.20514-no_Werror.patch 346 BLAKE2B 0ffeef51d3f2aa4ccd295cf1317b58343e39c7b32fe2acd52e45c0596c22b4c5fd3d301c333010abc3386b797c05d20860e61496444598c8f271b5e4b0f4fcae SHA512 932d80d81947c96f543f9d8704120e851f1004ba93718566f578610cbe8c2c65a131246bbc0e392135f866f277270d6bfe4424abca25f6cceedcfe17a4e800ba
-DIST intel-compute-runtime-21.42.21270.tar.gz 4761371 BLAKE2B 5dd2886e4b2a84a2247d2bb70667805531f099881431d9e8052c870d4081378cbbb43ea3f595c890f9d1930b9d054c0813da3f8b1c5509ad2090c78a4d683ed5 SHA512 f913bb116e84c0bd477578e75e10b67ef9c42bb447c2afdeefd9bb8ae291e53b019937d6e474e749a9bf98741366c8e76e5a8dcd23f8a9fac48e306e8dc9a648
-DIST intel-compute-runtime-21.43.21438.tar.gz 4840204 BLAKE2B 6de3075132b9a48e97e30e66c6e09dd24f51cabddf55622f2c7490d38bd1ad25e4853206a0a8a3c4c34ac3eb774e44974c47089182652ae2d234044b72d1d048 SHA512 e8f98d9c8c0a01794d57276706ec4212a3fb082c8ac04dc76ceb0e30fecbd8d35405baaa45685fd4b241e8b04a15db16aef75bf1929c81ff879af46e5be00d1e
-DIST intel-compute-runtime-21.44.21506.tar.gz 4851449 BLAKE2B beb49e8bbbfab098bb07943def326463b50f3a4b659368c5b24aadede582331c2c15d4d047e3bbae3d0ca32752c4a05861b0c0a325f30e91bc865276722116b6 SHA512 ae8ca2780602c53f13379ea798462fff1c136967186da21c5b714ed5ab405cb815e0e5e9e60cf8586cef151424270db624b473748d2756ee5768dba4cc020ea6
-DIST intel-compute-runtime-21.45.21574.tar.gz 4868091 BLAKE2B 48ff1ba42e5fe5eb231ec82bb7b33d0bb96460fc5adbfcb4702b68397d58b1b88f2a4e5a2dbef462731d43c284439cc4626ebf308d9dcfc509ccb68cea63eb19 SHA512 ede4ca4772ec6518592557d4c49d0a25204773607ae6737a35d20a3abb73ebbe66d01139baba544d5292d848a05a166a2c5ca1712408f85ce6be840bcf104650
 DIST intel-compute-runtime-21.46.21636.tar.gz 4878855 BLAKE2B 0ada296b36567038b2abeba50c2dae6604981f00cdfc0d5d9d197c793534c887fa1d321ced34b37cf6760bdc9e2b8769cdc24fe3884036b78b983660c90b1ee7 SHA512 a63436d049737b955f0e23bbfc78684f665f3d1a668120e803165839792144154f3f42a52c6533611711592ba6e41408d81196a61e318746b1dae1392d1d29ac
-DIST intel-compute-runtime-21.47.21710.tar.gz 4894551 BLAKE2B 446d9b89a1823f7ce83638010e5285fe8d42018347ded266fd6a091cd0815583ff3ebd0e762a4a8c9c83f6a053c6fe7fecff2a127124c584ad211d58b4932992 SHA512 ce983d09ca87daea8be75e284766aea49262f749017a485ec3b2eb8c14dbeb91b1aeea012178798aa1d90151cfd77f5ce2b44b15a84ea66b5c7573f667a5b3c8
-EBUILD intel-compute-runtime-21.42.21270.ebuild 1385 BLAKE2B ba3f1a84eb810c9047edf42e3d54d939323c4c593bedd070b33bd1169aaf8f03c59106d3bd07905c3de62bc6df31f7c210e76fcac17804e86c738fbe71a5092f SHA512 6c4f3bf5b6e93801af80e0c0e02b96223e55513d1618e3403e74d585865f67721fcf69ae3a5468a2041d6699caa2e1568f73b6d055dfb15fa4a399623bb9674e
-EBUILD intel-compute-runtime-21.43.21438.ebuild 1386 BLAKE2B 429135e921bfbe7bbf733cf686dcecc0565df85f4aeb7a11b206265500b4f1cf87ea8a28d2a0a261e4da2b1f045e3054dcdc6eb8de945d88e4f3ecf44997918d SHA512 345daf68bb741d8ed2cb38dba6bb84f979405c934ad44e0ad4fa510e1fd0cca40ede045fc651a98db2ac0bf2dabc2f5ce92a6f801ab93be25d482ef16a4876d9
-EBUILD intel-compute-runtime-21.44.21506.ebuild 1386 BLAKE2B 429135e921bfbe7bbf733cf686dcecc0565df85f4aeb7a11b206265500b4f1cf87ea8a28d2a0a261e4da2b1f045e3054dcdc6eb8de945d88e4f3ecf44997918d SHA512 345daf68bb741d8ed2cb38dba6bb84f979405c934ad44e0ad4fa510e1fd0cca40ede045fc651a98db2ac0bf2dabc2f5ce92a6f801ab93be25d482ef16a4876d9
-EBUILD intel-compute-runtime-21.45.21574.ebuild 1386 BLAKE2B 429135e921bfbe7bbf733cf686dcecc0565df85f4aeb7a11b206265500b4f1cf87ea8a28d2a0a261e4da2b1f045e3054dcdc6eb8de945d88e4f3ecf44997918d SHA512 345daf68bb741d8ed2cb38dba6bb84f979405c934ad44e0ad4fa510e1fd0cca40ede045fc651a98db2ac0bf2dabc2f5ce92a6f801ab93be25d482ef16a4876d9
-EBUILD intel-compute-runtime-21.46.21636.ebuild 1386 BLAKE2B 4fc45d36f2fb7d828ea8d7d70370c5b851c18f583df75711ee9f548d4e9178091976cd083371e66bc616f30203ac12b21a4b3f74d851e44fa8763c7392342dcb SHA512 200ebe90de6a1318e8a37cccc81a757c691c83c3f4031cb7c8e430aac46d6c6d1dede53e097471b7f49669cfe69a6328b27c756b973518546e2f9e3656cd35e7
-EBUILD intel-compute-runtime-21.47.21710.ebuild 1386 BLAKE2B 5548612cd5ae8ddfb4adfa26e625d9a12d63c8d630c2a180233fae6eb5c65f38ae9ed516347825b208b0e2a8d28adadaac244e6027fd9ecd5fb6d73d0e29e594 SHA512 22b52101f8218b711754a037af2efec1ce1a5366cbe2792d1df3038c38b8f21b8f2b060eed0d7a66444af3249e18b4407479943aa8c9953f19baca6c5bc84861
+DIST intel-compute-runtime-21.50.21939.tar.gz 5106368 BLAKE2B 3a8613c7178975bf930f0ccbed06d31952f05c8316e7735db759a7bcc8b81b5bd3040af62bae6e63fc9781ce2e6e8f035751cd6696b4c7cfbb6025f3d4fcfd8b SHA512 cabcb0fb9816ca8e6b93fa069c73926ccdaf3803c073b11f62477f80d38af49a7b4e814765a40e3daae50a6159560872c5b5123f64e68a570556c80d47a120c9
+EBUILD intel-compute-runtime-21.46.21636-r1.ebuild 1387 BLAKE2B 7a927c6d9cf7d1d4b80b4586fbd989e2cdf8877036c79df2db01054152d5db346f63856b0a37cd4e3bb800d38f918daaf44fc34d4306fb0f06287954ad281c3a SHA512 0fc688519ac6251963974264a7ecdd1f721c4ed02338e6358a25f84a036a81cca4a8e44c7191f5082cd3d687e7064e559f018b722267a33dcfbc889b756955bc
+EBUILD intel-compute-runtime-21.50.21939.ebuild 1388 BLAKE2B 23f2f41c1fe8831bd41f0cf16a50aa3b3b9daa6147eec61935757c3c09174af829c853b9d611cdd0983b1d3bfc5d4b13f5290132f11b0d675d617027deefd23d SHA512 14107ee44ab961b472423d393fad05944f613ba5d207b967ff9b832ab9c981ba32392761670d105f2ce524aaea10453b4919072273ded6a1c289e409406d35b0
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.42.21270.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.42.21270.ebuild
deleted file mode 100644
index 68318695fc33..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.42.21270.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.4 )
-	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/intel-compute-runtime/intel-compute-runtime-21.43.21438.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.43.21438.ebuild
deleted file mode 100644
index aa334bc43b1f..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.43.21438.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.4 )
-	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/intel-compute-runtime/intel-compute-runtime-21.44.21506.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.44.21506.ebuild
deleted file mode 100644
index aa334bc43b1f..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.44.21506.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.4 )
-	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/intel-compute-runtime/intel-compute-runtime-21.45.21574.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.45.21574.ebuild
deleted file mode 100644
index aa334bc43b1f..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.45.21574.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.4 )
-	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/intel-compute-runtime/intel-compute-runtime-21.46.21636.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.46.21636-r1.ebuild
index 4fba2fba02df..18023bba0b18 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.46.21636.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.46.21636-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND="
@@ -23,7 +23,7 @@ RDEPEND="
 	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
+	>=media-libs/gmmlib-21.2.1:=
 	>=virtual/opencl-3
 	l0? ( >=dev-libs/level-zero-1.6.2 )
 	vaapi? (
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.47.21710.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.50.21939.ebuild
index 93ce17f13ec3..211c859a70c9 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.47.21710.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.50.21939.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-libs/libxml2:2
 	>=dev-util/intel-graphics-compiler-1.0.9389
 	>=dev-util/intel-graphics-system-controller-0.2.4
-	>=media-libs/gmmlib-21.2.1
+	>=media-libs/gmmlib-21.2.1:=
 	>=virtual/opencl-3
 	l0? ( >=dev-libs/level-zero-1.6.2 )
 	vaapi? (
diff --git a/dev-libs/isa-l/Manifest b/dev-libs/isa-l/Manifest
new file mode 100644
index 000000000000..7e29b439b147
--- /dev/null
+++ b/dev-libs/isa-l/Manifest
@@ -0,0 +1,4 @@
+AUX isa-l-2.30.0_makefile-no-D.patch 511 BLAKE2B 64e65daf876cde7a5ca4ba8f8f4e308d9a24eb07449e5728250bf88871ea01b62384c74d92f77ca8ea8c47909a389e9add2741ee053ad7be4d0dbf423e2b965c SHA512 5465bf937401a15bf2e3ed8274d1f2ae45428c29739e835d71474d81bfae78b83cd38c762bcbb25fbe62853c979bdfd5e56bce4f0cd43a949c2b61141feb7415
+DIST isa-l-2.30.0.tar.gz 649389 BLAKE2B 3364733d61ce16c91891b6da63d2b4fb2bc004761c91f2076a9a6441adaea24af43b6d32caec011c06206e3811e8c9639f8ceaac89fe97800144c7f78c80c350 SHA512 d3ecfb7326097534b06a74b584100336509525ae7cadc6112d0c27e3d8704f3810e18f583d3cc33fa266bfec96db023607622b22ddbf17988ec4bf1bb3b3b9b2
+EBUILD isa-l-2.30.0-r1.ebuild 914 BLAKE2B 0c53cc62149cf67e2aa0cc7cebf8017f6f04670c183efbac360cdd110744e3dccf3152d62fccfa0a26da67017daa04b337145f52fe5df95d94a06ed38abb8109 SHA512 6f9501b6e2fe84669706d56cf9db0723ef9b4607e53a2382d6b44de2b45aae615d99a645a74e7f536412bd82ae196f15902957c017038c37a4c923da3fc90457
+MISC metadata.xml 1002 BLAKE2B 2934e906f4d5a6afd5de680fefc934d46f8730fba062834b0d63ca58b0c7cab684daea9c3adafd8e00e44efa7fa09547f8602b724b5cebb557d4ffff1eaf4615 SHA512 6cbf77704f202e8748348b3ee95295ab7d3def3ddf07ede18f4dafdc4374685b7597892d2ba02eaf2d113abeb6f6ece282f8f822528eecd6871c7c0faedcce28
diff --git a/dev-libs/isa-l/files/isa-l-2.30.0_makefile-no-D.patch b/dev-libs/isa-l/files/isa-l-2.30.0_makefile-no-D.patch
new file mode 100644
index 000000000000..98c37f3cc42f
--- /dev/null
+++ b/dev-libs/isa-l/files/isa-l-2.30.0_makefile-no-D.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -142,11 +142,11 @@
+ EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh
+ EXTRA_DIST += tools/yasm-cet-filter.sh tools/nasm-cet-filter.sh
+ 
+-AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${D}
++AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${DIST_D}
+ if CPU_AARCH64
+ AM_CCASFLAGS = ${AM_CFLAGS}
+ else
+-AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${D}
++AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${DIST_D}
+ endif
+ 
+ .asm.s:
diff --git a/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild
new file mode 100644
index 000000000000..793f5856db3f
--- /dev/null
+++ b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Intelligent Storage Acceleration Library"
+HOMEPAGE="https://github.com/intel/isa-l"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="cpu_flags_x86_avx512f"
+
+# AVX512 support in yasm is still work in progress
+BDEPEND="amd64? (
+	cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 )
+	!cpu_flags_x86_avx512f? ( || (
+		>=dev-lang/nasm-2.11.01
+		>=dev-lang/yasm-1.2.0
+	) )
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.30.0_makefile-no-D.patch
+)
+
+src_prepare() {
+	default
+
+	# isa-l does not support arbitrary assemblers on amd64 (and presumably x86),
+	# it must be either nasm or yasm.
+	use amd64 && unset AS
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/isa-l/metadata.xml b/dev-libs/isa-l/metadata.xml
new file mode 100644
index 000000000000..79b2a15f343d
--- /dev/null
+++ b/dev-libs/isa-l/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+	ISA-L is a collection of optimized low-level functions targeting storage applications. ISA-L includes:
+	* Erasure codes - Fast block Reed-Solomon type erasure codes for any encode/decode matrix in GF(2^8).
+	* CRC - Fast implementations of cyclic redundancy check. Six different polynomials supported.
+		* iscsi32, ieee32, t10dif, ecma64, iso64, jones64.
+	* Raid - calculate and operate on XOR and P+Q parity found in common RAID implementations.
+	* Compression - Fast deflate-compatible data compression.
+	* De-compression - Fast inflate-compatible data compression.
+	* igzip - A command line application like gzip, accelerated with ISA-L.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">intel/isa-l</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 6cee3ef64414..506c39d31aee 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -3,5 +3,5 @@ DIST jsoncpp-1.9.4.tar.gz 214057 BLAKE2B 9a8c52e5d0b78f1593c93bc40f48d3789b031ba
 DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
 EBUILD jsoncpp-1.9.3.ebuild 1027 BLAKE2B bf5471834eff9feaeea9c821007dfbb7683d046e2aa48a29cc484a3fdcc275bdf144c2f212eae9e5457a36d344be8ca20a74574247bad35a6f55c1056a2297a0 SHA512 6a6c382bba7abc7e79dea025430078185f6d4f6e841966d75c0a70d65a8065f54b604f2d376c2dbd2362a84ea979d10d68f6271dca17c93c167fe234d456c845
 EBUILD jsoncpp-1.9.4.ebuild 1217 BLAKE2B 7fca9799cff917932d3809519f78ef90762ccc649a24b5ced6eb6a953483a8617a0e9bd1bb8ea1575df384a580aeeca88b908ea8ed598b227e30eed87117e34b SHA512 c95cfcfb3a867d69cdf29511d64ce6694803acccbe1ad2bc26353abc34ef9f5e4fb8fac1a5456bc33a4fe471f69d2ef12d8ab51d1a2327e141a7504fe6504972
-EBUILD jsoncpp-1.9.5.ebuild 1225 BLAKE2B 92a2987cb192e5a2ed3a26cc89f563ff271a621a9fc552060f1a0c4b120dcdcef507a9f1690f6bef468008a7fcea87079347eca84af2a8586ace0f223f28edcc SHA512 a6121d342802e6e9e788d5e512776a8fc907457cad80145280a97d485022d4593bd437bf958ab481a4406ebc6629e3e75f9a9cd58c443810312fc47b55c69e62
+EBUILD jsoncpp-1.9.5.ebuild 1219 BLAKE2B b5ed44d9826022423936a6f505671ff0520796a17b3e8178815076c0aaafbe02e0ac6bd0ea6d737c6cbcc47ec2c4dc7c2532bd1d1ae24322b74a6df7c98fbdbb SHA512 58b32c252bbb2de51c7a59124e703abaa8137ff1c988291001aede7b89c83c1548cc8a6ab09f6e5b5ed9b4c30c77c912dacf8dd4f643e61e93832d11e8490e30
 MISC metadata.xml 404 BLAKE2B b1439e7ff1121eaaac0eabccea420806b8c059b6cfc43fec2ec47ff5e3a937ace7a1afa4c3a5f18385de22b3979e8648f048cc7a8717b0ea5e282e08a3914bb8 SHA512 700ebcb293411f62c10a69640c5e7d9240f90f513435b54b77e0fa30f1bb732affa0055dcd7c84c858a50d56f0b3a138dfe6410f8a45fd91d1af62ea827c9e8d
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
index 328727ef8314..f00d5b8f1921 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index 222d577f4fc8..8d264a099650 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,3 +1,5 @@
 DIST jsonrpc-glib-3.38.0.tar.xz 42224 BLAKE2B d7caf3dc116c43d652009ce646c0b837bd8a2a1b4d2b60ba49e9d746ff5e36e4c91fe5f4b5542a4562e6c8f13130d00fd22b57777d0e5ffd6e5b46f817f4dcb4 SHA512 1862403c37b7140e91720264a1b00a408b969f0464fc022a5c24be0eea993526d118ece6611927e1309071c3db9d3d6bf9f13ae8ed23ff1d34f36fb68c2584cd
+DIST jsonrpc-glib-3.40.0.tar.xz 42392 BLAKE2B 106d010d5615d6c4a3e1fdc314d1d63be0b76424aca4c6e3771c21e75b79dca5f524e711c99fe1175797644e11d0458317bfa1f363a5abd296dab5b3f95dd708 SHA512 5d4fae86e7eeb029a8daf3eff26107a374ba1b68caa2862563e8d9854913ae306448f4c712be6f0f82961031f1b618aaba7ded154f81b4a023fa366c71f1b887
 EBUILD jsonrpc-glib-3.38.0.ebuild 971 BLAKE2B 21b1270fc6e79a3a6c8bdea517906530635343b2123e6bef6f82be5e42249f329101cb2b0e92cbafd5551cde33f3a372ff573602ee0a3b3c9106f93157a57e4f SHA512 e895f8237cfca36f5e6b2d1f5728fdb92e04564af24a0518d6a40e434af6294aeede6b2eac959280a1c888c64c72d3c5d31cc59db0409f98bc292b1199e66c1e
+EBUILD jsonrpc-glib-3.40.0.ebuild 973 BLAKE2B a081bf1c0dc4dfb2379ba42704ea87f5054827b618bf91720c0dccc2cd5fd5a52a18bf791114ef56984e1087a25265e1fecc51264d07826fcd2d20f42540637b SHA512 34c5d9ce9ef46a4a3dc32ce7609dad4b522c9be56c8bde9ac438e03fc42080c213fec44adfc8ec857ce3b83a3762743d8b60639c928f01d39bacde4488b45802
 MISC metadata.xml 506 BLAKE2B 21d02bfa7d40b0c215817396da945211436ee9e021d40696efbe4c091cd0e3d2f4621ba97fcc9aa1c96c3bf0f40707b0af95571ddf8edd16ab01c00f4c76cb6d SHA512 af3d14d9201d2fc7530d661edff7f7b714d8dba4342a4695a8edd540da266b52583d35a6280595b98918b913734a19a07d613b240f673120cbb27f643cb18f45
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild
new file mode 100644
index 000000000000..0029319a3d8b
--- /dev/null
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala
+
+DESCRIPTION="JSON-RPC library for GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_profiling=false # -pg passing
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+		$(meson_use test enable_tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index c4a0743e5376..f849d93ac48f 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,4 +1,6 @@
 AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
 DIST kopeninghours-21.08.3.tar.xz 65904 BLAKE2B 88169a5881a49fbb6728d706585d2e2d4c88d2eb66360917c1d0cef0cb7239de378d69afc1970f038e9c52756fe6097d5e423577a29e77c071e0b5ad54b7c6c2 SHA512 9fe8181b4c4e9427a6eba133a51b119e86378933ebf5bdbfe5a78c711837ccdbaa8baa04cb10e234febe7596c7e7e515dda8e09f8568bd785b0a3e061f6d8bcf
+DIST kopeninghours-21.12.0.tar.xz 67300 BLAKE2B 975955c4004d9bde614facfa2673175134b75273fd2a590fb73c854c51a133b407dea4e9700e0b14bc4f509997de9ba293dcd5ff95ffc675effd7bb7c5727438 SHA512 c250371832a771b94cc785c03a0fbf8565fd578c862f9f251fbc616d283d6a7940183dd329976cb90da8d0a565f564626a5beb05c22badfbef824d0167b5dd5e
 EBUILD kopeninghours-21.08.3.ebuild 1266 BLAKE2B 2300f8e1734e45840ad781e679fc860071c9f80774c09f0bed04d9a1adc56336252c5bcc18c8940b6532a9599d92cc4acc9bff4b5eaaa1bed0688c29e425002e SHA512 c80bc7a598e6df2ca2053fa9d3fda6fd5e222e1a91e704b1d0156fac6411b11980a0c443ee1c753471229f23e8ae3f9b4e73be1b11d64219c32cbf04d5cc2568
+EBUILD kopeninghours-21.12.0.ebuild 1284 BLAKE2B 5ffb46f2f434e270b079f9bc2810004e149fd33edd8bef969d642cea6bf0736d573affcb12b9c75ce0946278db8f3718da799e8463d36e048d240039c929efdf SHA512 107f68ebfafd524578e7e6debc811899c552cf06436ea42fce349670f8ccc4415abeb42c2bb891546588d38268d90e5739a873ab521c14c01cba202f90562b48
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kopeninghours/kopeninghours-21.12.0.ebuild b/dev-libs/kopeninghours/kopeninghours-21.12.0.ebuild
new file mode 100644
index 000000000000..63717fe06238
--- /dev/null
+++ b/dev-libs/kopeninghours/kopeninghours-21.12.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KDE_GEAR="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.88.0
+QTMIN=5.15.2
+PYTHON_COMPAT=( python3_{8..10} )
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
+HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html
+https://invent.kde.org/libraries/kopeninghours"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	>=dev-libs/kpublictransport-${PVCUT}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	sys-libs/zlib
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-21.03.90-boostpython.patch )
+
+pkg_setup() {
+	ecm_pkg_setup
+	python_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
+		$(cmake_use_find_package python Boost)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	python_optimize
+}
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index de3784c0d2fd..922d89bb0641 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,3 +1,5 @@
 DIST kosmindoormap-21.08.3.tar.xz 342772 BLAKE2B e30c0645105627b304162187ac9c84e8ebef0bbf5db17b28c1239428ec982eed526a7f29f7e543d1c1fb660d90d641358c1d0e8b1c6d6c40c5b11e471b25be52 SHA512 3a2337b433c25c16f2e69ab1a42e9324e8e176eaf85094a08d95a542af479e65637544a8486d481a3fe811e5c90aee1bcf803d92f3225db7c53c75840247e642
+DIST kosmindoormap-21.12.0.tar.xz 351028 BLAKE2B 2e219b5f3f209532c0bd995d4227f4e4a0dc6a96794844d5f549cdd4325b2237b31d4257d9a3dc340ea40fff04307c66daada57f5ddd65b12e0ff2c59981c89b SHA512 6d74093b253ee33a809a5a2e62c0bad14ff86e0b1747c650b7403fd624bbd47d197e1369bc9c7007a747a0df21387391efeca6040da4b44f930fce2a6a229450
 EBUILD kosmindoormap-21.08.3.ebuild 1063 BLAKE2B 80687934139fd66331b87a30a5ce87d01ec04276d12bacbe3c1bd45f33184f894307c501078e4d42c3578045d4af406a94694174a8a719041938a2b1858eb5b4 SHA512 ecb37c911e5bcfc27702b40cf57422bf3833e9061fec751d4170f6fb44ad12ea615de7000e19fb5a9733621d82b5bdfd179aec49af9595b73a4adb59892c4273
+EBUILD kosmindoormap-21.12.0.ebuild 1063 BLAKE2B c0d0c9b06fbc8039b01f148b1af1252759cb99ebf2d5da9baf7ca26665539a7595a8dba043f6b68cc84decca6b4c8b0212c0a908d836340d9256b2b510693e52 SHA512 941d184375b0a3847f9b0a4d18802d38699489bc539d9d0f0c53414c25db42001c5f89779dea1bace46b2835a0ae854c9dd6325f1f95e8071aeed65185fcfc5a
 MISC metadata.xml 436 BLAKE2B 7b97cad83675445e816a4f92d2e9c2c4167457df244fd166b6388be7c9336b4852c3873fff4e9d18bf1cccaaeaec849a1b340fa92a15e54180652e53cb023859 SHA512 312c58bb9ef49585287db38ff0f4e6cb6486477f4c84246610c443fb07ced2129017462ef91fab147dde7d69b0923605dc5b68fe71f6cd80f0ed1115b4a9ca6b
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.12.0.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.12.0.ebuild
new file mode 100644
index 000000000000..aa0d227d8501
--- /dev/null
+++ b/dev-libs/kosmindoormap/kosmindoormap-21.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KDE_GEAR="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.88.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+openinghours"
+
+COMMON_DEPEND="
+	>=dev-libs/kpublictransport-${PVCUT}:5
+	dev-libs/protobuf:=
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	sys-libs/zlib
+	openinghours? ( >=dev-libs/kopeninghours-${PVCUT}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
+		$(cmake_use_find_package openinghours KOpeningHours)
+	)
+	ecm_src_configure
+}
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index 2009d8737fff..22581018ebc1 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,3 +1,5 @@
 DIST kpublictransport-21.08.3.tar.xz 411364 BLAKE2B 46d4681e98037d84d5813c62f13d76831922f9b2a3c04a51885292d702fa569f276dbd00056ee79cfecfebc4597d1ddde3c497b2d72e585ec5c14006253944e5 SHA512 bcd422855de8f224f7a30f09cd95345bd8637d3fb7a32ba0a7efe5c4bd350aed02cd6d8f186b4bfb467d50ce4ae927f360ccb5d188dadfbfa4e498ca4665df72
+DIST kpublictransport-21.12.0.tar.xz 478936 BLAKE2B 62ab0b767328accb5c07db47d35094f7ce9a813a65d79dfee2ecd26a2c955e945115f8ff67329fda440c2ca81115a7fcf5eb516b6c1f3d3f1497d172b5e3fd15 SHA512 6f0dc23cae9c55253d8d2952ea936670e761d00695461c146b40a47b1312efe8ff62e7a3d758fc9bea5d3c47e7cb8fadda43d559a788663605938c5a6872669a
 EBUILD kpublictransport-21.08.3.ebuild 803 BLAKE2B a187d2d48e43849b1591d956415edcaf9da5943398abbaa2a589de239cf86421d02c8eec081e4ead722831f2057002bb0e41e6188b89869a1435c60f17f5cb15 SHA512 ffdbdf321470ecb6721924d872e2a95feac4ed972c6a5d972b5b3a995d3103810dc74dfc4ac522196157399fcfb6dbbaaae0142e4d8902b640a6ccb2ee567242
+EBUILD kpublictransport-21.12.0.ebuild 821 BLAKE2B 5b7876a183e5c525b2d3a40a6d7a223bd83ad457e90d770c9e7febaabdbd5f8ded841aadfe12aecfc9188d3c6117585d0f99af1e6b32758acaa184a782b19c03 SHA512 82b684b990965df8f272da0c629c1f3b34d75514389e11d781c05d2aec86da0fce63c838bf6aca687eb91e5b7361f73f9413ad964228f2e298b6dd6164a4bfb5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kpublictransport/kpublictransport-21.12.0.ebuild b/dev-libs/kpublictransport/kpublictransport-21.12.0.ebuild
new file mode 100644
index 000000000000..7cbb99ca6375
--- /dev/null
+++ b/dev-libs/kpublictransport/kpublictransport-21.12.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KDE_GEAR="true"
+KFMIN=5.88.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Library for accessing public transport timetables and other information"
+HOMEPAGE="https://invent.kde.org/libraries/kpublictransport
+	https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/protobuf:=
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
+	)
+	ecm_src_configure
+}
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index f2cd71cd67ac..725c71f11177 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,5 +1,5 @@
-DIST level-zero-1.5.4.tar.gz 395657 BLAKE2B ccd667f39b36f24826ec2ce2f9a755111d09f47798a7af9ddafc78947d008d0af82aa6189683b29acb59f9dc54d20fe0419ec4fbf5728e1652513b43b058db45 SHA512 2fd822dafbfaa1f51ff04e33f1cc3f5bdc4d71d45f1a3f7795ca870882647b162d2e4f727341542b09efe38e7bdb21bbefe5e6ea5af97c2579c7d74df55c5c1d
 DIST level-zero-1.6.2.tar.gz 394003 BLAKE2B 3e4de24ee9abef1d2b21bf277c5ac13b9e9e7a3361d2ad2623893e3d0edaed14c5fa04624f3edc57725bf5303133caca9bd1686947900cc2e4c52bc2b76582e7 SHA512 589736a41d213a9834d06d2e668dcc91edb5d40e93dfb59b98df7ec4f6f26a9ad3e9379ede3b6bb570ba415b1d488c83f60cd43abafe15a692dc507965323497
-EBUILD level-zero-1.5.4.ebuild 728 BLAKE2B 458b997df7e5f448673e0f9c3e21435ab31940faebfa7c68d6bb18b93a8616745874cee34b34b182226e191358eb26ab9b752213f73358684e334346471bfc28 SHA512 60be52fa73970ac5a0726e18009f7e7170ee731e56892eae03c756539f3989138dba91886c266033ccfeadac37b446b74190b38483b2d1420c7b355e2b748807
-EBUILD level-zero-1.6.2.ebuild 628 BLAKE2B 1fa3cc5af83b1833f1d4c5156facc615d2adba4911e79b7d1493d1254d84b2f5573fb59d67b25c6a65e7afced86ca045b844c823c52d77882cd95634f04941f9 SHA512 243f70daad287d2acd9bd3cbd8d20738a4696c09dffc8d7c1223fb9e751c96048e748f81fccec4a6aec0b6020337f43d8bbfb015fd320745595794766e5709b4
+DIST level-zero-1.7.4.tar.gz 395803 BLAKE2B 09b977cbd7bd438daeb1cf4b97c4a6e586239b01a873604282a925458e8c2abb896dbce7e3199cc27ef4e85fa6dbae8b77186bedc9f942427c81aa2bdf81c97c SHA512 270c273fa7f3a90d3a3af8d7882c8dfca684eeeab9b6c01b9145aa802186d8a1a5eaaf1afd720fb12be3a6338a4d95698bb5dd175abb96b4c2916c94e4f4771c
+EBUILD level-zero-1.6.2.ebuild 627 BLAKE2B 755a50ecbac1beb9b13c0182ea215ccf470fe077298b5ec1f66d91cf3aaaff93494157b68123731f646866ee330f095ed6da9147de05c79f36a216066f8e70e7 SHA512 82daabbf6d60d43b4432cd993da60e28ffdb2f8b5b4f62829595aecffa3730df5e8bec49c84fa056b43d89a816c660b2757253b1023b19568e61e308c6e4009b
+EBUILD level-zero-1.7.4.ebuild 628 BLAKE2B 1fa3cc5af83b1833f1d4c5156facc615d2adba4911e79b7d1493d1254d84b2f5573fb59d67b25c6a65e7afced86ca045b844c823c52d77882cd95634f04941f9 SHA512 243f70daad287d2acd9bd3cbd8d20738a4696c09dffc8d7c1223fb9e751c96048e748f81fccec4a6aec0b6020337f43d8bbfb015fd320745595794766e5709b4
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.6.2.ebuild b/dev-libs/level-zero/level-zero-1.6.2.ebuild
index c930117ab95b..6bdcbfa49b8a 100644
--- a/dev-libs/level-zero/level-zero-1.6.2.ebuild
+++ b/dev-libs/level-zero/level-zero-1.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/level-zero/level-zero-1.5.4.ebuild b/dev-libs/level-zero/level-zero-1.7.4.ebuild
index bc1514908681..c930117ab95b 100644
--- a/dev-libs/level-zero/level-zero-1.5.4.ebuild
+++ b/dev-libs/level-zero/level-zero-1.7.4.ebuild
@@ -1,27 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
-MY_PV="$(ver_cut 1-2)"
-MY_P="${PN}-${MY_PV}"
-
 DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
 HOMEPAGE="https://github.com/oneapi-src/level-zero"
-SRC_URI="https://github.com/oneapi-src/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 src_prepare() {
 	cmake_src_prepare
 
-	# According to upstream, release tarballs should contain this file
-	# - but at least some of them do not. Fortunately it is trivial
-	# to make one ourselves.
-	echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die "Failed to seed the version file"
+	# According to upstream, release tarballs should contain this file but at least
+	# some of them do not. Fortunately it is trivial to make one ourselves.
+	echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
 }
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 903a32541a23..1d7d76289a13 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,7 +1,9 @@
 AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f5960b4b7ca5530096840568dedf4e5f58f2139ab56c5f57382a80540294cb492f6ad619f174184172b3441af SHA512 de78131baa08874000cc52b0b21db4055246a653503301bd82c2e8f5818c955d63727d957d7834f1aed63abad42607480911fa0c2ea8d07d833ebd1f8b338039
 DIST libbpf-0.5.0.tar.gz 815083 BLAKE2B 9097d808f03cbbe61cd59b24347075e2937603f51350f83f8897123900c911392d7545af8135f39f749132c6518296f1a4d22d37c0c7b4371631f5c63a0dd9ac SHA512 3c578d3e6e93a306a1f182978e54f35fec8acfa51fad5d7de72c5003f10c266d7474e82d6dd045311fcaf8c18aa8cebe64a3336a458a9ea477e5a58e5111dd85
 DIST libbpf-0.6.0.tar.gz 858210 BLAKE2B a6076ae7465eb9c99ff1b2c63a388ef2d15c71882d7de0b5279604ad7b91ef3fce583c88710126a9384d96a810775409daadb0adaea41dd9dfc12af183fa50d7 SHA512 923eac64dca015939cbbd51cb0a7daf609d9873d249d6e621d73776b51c52f6087f2a957976163474d359a471250b27b44ad93179948335e949a82ed9613ed43
+DIST libbpf-0.6.1.tar.gz 858232 BLAKE2B 239e7bf47c24d09eb8e177e61d00bd834a0155c8773918246514858fe27688911f79dc4a22d02ab256c7c137010875f8d39d4fec9cecfd7a2b77e6b4df7610ea SHA512 5a8ca70c571fb306dd280f0526db48b78b13b57b4012f7bd3933d6e07d5e41e9370b2db6ed9bbc283c6dcbb21036810bf3093f462906b66557ce0d850c89083a
 EBUILD libbpf-0.5.0.ebuild 1069 BLAKE2B c9ace876e75903f9bdb7da6db127b90245e66fa668d5080c495acabd37b1b9d967950c5edead15fe7bff9d6b862f11fa4e73c9a8d298666e5faa7b7056b68a55 SHA512 c11e3a7597b88908ad4293e53fe21922d6e8f25b210cfa68526844544b5f3728d47eca34f83e93a47735bccb4304283e9689c5dbbb44d28936b020f683d79918
 EBUILD libbpf-0.6.0.ebuild 1084 BLAKE2B 8cd1f9fd96d088eb8351b667c87178ba028fded8232a77608465e6f4d49d2a34b3c67bba43975cd04a5f81a1a9892383536c505f82898a812a2d15384ec082db SHA512 8c8e57531dba5f6bbfc3577e1436081feec0545263d8d9033900c665ee0a0c7f74014e7c9c42d17b4e8b53aa59d083299613836abefb0264ab19690c8f6d23da
+EBUILD libbpf-0.6.1.ebuild 1084 BLAKE2B 8cd1f9fd96d088eb8351b667c87178ba028fded8232a77608465e6f4d49d2a34b3c67bba43975cd04a5f81a1a9892383536c505f82898a812a2d15384ec082db SHA512 8c8e57531dba5f6bbfc3577e1436081feec0545263d8d9033900c665ee0a0c7f74014e7c9c42d17b4e8b53aa59d083299613836abefb0264ab19690c8f6d23da
 EBUILD libbpf-9999.ebuild 1076 BLAKE2B d44039d1bfd55ddc95d912ed484d247b1724e426f90cc37cd6dda84a5272f061c83811504d25c2f05c4394e57c3285bf256a3287b2bf320ed1fa0d677de16612 SHA512 15e0913d7eb9f8497c86cb2845662f2986a16ce1f5829ce34054c09e3be3a8165e1e7e91cf453e79d968bf8d9d1f69be539b1136e5fd9b4eb6adbbd0e5d794cb
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-0.6.1.ebuild b/dev-libs/libbpf/libbpf-0.6.1.ebuild
new file mode 100644
index 000000000000..857dae105061
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.6.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+S="${WORKDIR}/${P}/src"
+
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+HOMEPAGE="https://github.com/libbpf/libbpf"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/$(ver_cut 1-2 ${PV})"
+IUSE="static-libs"
+
+DEPEND="
+	sys-kernel/linux-headers
+	virtual/libelf
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/libbpf-9999-paths.patch
+)
+
+src_configure() {
+	append-cflags -fPIC
+	tc-export CC AR
+	export LIBSUBDIR="$(get_libdir)" V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		install install_uapi_headers
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libcdada/Manifest b/dev-libs/libcdada/Manifest
index ad61dca3ac14..a45ced51bb0e 100644
--- a/dev-libs/libcdada/Manifest
+++ b/dev-libs/libcdada/Manifest
@@ -1,4 +1,7 @@
 AUX libcdada-0.3.4-Werror.patch 688 BLAKE2B e4c6bf7c8df550a2dbafaab78b9933e39c7c7b8875a6c87c125b25b5396092b17b5e718fbeaf8ac6a79fb759d9378702ca98852e69ef1c782fc069cf85318e9b SHA512 3fb6fcc7ae855c9049256f74d69011a5599307eda280c5d5b546e7a1a8ff08e64eb3a842835753120c498e7f787a86193ef21624a0fd04ef67f8408752fdfe3c
+AUX libcdada-0.3.5-respect-CFLAGS.patch 850 BLAKE2B 84a52e62571a2f4fb9090d07de5abf3cd6865b698d8c30a6d78d80dc01ee76806a931e999c409d24ac4ccbfd884b5dcd933820801b5aedc1987c3be1e387f377 SHA512 d966ffc87dea5d5cba4a82fea2da401baf5e4cefb17337c955dd86347a240b637f22c2965d58562c81b6b6b65c5b04e606bba887d03e2f855b1ed8267d82c248
 DIST libcdada-0.3.4.tar.gz 1772957 BLAKE2B 5a7b24e7e033807586a30beb35a304b37262e8e673a02f307af63606b2119e3c76b2ed90cec6f494cac26f77aaafd1756d69c5043cf9adfd6a42cd0db76b4298 SHA512 363f2ebe9a054a6356040bb68460321ffb6dc0f66dfd2f95d275864135bed715e12bb6bbbffe11d665020a119033cd80d6bf323020760339664f1b7a4f1ae9ca
+DIST libcdada-0.3.5.tar.gz 1776937 BLAKE2B 55280e28d2fa6235ac95020b07853748a4551f1c1c2e65b12585064c4fa952dd310b54d5f95f986cea12018d452e1fb086d8bc3c944b169d5aeb280b78f25007 SHA512 4f3d022e54573c4dd0a39d8ef7d097bb209834ba56ec30003ef257e0496c7a08e50a432d0a4a40f019f06feab806cab81ee5ace9c92193266d5ec82cddad3269
 EBUILD libcdada-0.3.4-r2.ebuild 884 BLAKE2B 852811e2ae9cc561f2ef0698ec08102dd173deb564be61ee13d4675caac2bf55e1469464a2d6e6db3662b433aaf7f80a7e3fa72ec71398a0cb8c03bcf2deb211 SHA512 b72e444b3eeddcbf9c79a381d7a111b015fcc8ecf25e5f73d33857ca06dea70a390a4c821cf42f83c21d3cea6d5cd992a1a78228f8675dcf2bb39db4595ac86d
+EBUILD libcdada-0.3.5.ebuild 991 BLAKE2B 34b2379bdb5bffb62b94519fc6f3425f711d78ad3df917540ccdec85c01e2a54794fbe970c020f40f8353bff48db78118f8fefb6f48256285f4c6770dd97e452 SHA512 89e4be17b9e747b6ad328db74a2d31f5cd0779ea2511d14757063b2e906740a1d89b46e3bf69b5c709712c869b9d3f9703a5eeebbf399ce747e36c7cafdfb88c
 MISC metadata.xml 298 BLAKE2B dc523eb0719867c25f38bd413a4229c4b81b1d347184ce3574d32f96691fa907d14ee54e2f0fae3e94006b3465f0c8fb81c33818ec627d2028571b4d14500292 SHA512 5d9f732d34ef76b98a7366339bcfdbe1a3ef40fb49ff6c804d82f0b089fe2559f6cd26406b2028b49caafdbf0b57ffe27750f34143865fe3cb9b56041898a143
diff --git a/dev-libs/libcdada/files/libcdada-0.3.5-respect-CFLAGS.patch b/dev-libs/libcdada/files/libcdada-0.3.5-respect-CFLAGS.patch
new file mode 100644
index 000000000000..7fa0d01702b3
--- /dev/null
+++ b/dev-libs/libcdada/files/libcdada-0.3.5-respect-CFLAGS.patch
@@ -0,0 +1,23 @@
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -61,7 +61,6 @@ str_test_CPPFLAGS= -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+ str_test_LDADD= -lpthread ../src/libcdada.la
+ 
+ benchmark_SOURCES= benchmark.cc
+-benchmark_CXXFLAGS= -O3
+ benchmark_CPPFLAGS= -I$(top_builddir)/include/ -I$(top_srcdir)/include/
+ benchmark_LDADD= -lpthread ../src/.libs/libcdada.a
+ 
+--- a/config_m4/debug.m4
++++ b/config_m4/debug.m4
+@@ -10,8 +10,8 @@
+ 	AC_DEFINE([DEBUG], [], [Description])
+ 	AC_MSG_RESULT(yes)
+ else
+-	CFLAGS="$CFLAGS -O3" #--compiler-options -fno-strict-aliasing --compiler-options -fno-inline
+-	CXXFLAGS="$CXXFLAGS -O3" #-fomit-frame-pointer"
++	CFLAGS="$CFLAGS" #--compiler-options -fno-strict-aliasing --compiler-options -fno-inline
++	CXXFLAGS="$CXXFLAGS" #-fomit-frame-pointer"
+ 	AC_DEFINE([NDEBUG], [], [Description])
+ 	AC_MSG_RESULT(no)
+ fi
diff --git a/dev-libs/libcdada/libcdada-0.3.5.ebuild b/dev-libs/libcdada/libcdada-0.3.5.ebuild
new file mode 100644
index 000000000000..6a1c7ec68867
--- /dev/null
+++ b/dev-libs/libcdada/libcdada-0.3.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools python-any-r1
+
+DESCRIPTION="Basic data structures in C"
+HOMEPAGE="https://github.com/msune/libcdada"
+SRC_URI="https://github.com/msune/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.4-Werror.patch
+	"${FILESDIR}"/${PN}-0.3.5-respect-CFLAGS.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with test tests)
+
+		# Needed for tests. We throw them away in src_install anyway.
+		--enable-static
+
+		--disable-valgrind
+		--without-examples
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 02508802a9d9..ef572221cdbc 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,3 +1,5 @@
 DIST libdazzle-3.40.0.tar.xz 447648 BLAKE2B fb7916fd7812c03ec63bc804974574bbf6d029596e8364f5f13cde22be330a9356ee250c0d5bfc8742545d410c94b1ad7a1fa0bd5e2f473f67d6c45fe55e8e93 SHA512 23bf0a176fb847ee46a22a96594e9ed60921f104875fd102375445f364b552167778a56dd4929a18b2a7bee1144fd5e07d5cadac3355ac4877cd56838cb5deb2
+DIST libdazzle-3.42.0.tar.xz 450636 BLAKE2B 0a77a9ceeca2af8a001b75dbffa04cd385be89d9fac898e6b90111d240b409a54357d9668ca33e494dbb0ed932f16605f363aa69b92c548981be0db971b67dfe SHA512 db6ac54deba034627726747b8c15472aa2f640617473825698e23ca6527d5b69e9103dd82141e82b7dd7fa8bd57eadf054cdd300d46e1b65ced0fffcbc55a301
 EBUILD libdazzle-3.40.0.ebuild 1702 BLAKE2B c3e106800152ec6f2d7ef0156f85016fbbfb27dd815cd6ad6fdf7b21a62e31dae5bf58d233e5f2a7e032c9075e00931327a1460e5e72457ab027c6db18a71dd4 SHA512 1ab1bda49dc015ca1a9ff84e467c43373ec74127ff82f78bf34164680038373ad9ddafc99391a19d4b972bdb03726e1459e5780cb1a4f56e27e8e489f8f7144e
+EBUILD libdazzle-3.42.0.ebuild 1704 BLAKE2B 96d1bf947fe0f31e074ddcc0d66620045b4e08c9c3ed59176d2c5e1af47771ff7e3d5138849bb91b1698cc35f486b3483fe8bafd522a86868fe183dbf4cf9053 SHA512 e9d851e73fe77bea2c72617ef39e7d066f746ff7af5f131c2c879751f356ec4b1b738a5af6f3786021eaeef119f775a0e7c20e88a2ffe85f6d2e8d00b0bfb1d2
 MISC metadata.xml 562 BLAKE2B d07bb8d5805ff6659c6984057084cc5daa294cd33d87ba9f152aeab79b425626673c83e2cd5046914381a8c0432cfd34994fd61aadc1c9263367ba9c9506903f SHA512 be5ed6332538f24044008dcb91b93771ff7afb73e5e7d2351474b6a9d3dca57a790cb27831ca869057ece03989c49d7e49213240cb1c1f0c5c93346a4a157710
diff --git a/dev-libs/libdazzle/libdazzle-3.42.0.ebuild b/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
new file mode 100644
index 000000000000..0bed8faf85a5
--- /dev/null
+++ b/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Experimental new features for GTK+ and GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.24.0:3[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
+BDEPEND="
+	>=dev-util/meson-0.49.0
+	vala? ( $(vala_depend) )
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false # extra trace debugging that would make things slower
+		-Denable_profiling=false # -pg passing
+		# On linux it'll always use a vdso based implementation that is even faster
+		# than rdtscp insn, thus never build with rdtscp until we don't support non-linux
+		# as the rdtscp using function will never get called anyways.
+		-Denable_rdtscp=false
+		-Denable_tools=true # /usr/bin/dazzle-list-counters
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+		$(meson_use test enable_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 0d79ec167aca..2c3023e14cdb 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -5,10 +5,12 @@ DIST libfilezilla-0.30.0.tar.bz2 578592 BLAKE2B abfef274989b0ba31d9237394aa1e880
 DIST libfilezilla-0.31.1.tar.bz2 585070 BLAKE2B b7cd275ee39d5ac62801889adae79515c056a5f838f4348324c0f5a975d3cc45a058b4c7d37f99179efe6808464b7972c31e300ae9e05371134d7a149b5616d5 SHA512 072ae343bc44939deff435078c29954dc60e4bb5079aa705b7445bec17717919d4957858538284e4f131d734439743bd5d39085a618ea41d586be8be887cf2b8
 DIST libfilezilla-0.34.0.tar.bz2 593998 BLAKE2B 3f3563389f4dfe3667c8c1e46d5f4ab76e02f93188bada3c15e974405c49e0d1346813e64457ec5b60bdeca98629e5a05941f76cb375bb229eee759cc6ab5246 SHA512 960908aa570704e983e51e2eaa13a7fb688587bd1f3c37ade6a3f1b3f5379d0b9e5d3c727bcf58f033a1cc0fce2fc34e2fdffdb379ad5be85de917c0a590de22
 DIST libfilezilla-0.34.2.tar.bz2 595072 BLAKE2B b7c5db16ff74ee218eb38e69f029f6c2cad7984f7f27795ec67f9250eb544b259941cd34fc30bc8222aa0fef51e275d4ca0587754386807ecd916ab7c56b6688 SHA512 a749635f7526e307b93002c4044debdcae948bebb73c272ffc98d1997cf160001a7edc6c776656ea927254614c5a3067ebab1ffc92d7b9f97cf5d4542dec8df9
+DIST libfilezilla-0.35.0.tar.bz2 597061 BLAKE2B 3b7e54a5c999ca7a52d90bdc71a237940c7909ff2ca63c28e0ed76e743a15209cfddd66d0de54c157b42524a460079f05cc3af93a54d4b76c2d44e623bab23fe SHA512 685ed22ab8e4c197f26488751bac2b28e72e5dddce0fce4795afabe59a9c1c7775ac92958ad9c15b0717a8e9f4cf4bf44eee61179d8a2194cbc11a7e2564a5c4
 EBUILD libfilezilla-0.27.1.ebuild 1241 BLAKE2B bb00084913fae7dae260d3ecff107d4bdfd27fd8b8a5338c05fcbe9cc521a022b2daeedb6e341b97ce529646f0a415190bcccc06564ac017150c28436e959330 SHA512 edb4e98d5d68d6848984eb58c09605ae170f19f7be44bfa183f880364b40363c14dc2a937634696e941b3981f23a1274df731f4864f054f1409b693fa087cc16
 EBUILD libfilezilla-0.28.0.ebuild 1195 BLAKE2B c437655e4fff0fbc8a2b04316f48d0294c3679a532c337af8fe4fb6a521bf79febd33ef366ef1c46746202f01a8b43cef68d65b84da9f1dbe72461d229b50d56 SHA512 00c1b6556ed183280ed87e7c73529440043582ae0e818b06de66e614199c293117794e23443c2870c787ba22f5b7c0b20cc8a95681dc818df7d0fc203a84a48e
 EBUILD libfilezilla-0.30.0.ebuild 1195 BLAKE2B 6542369e8d9785df7603b283e63bc14cb0cbdcc208b4eadc367a89fc286435c62e5763fe6be8de6aec9f17cb9b6a4b52c14f342d95e642a949cb26a89ccfb052 SHA512 e60c681739a20877635e88cad841942eed0192812be10ebfc30022fe9781b3924a635418bcf89099fa02892f196c8366e6596fcd1f2c8fd123b432447d2bbb96
 EBUILD libfilezilla-0.31.1.ebuild 1195 BLAKE2B c24e1fa7f4264cc320a4fd2f03dd16de950f48e5faf750939b2b26e9558e6432b6f0b7baf0e6c5c92907664ed7dd624ebf7dd67dc46e7f4d9fc75f34699a869e SHA512 7b2a20fdb5be7e1d34707c91a241ca820803fd5dc56190fc39ddaa67e200627eea62dbbec114fdf47c456093e03003d1fe3b9e325a1f9f079d25af19c895d5aa
 EBUILD libfilezilla-0.34.0.ebuild 1215 BLAKE2B f28398b8f2649d074e87cbaffa0cb8713c4a0ae97ee0e009f360302ece2c93b544546308c8178a200de8665e8f316f7e554c28850c5289fc6e54689df999728c SHA512 03f1a0a9c7c6a94e83640d751fe909ef9161de482b09d6749ce6d4dfb0050e1fd5c4320e31748d4c9fa447759f2d3e9e35cf4f88c79502df443f43a4404e059a
 EBUILD libfilezilla-0.34.2.ebuild 1215 BLAKE2B baa509341d723ebeef377336bc5e57a55542e389928d0c706c6a32d39765c86d47ad0c610f96d69d8c885ea4e7525b3fd66e4940076ed2c615e5952363fcc03e SHA512 5368eaf24194e528ccf327c25f216b4de6831974d1b72949fa7dc27f2b905c6170c85e4a08a0f5b0994aed0185b2a771c9c769f61c93892035a89ec1bdfbb292
+EBUILD libfilezilla-0.35.0.ebuild 1215 BLAKE2B 5a31cc4246e7842c2040882ffd44af50da5c58f4f7a53bac3d079227b8171d0237bf1e661e0dfedad15891234673cb9dde5ffb7a2fde3329093105283fb3a131 SHA512 8f53c0030ac0823cf16137594808c20b09ba868ae6685cd701cf2ba0861a12c92315469a276decdeedd8820842e3be1317b95da08d01295fff7311e68ff16a7f
 MISC metadata.xml 1136 BLAKE2B 9db086df9b33ec49950324ad327f9746b79667dfd61028ec173ac71fe16000549cf6bcf2270f7e8c3f85e1ff2de88620867db9f52cd6530716154cd1ede8902f SHA512 2ccacf35e9b6f503ac4e46c6705cd032ba4895c02c8ab9f3da6898ac20f4dff999bb8a649f71d4a222fca4b9237b0a7d819d6929468390df92806fccb82be781
diff --git a/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild
new file mode 100644
index 000000000000..4652d201fefd
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/23" # 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/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 1c7746d57cb3..d307c68878de 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,7 +1,3 @@
-DIST libgit2-1.1.1.tar.gz 5451203 BLAKE2B 46842ea270fc457d0960c1a825928eb2747b236e689ff785e9fc2bce919744d1da95a89e6fcf928bbe6a4981e2ff6a02989df92026ba181f2743e949982a18df SHA512 287255c81e5baa04d8fbce95efca8174cb34da8025cab979445d41e8361955f1d8c582d7705666ae9fc03c5215fc4f4f57e51d73d14ca9b063ed94077f88e6bc
-DIST libgit2-1.2.0.tar.gz 5589147 BLAKE2B b612e3a30b4675431879792132adee22cce57986b4f307507b896d823329f7e37514d9008e008075c395a4eca26aaf6ed6eb3943cf97370a0b04086240a5e1fc SHA512 428188de153fdf8ff5bf78949f4a3a89fba57b87a8b641f92fed501df6a8cfdb72e0ffe0bf61a98adf210a2867134eb4421ea4b8d8219331aabc3daddd92f5fc
 DIST libgit2-1.3.0.tar.gz 5599575 BLAKE2B b701c105bb0a5bdcdd5ed1db180662ad4949c540944664d5d8c2f5d78998f15d15bd3669ae3e3d43bfa1b81207c0a94b7e49fc76e57f4cc8ef791ab26e62fc70 SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e
-EBUILD libgit2-1.1.1.ebuild 1679 BLAKE2B 9dd07e9bbe4d89983be44c8496fdda580f0934bce1d25088062a4f0b9fdd32dfa7fa845bb7d5bb601aa150d76aa22484845ae1ad0d97a81a23fd788eec737528 SHA512 8ed3e5abd8e9c97bc73c7b487d9669d973a5d3992090eb3a5ca72868a9309193ab03515a9dd1c8804f6c5457ce29a966091489666f40a8a917916a7492913e87
-EBUILD libgit2-1.2.0.ebuild 1686 BLAKE2B d397aafdeeb75006880dabf9653b88921794cee0f79ecf2498fbeb303dd5816d74afe21c03076eaaa6e575d0e96f57d0e697d7e0e859ad97f4bc02860fe9c6f3 SHA512 55e66ddcf474bca68cc61ed829a22b830f083ff584239d23c62d48ec0ad45dca75294c7bff0d27bb425cc6152ea71dd03e05082da846e8fcf086dc38a136fd90
 EBUILD libgit2-1.3.0.ebuild 1691 BLAKE2B 60ba697df7bf967756ee9c0d2501e035803f09a0b4ffdc20274788d174de2735afa3d5a2cde3ec248e07e9c843a62547c240514edd9897f4dab1cd4a8c4455c8 SHA512 c3c00367cdd0f9d4699fc017f760eb193c324ed280149b8264d8f2680824308948437e771ab0ea901185e558a9fa535c13e906ffa0aca732fe2480874492554f
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.1.1.ebuild b/dev-libs/libgit2/libgit2-1.1.1.ebuild
deleted file mode 100644
index f4e094bff971..000000000000
--- a/dev-libs/libgit2/libgit2-1.1.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake python-any-r1
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/1.1"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
-IUSE="examples gssapi +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libpcre:=
-	net-libs/http-parser:=
-	sys-libs/zlib
-	dev-libs/openssl:0=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cmake_src_prepare
-	# relying on forked http-parser to support some obscure URI form
-	sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace ON OFF)
-		-DUSE_GSSAPI=$(usex gssapi ON OFF)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-		-DUSE_HTTP_PARSER=system
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-1.2.0.ebuild b/dev-libs/libgit2/libgit2-1.2.0.ebuild
deleted file mode 100644
index f2c774a8b63c..000000000000
--- a/dev-libs/libgit2/libgit2-1.2.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake python-any-r1
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
-IUSE="examples gssapi +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libpcre:=
-	net-libs/http-parser:=
-	sys-libs/zlib
-	dev-libs/openssl:0=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cmake_src_prepare
-	# relying on forked http-parser to support some obscure URI form
-	sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace ON OFF)
-		-DUSE_GSSAPI=$(usex gssapi ON OFF)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-		-DUSE_HTTP_PARSER=system
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index c1e0751774ee..46bee24de0ce 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -3,5 +3,5 @@ AUX libgnt-2.14.0-tinfo.patch 567 BLAKE2B 7d9b1c0b520a3f2c3d74d6659a503f554c5b78
 DIST libgnt-2.14.2.tar.xz 106128 BLAKE2B d3db0ba3a297c14f32cc49b4e5b3392f47031e9406d862520a2f014f4d4e93c13e2ba5a2d61df81637f9dd7961d64ba69b393ee5b3cfebd7eb2768e3f16f29d0 SHA512 17b39e132b44b23486d7d39fa02761997a28abf53f67bf71bbad86d35124e5deb0363d670b2fb5ac99d47256282b0ef6ad1886e12984c868bb0d13ea7ba7d860
 DIST libgnt-2.14.3.tar.xz 106388 BLAKE2B bba785c998e53c75ed9c3b0b4ad1d96d63628a6e2b0ac7abec76a671ddfc0284fd787cd6793433aef83e6b31c6efecce0c656e131ca9b8bf548486de1010e1f9 SHA512 7131834cfe585177865bebf26167de08a04fced3da4e9a072d9b09b3becd1194914757b1a1fc8f129ae6c8fefe3ec1ce0d80d6c50cb624a5698b66ee2e06c6c8
 EBUILD libgnt-2.14.2.ebuild 779 BLAKE2B 4276e180412105d5a1efb42d90e63f53005314233b3eff2d080c9055d057377a0e8a151b536e4b9ca76c53e0cfdfbba79dd6372f5eaa8d35bd115a1fa86926b7 SHA512 9607b64bc4070f2817a9dab608af514bdd0bdb6fc9d338178aaf5d482b0b4c61835e8e9c71f9c60ba089c3576860d0a4cde8f12b537c7d0f020a1dcc721b52fe
-EBUILD libgnt-2.14.3.ebuild 756 BLAKE2B 4368760e6dc2b5d614aac57083a9255b32d4632bbd814ff787c4fd6ad8597ecbcd48a4c94d897f5e76eef2858598a2b65789aea3176212b67377808338f818bf SHA512 c8af5e002974d4b1c65fa7d3a31033b363c936d9f9e0223f20dab5aece66a582070a9eb5e8167ce35c7cab05c713ad5dfd66bc70d26e9e6884292ffdac252e69
+EBUILD libgnt-2.14.3.ebuild 751 BLAKE2B fc438837f266a1b68ce7d1795c6ccf316ea304cffa410ee804ec1b222d4f2f0c67e5374cd23accea4e2b9e236d64990d16d7648a39b95c055603b798ba511a85 SHA512 6e6d28ef8e4fdc11a2e9b659806c1e38ba631484ce5060b80c792518e5fd3c2f4083ad715c6e255475b0692541f7af42866c7a570d7d0bc6609cd65d6b629fb8
 MISC metadata.xml 258 BLAKE2B bd458e931e669f3599d041086b28cb8e05f9daca13a17504ca4bdf6a19f9e0e0bce389981d9b65875a04e7a6e068aab4d7f92819a6c545638a1e37ed462866ac SHA512 f3d8019f0e5fb12b60d75645d9d8468cc5ca283d1df19b23604a58221cf08b7a5b63744e4e99f26c80b798e2caf52c5a69f8d383c3aed06f7a1996e72f7f36bc
diff --git a/dev-libs/libgnt/libgnt-2.14.3.ebuild b/dev-libs/libgnt/libgnt-2.14.3.ebuild
index b0ee4aa1f2cc..e3b5baf277fb 100644
--- a/dev-libs/libgnt/libgnt-2.14.3.ebuild
+++ b/dev-libs/libgnt/libgnt-2.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index d28b25b8263d..6759733cbb31 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,4 +1,6 @@
 DIST libgusb-0.3.7.tar.xz 41844 BLAKE2B e0829430a7c4c9372ebc061ca8245ecd6b30f0922e4e37ae41f7f65055e7339b5a3a882c5526ea5e5663be3b7c1ad71fee7da5cffb501d63bd1cda2b618fd40d SHA512 65a35be62bff689621f418abf045f62f946c67488dd021d363ab252b9b3a2380898ec763b374f7da50901945eda666fdcae7cbfda7e143544175d7ade3ebc20d
-EBUILD libgusb-0.3.7-r1.ebuild 1519 BLAKE2B b7e13febbbeb970801988f3a18089b3a2a4619777c5bc06563de08cc9d5ffb38d36835da1a2aed6074717ffea0a20b06393a90800bf6f9ccc6ee74d03a7b05f1 SHA512 4d288fe8bb3292b3de71fe657c1630d86dcb8a1f418d209fdb1f863b92f673192b28c786b7659129dc76e8aec2973173710d7c1ef4aaff295fb5447e9052512f
+DIST libgusb-0.3.9.tar.xz 42708 BLAKE2B 6d73f3dba891dc7594c2df02198bb1632c8e7ccea2b60f5071c87ae1111b6e2cfed4f9b912f58f788f199c5ee075db156a4d7326aa9b5e6448581c2acd1af469 SHA512 4a4545d9e8ccadf2c66ef891936a30b2b73b7b471a9b0e945da21fd2b55efc3a8d12cfd5127dfcbca0ba24f565b25f8edd7a276b70a6615eb4b2201791745c6c
+EBUILD libgusb-0.3.7-r1.ebuild 1513 BLAKE2B 6a36977eae498f15a9292723c26624d8bbc12ad07907cf98b7a3c95ea6348e68bdbbeb81ec2744c678e9f1ffee81443805af39367526a7dd4d660da913cab730 SHA512 361111fe47bc09d5a715a98561e70e5f9e99adc617753142282236920d0a9e5805b2e5d2a647c3c5f6ab4b340be75102c0cb5310cdd38f14951e5ad2c0fadcde
 EBUILD libgusb-0.3.7.ebuild 1510 BLAKE2B 1e8783e5c44fd4387692888a39574c8215c4cde0ac99585ea95e6570fd9c7554a8026a8a5572fea0d7b6c273559762cf029e59fb7a136b65b2f4737f68e6610e SHA512 757153b0b1f7356a602b3b5cd47000e620e82c802b95aeec879f6e3470b40957134fe962d8940891a382c69b2ad82d473e9fd5b390bb9436b1afbe7220e29d77
+EBUILD libgusb-0.3.9.ebuild 1519 BLAKE2B 17d730f541318e98fd2cec90d47b7bc876a8fc7f5ca36440039e57832ee65731315011bc1a92e06b5d7c83e57b83e9d689adc8de688ea445e5240016e1f661d8 SHA512 2e3b4978f64e4b4573646273d985bc231b61bcc11b28bdaab2fd0e45132f5c5a3d5912408ced16865d918443e03e3b89327b43d03667bcda19af5d8a556d0e08
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.3.7-r1.ebuild b/dev-libs/libgusb/libgusb-0.3.7-r1.ebuild
index 304bd87d1a25..6fb3c9af5241 100644
--- a/dev-libs/libgusb/libgusb-0.3.7-r1.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgusb/libgusb-0.3.9.ebuild b/dev-libs/libgusb/libgusb-0.3.9.ebuild
new file mode 100644
index 000000000000..2df3883b3301
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.3.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="gtk-doc +introspection static-libs test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sys-apps/hwdata
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4
+		dev-util/gtk-doc
+	)
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_use test tests)
+		$(meson_native_use_bool vala vapi)
+		-Dusb_ids="${EPREFIX}"/usr/share/hwdata/usb.ids
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_bool introspection)
+
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 4b7c44506830..f982ffb32dc9 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -2,7 +2,7 @@ AUX libical-3.0.11-pkgconfig-libdir.patch 612 BLAKE2B 90b53adfb90684dd8c18f91a4d
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
 DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0
-DIST libical-3.0.11.tar.gz 891646 BLAKE2B 8e52f5d33586f435eb3311854c5ae5b96393f917cf119d46ef66bb1a10a4db2b1bf2a828c4cd0a4fb99428f44633b6a5592b144d0167f70887aaac3393312655 SHA512 cdee86c50edc2373ab2024d7d4ae26dd4b9a728dbc13083472c4923c67f61ff3cef7d43edca762c6a11979d2040fc1576a033eaa23a19e58af8f14a7d67fc139
+DIST libical-3.0.12.tar.gz 883537 BLAKE2B a67cbf767f5dba7717c80b2ed90f257025544b6fbbd85e4d10712fb63ec5d750c00e9a1d664b0c75f7e833847aeee2fc1412866bf4b599ead663132b3665835f SHA512 e97aec11895d4c51fcb1fe32598f5fc23bbffc26274d1f46e74d1b9a365bea65446563224b852d13a763334eab0375e77cabb5ba535d3b2f89b652bbe24b4517
 EBUILD libical-3.0.10.ebuild 2461 BLAKE2B 64991ad408f26956773f1dbcd64e02c465e2758585d970d9441edabca4de552873afc275eb09bcea5b61195b4a005abf00cf685f19c8ffa0dbdbd66fc9a823e5 SHA512 31f2a9baaf70b3ec78d5f94f761eed0b27b8962b46d11de0f4fc9c45b103b46d286aaf8d3a3472a6371bc25611a4e1a5c785ffa7e94dc1e715eacbaf72df5601
-EBUILD libical-3.0.11.ebuild 2466 BLAKE2B 720a195a6766d78b5ffa2a4f205933b8356b3b3ec4cd010796afd0972ee23aa3b4bdcf6267e71d547ba0473d4bbe76d5e563ffa3354efd5c8710ede593dccd25 SHA512 020eaee564a4ce93cad2c3f8948362a260c4c138bfcffa583e9ca997524aed7cb43f2c46ddb5ebe8ebdcc53d61d6b08e9a5488a669367314e8d3aca98f4bc61b
+EBUILD libical-3.0.12.ebuild 2477 BLAKE2B 2337032c95a9d2d9c3cb08e45c7c1674fc7d18d1f86c797cc2396fbf91da79b7161a68c898c0b11ae765cf03b1a83766c708804ee9e08e6454cfc98ec2654a7d SHA512 7d6eec0805f74beb835293eceacf8416a9dd434baa2362a82821d65cb536e98ea200a28fd0ab7ce3e078bce5a06b359f3420d2da6871c1e598c3f998f4901d2e
 MISC metadata.xml 415 BLAKE2B a03d59a58e875698695319e5f427ef82ef11dd8aaa457cc6647039ec57583d730d53c5040b5b76007bf9662a78684968791f0a15ae7172007d4c49ffe8fd2318 SHA512 0663988285e1881903c0e8f62bd5ef99c26089b54f4abfeaa0a97f5ecc9820586b1a20077ddea24bf4e513b8049110f08c33acde433777adc1dd6d03f7ea7966
diff --git a/dev-libs/libical/libical-3.0.11.ebuild b/dev-libs/libical/libical-3.0.12.ebuild
index 4a1c23b6ce92..a9a1be42b120 100644
--- a/dev-libs/libical/libical-3.0.11.ebuild
+++ b/dev-libs/libical/libical-3.0.12.ebuild
@@ -48,12 +48,12 @@ BDEPEND="
 
 DOCS=(
 	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+	doc/{AddingOrModifyingComponents.txt,UsingLibical.md}
 )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.4-tests.patch"
-	"${FILESDIR}/${P}-pkgconfig-libdir.patch"
+	"${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch"
 )
 
 python_check_deps() {
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 1bcda281430b..945bc66b9b7b 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,5 @@
 DIST libinput-1.19.2.tar.xz 654924 BLAKE2B b55d34186bba3d4956d7308594acd0928b7bc575c34b8c53ee95780887beccd141804e278cd1ea6c8fb48d064bde9c95c26c6613d6169dfa4e7ccdd64a50d3e3 SHA512 fc5244dc90ceb710f7b5bb76a3cafc7dd5a8d5fa05c51122412615bfc3a99435d6a1017b79c3ce73561139fc2f5959acaf16cb9500796ea2f3eb6cb95d1a1acb
+DIST libinput-1.19.3.tar.xz 655164 BLAKE2B a07d91603a3d4e759aad25ee46b11dbee47eb013a2361f1b70acd616fee0ed9660e6fa8773948d6acf3686179fd7aaf76bf8285f3dc3137a4b1b605ec0e4d6d2 SHA512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298
 EBUILD libinput-1.19.2.ebuild 2254 BLAKE2B 66d37c3c9a68bb5950fe486516f31bd4ad74c74b330b50ca6215c1e20a6861422d966f4f5bb5c783d39d65f2917eb11429f069ff09bfceb8de090180cc468c39 SHA512 b8d5c658d2c0b9f4131648a06adbe32e802cea7f5f631e673beb1944873631fea3fb5ec0b44d0deead6d87f121f8b0de120593dbbf3c449bb36662f5b50b3be9
+EBUILD libinput-1.19.3.ebuild 2261 BLAKE2B e24c5bc7f31ba4b012a539c6a0360473954adb142591abb34e92b2be8429fe2dc8dffa6ca0aa624e6f0b59ddba207557eb34479a6e5429182a701266b703859b SHA512 2dd77ee6b110f815e92e21131146d908eab2c6ee912aa3498431157708996fd1d85f4d2400036f82bdbaf51d044df512fea769e79791695a3abdaf908d3563d0
 MISC metadata.xml 449 BLAKE2B 677e5fee3bf4047ba47b90aca7f30b9ce57e947e6b5f6903cbb93c214b084f0d93f6253980090544d4ff4a821263c156e0706ae5499cacbb2e52d629f3a7b253 SHA512 103e8b39ad6b9ffde159095dbc4553d8b695db44e49582518055313c79ff6123bcc424c3980cbbaeabaa455e00a828039f73c1f3424ce038d5a2d63ed3e7849d
diff --git a/dev-libs/libinput/libinput-1.19.3.ebuild b/dev-libs/libinput/libinput-1.19.3.ebuild
new file mode 100644
index 000000000000..07b92e48c6a0
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.19.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+	>=dev-libs/libevdev-1.9.902
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )"
+
+python_check_deps() {
+	has_version -b "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version -b ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s@, '-Werror'@@" -i meson.build || die #744250
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		$(meson_use test tests)
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	pkgname="dev-python/python-libevdev"
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
+		einfo "${pkgname} must be installed to use the"
+		einfo "libinput measure and libinput replay tools."
+	fi
+
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 1509ee2ead94..8d5736b48a86 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,3 +1,3 @@
 DIST libmanette-0.2.6.tar.xz 43236 BLAKE2B 3b2a6979aa368117fa5d61623c26e6cca61388770ad77e759c3427fcba64d40361b1e1a4f87a2931281edbf5c2943a44c2ee3b0485ef52ddbf183a9e72344892 SHA512 e10a1b3e493a6472b0cf7562e3dfbba839ee69bb878676b2e3521363e9ff7c5df7d379923a4781366797e889f3c8985397080ae606264dc9bd3a4459bce0513c
-EBUILD libmanette-0.2.6.ebuild 999 BLAKE2B a577bd8cb1162c5e663a0e360ea352f24eb5053383a2b751ea63081e9f7a9d6e8cde3ee745597828b24d5b872ce0c0098da07a92631dcf8be22a1708b2d3a1ff SHA512 dd24cdb7b84347966c4df545ad3b38e46f67d69d41f94b7842ba344e6d4f86ec23c09a8147ee78a790a084d181e11a912823e746e350623de64d01572ab87786
+EBUILD libmanette-0.2.6.ebuild 998 BLAKE2B f2d31459add4ca57e40b9345c8e7e6ffcf63caaf7f2b0ae2ec2a02e46a5fd831422dd9132d09c52e20e2f2697cdcb388e388fd8a7a2ca68c635192572bf3821e SHA512 1af5a8ac658d23ba6c7d0adfd53322225ac492e26b97e11085b8b2fb1fa8047ce794ee4a09ea06fd4a5bb1547f12502ebdb07614508c4d9add369dcf6f007754
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libmanette/libmanette-0.2.6.ebuild b/dev-libs/libmanette/libmanette-0.2.6.ebuild
index e87160249bbd..cdf714b17c27 100644
--- a/dev-libs/libmanette/libmanette-0.2.6.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="gtk-doc +introspection +udev +vala test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 896b9852066b..78511064525d 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,6 +1,8 @@
 AUX libmirage-3.2.4-gcc-10.patch 1207 BLAKE2B 60104bdd6feebe1d654fe69ce7218c0134c3f28dc3b2a39cd64987ea6459c12041f23f4eb253d98ea4a15454f9ad9ea263056b2fafba794c3bd7df0055dfbade SHA512 b4aab3ea20ed4d73669d6cb911191eda0f6f509a84af803154b397809a4ba5719cb2270c32b71686a236b8362fe5dfe88fa745a00313215c06bda35d38fc38e0
 DIST libmirage-3.2.4.tar.bz2 234530 BLAKE2B 72329350a9e2a197ff52d396a011d3cf0178731909066ee1dab75f0d870fd751d50e2cacb69c849aa8045e94fa492732c21d201bdd4cbe3a9048f5c3f90ea881 SHA512 6fe718ad7beaf457ef0a7cc037b3bcf268574606ea9cbc1ba9abb5088c734fe9a100a35320d393a47625bbdde5515cded02e767618f2fc0801cf755af1414091
 DIST libmirage-3.2.5.tar.xz 229380 BLAKE2B ee73bf8418a209633afe7b30888c851cc0f206c03413d0b8d2717bbdb6fe77f3f32e81e1210931753cf453759ff7e4af48164866ad973b3a219381cbafd3d6f6 SHA512 f1247430d428b63734ab16328c3a484acab05fa2189b5979dc0e5759812190abd38b84bacc87b68f166f77cc88c3d4e9fb64ab0d7ec24c116c08d9314dd6b75b
+DIST libmirage-3.2.6.tar.xz 229408 BLAKE2B 38402e37acf42e58fc896621cfb0f253a53b23eb8c783a900521fa8fb297fd3df8397b2f8d341e33fd7e0edcae9ac1a4e178cc9414498f27399b8e5f2a1984c5 SHA512 085ca774c047f845a61e9c1015f4b249073e72239c55dbb84c335799815cfe93b0c883c6e56cac3c0c11db009f44a6b48680c6fe6793dde63a5006cdbb627197
 EBUILD libmirage-3.2.4.ebuild 1213 BLAKE2B d43481df1f7e1150c4163b292eb9586d0df99c78aca6fa545df6ef02445413b8a728a31ba013a825fffb458434e64305dd4d4c0b43b7336e66087433cdecf584 SHA512 1f262c22797a3df1f813eb1716d568fe192b869dcb1e7ccf7c63539d0ee8686ee1e972da6f597296842fdc8278395fc8bc731b2a941b2c6ef305ef22b2dc297d
 EBUILD libmirage-3.2.5.ebuild 1166 BLAKE2B f8559131516bb8d14ca80027554e6dc97e2715ee3cf2d8757342fc89aeb2c7e1accb262864866e2f86a6863209d2c879d4c08fef63d7221f1d2d3fd538444eed SHA512 dcb7858727dbcb907a1b47251822484efe5e09ef0a3844fb53c0709c02f7d1d1614f99390cc715cfbb849f15738438ccdb6910baf1aae8a193a2366458575896
+EBUILD libmirage-3.2.6.ebuild 1168 BLAKE2B b0686f882d6e047fa4698fc3cdc8f8d72bba375b60197a74205b0534c54be5cb7593b93a020b7bde563b80d940e43a6d8e45e21e02a2c22d19d59fa7842616a6 SHA512 fca50c501372b12b4f03862533a760e6217bb15006b86c0f6a6e624bb7c6ac740eb3cde2e07076a5e22c08b31a3b33e2d532a5488b461d885413df51ba6b5f3d
 MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129
diff --git a/dev-libs/libmirage/libmirage-3.2.6.ebuild b/dev-libs/libmirage/libmirage-3.2.6.ebuild
new file mode 100644
index 000000000000..9625ed04c5a2
--- /dev/null
+++ b/dev-libs/libmirage/libmirage-3.2.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="CD and DVD image access library"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/11" # subslot = libmirage soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +introspection"
+
+RDEPEND=">=app-arch/bzip2-1:=
+	>=app-arch/xz-utils-5:=
+	>=dev-libs/glib-2.38:2
+	>=media-libs/libsamplerate-0.1:=
+	>=media-libs/libsndfile-1.0:=
+	sys-libs/zlib:=
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+
+DOCS=( AUTHORS README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DGTKDOC_ENABLED="$(usex doc)"
+		-DINTROSPECTION_ENABLED="$(usex introspection)"
+		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 7ace9725b1d4..b7a4ea5b81e5 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,11 +1,5 @@
-AUX libnl-1.1-flags.patch 441 BLAKE2B b07df1490a4485468aadbe7dc3aa025fa2514c36116788e517840370952c85e7cc8173b4fec532ddcb405eef9b9df813090c531df1834ad8e7d3644c93247f08 SHA512 1f97dc181118368977ebc7bc6134c7e9fb6acd083721f1c857fca9e3a2cc242e03cbd198a0fb12a05597765a732d9a9384a75f46d1f023f6d5160631a29a9947
-AUX libnl-1.1-vlan-header.patch 2378 BLAKE2B c6d72cb5c7437bc6600e2c34eb6f17fd22df4338c37cee53f0112d3824bf2e940c9166f233fe32df3d451ea37fee2c08db27db7f46d7522f5d04169abdecd28c SHA512 ea45d780b16e6045735aaf2e3febf19ddccab4ca0e03710aebfe51655adc50177aefa3bd4d06e0ccce0160f4c6db73cfa4eb7cebe53b3e15c1807c3b00dc1c9c
-AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86921f2372d200468206ab06cb391a3fce01998d7e4924fd6d235e9292bbbd6134dbc87aa3ebc3dafd16610b4a2a1 SHA512 fe625a9ac6ea8776c8f7ef3d7e3553651c0244e830883587bd7e86490e0ec6e8b29865e172a0e39947e213b910a4279202eabfdd5d7f08e835f5be91d4ff9d6b
 AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
-DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
-EBUILD libnl-1.1.4-r1.ebuild 1163 BLAKE2B 765d47612b1adcfbea4b8d0ac71d5d8cc3d7e198fc225138da70f3f96dc6925b24cd83775c74b6404d98496e1624a4b76cdc33f18e9d8352cd6084505cdc48fb SHA512 2c902a544a77e6ab768589d4125658eeaa6983fac474e1e5703486fa574fcc9d3c5f1ca5225a6433b42b6614757b6a9bd4261e42135ff095a4d0a4ee2e97d763
-EBUILD libnl-1.1.9999.ebuild 1064 BLAKE2B 318f89cd93c4c3d342fded3d5d399c8560e5e1977057248fcd1ae3ae7da3d03bea0a02125e4d5d8c8e1017c3ea1add6cb02babcec3305ffc45b1d7b9da55ecc1 SHA512 2e8e94e598c956e51fbc835b7cff45c0c3783686038cb01bc47acd20f877884c8453fa8b932125e204cab027f546dfe4cca0b24a1482061fbca8e7192f66b056
-EBUILD libnl-3.5.0.ebuild 2445 BLAKE2B f3eb1ad522df08c9e497112ade04ede8f84800a395513b4d5243e3e37b3238cf3ab8fa9e28482d61b9ef956e180895382de4bf16976f2782a4aeaf808d783849 SHA512 6db1a9863c1675147a98e0333b9354c5cde0d81ba66c0c494fa73ce6c398c65bcb87ab870cf59b634367a9eef94fe9215b42309186661b7b98eb7f8bd95e9b32
-EBUILD libnl-99999999.ebuild 2483 BLAKE2B e6a9305001ae8b0780819a27a728d74ccdb9b2e653cc593bdbe058d0db8d8c41e875e80e81d180876f7e0268d73b52efbf953a36f6f5aedbaf037589516d4c4d SHA512 34a68f565764659c11ca862843e8bb38035c3d1baf682842e2535c997414a6f4c92d15277434f2062016acabe719bdc6120fd625b3acef0e39037c339ca7c2c3
-MISC metadata.xml 585 BLAKE2B a9b0dca6b71decc5473ca1345a7ebc0fa977c0165da13c24cbe29cb682daf1be3feb3ee3e85b44afa0314453a9e791a29a29662e1a820d2932b93e7597437fa0 SHA512 ddef3f3a89aa669d1497e75405cb5e9aa4d56fe23d252648c270d04bba3072fe8d03ab820c50c7a582f236eb0c00ca612a3f9b8d89888f8007f6ba5dd76b80cd
+EBUILD libnl-3.5.0.ebuild 2382 BLAKE2B 74f7547affccd9b5d598633dab8f2a9d7392a3a2a47fea889fa151e7fa615d283965b6175bda715034d14f6fdf4cb54e39c02f13d94d38aa082a4f285f654725 SHA512 280eb0e550967896df738c8bb3ab678ce9a8f16b9d6a5f096da63e49b381c81620db8fcce095082f44fc8650f216121275f9b97a7df66fd2aee6be3562118e2c
+EBUILD libnl-99999999.ebuild 2402 BLAKE2B ff14de3e36dd90e8a85134ece01681216c5baf0212a19a4c8ebfa5b9a5e6a06259ae84e4c763c260f602e7c49e80007266cff556c562dd56d0b5b652d2839d48 SHA512 937454d469f5c5ec6d928659e78b2efc68ef0d6207f7bdb9a3ef3c4595b72c96962b07ce72d8f9319c810b64fc0fb1ec806b5d0393346fdf2ef7515b95f38883
+MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/files/libnl-1.1-flags.patch b/dev-libs/libnl/files/libnl-1.1-flags.patch
deleted file mode 100644
index dc512c587b9e..000000000000
--- a/dev-libs/libnl/files/libnl-1.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -48,7 +48,7 @@
- 
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
- 	@echo "  LD $(OUT_SLIB)"; \
--	$(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- 	@echo "  LN $(OUT_SLIB) $(LN1_SLIB)"; \
- 	rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- 	@echo "  LN $(LN1_SLIB) $(LN_SLIB)"; \
diff --git a/dev-libs/libnl/files/libnl-1.1-vlan-header.patch b/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
deleted file mode 100644
index c4c2fc6382de..000000000000
--- a/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Patrick McHardy <kaber@trash.net>
-Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
-Subject: [LIBNL]: Add if_vlan.h
-X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958
-
-[LIBNL]: Add if_vlan.h
-
-vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
-older if_vlan.h versions. Add the current version from the kernel.
-
-Signed-off-by: Patrick McHardy <kaber@trash.net>
----
-
-diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
-new file mode 100644
-index 0000000..068cd7b
---- /dev/null
-+++ include/linux/if_vlan.h
-@@ -0,0 +1,61 @@
-+/*
-+ * VLAN		An implementation of 802.1Q VLAN tagging.
-+ *
-+ * Authors:	Ben Greear <greearb@candelatech.com>
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ */
-+
-+#ifndef _LINUX_IF_VLAN_H_
-+#define _LINUX_IF_VLAN_H_
-+
-+
-+/* VLAN IOCTLs are found in sockios.h */
-+
-+/* Passed in vlan_ioctl_args structure to determine behaviour. */
-+enum vlan_ioctl_cmds {
-+	ADD_VLAN_CMD,
-+	DEL_VLAN_CMD,
-+	SET_VLAN_INGRESS_PRIORITY_CMD,
-+	SET_VLAN_EGRESS_PRIORITY_CMD,
-+	GET_VLAN_INGRESS_PRIORITY_CMD,
-+	GET_VLAN_EGRESS_PRIORITY_CMD,
-+	SET_VLAN_NAME_TYPE_CMD,
-+	SET_VLAN_FLAG_CMD,
-+	GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
-+	GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
-+};
-+
-+enum vlan_flags {
-+	VLAN_FLAG_REORDER_HDR	= 0x1,
-+};
-+
-+enum vlan_name_types {
-+	VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
-+	VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
-+	VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
-+	VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
-+	VLAN_NAME_TYPE_HIGHEST
-+};
-+
-+struct vlan_ioctl_args {
-+	int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
-+	char device1[24];
-+
-+        union {
-+		char device2[24];
-+		int VID;
-+		unsigned int skb_priority;
-+		unsigned int name_type;
-+		unsigned int bind_type;
-+		unsigned int flag; /* Matches vlan_dev_info flags */
-+        } u;
-+
-+	short vlan_qos;
-+};
-+
-+#endif /* !(_LINUX_IF_VLAN_H_) */
diff --git a/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch b/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch
deleted file mode 100644
index e370a5e62fc6..000000000000
--- a/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/netlink-local.h
-+++ b/include/netlink-local.h
-@@ -343,7 +343,9 @@
- }
- 
- #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
-+#ifndef offsetof
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#endif
- 
- #define __init __attribute__ ((constructor))
- #define __exit __attribute__ ((destructor))
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
deleted file mode 100644
index 8f3ad2437d6f..000000000000
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
-SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-1.1-flags.patch
-	"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/@echo/d' \
-		Makefile.rules {lib,src,tests}/Makefile || die
-	sed -i \
-		-e 's|-g ||g' \
-		Makefile.opts.in || die
-
-	if ! use static-libs; then
-		sed -i lib/Makefile -e '/OUT_AR/d' || die
-	fi
-
-	rm -f lib/libnl.a || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	if use doc ; then
-		cd "${S}/doc" || die
-		emake gendoc
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		cd "${S}/doc" || die
-
-		docinto html
-		dodoc -r html/*
-	fi
-}
diff --git a/dev-libs/libnl/libnl-1.1.9999.ebuild b/dev-libs/libnl/libnl-1.1.9999.ebuild
deleted file mode 100644
index 14a4835802c4..000000000000
--- a/dev-libs/libnl/libnl-1.1.9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 toolchain-funcs
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
-EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-IUSE="doc static-libs"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-1.1-flags.patch
-	"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/@echo/d' \
-		Makefile.rules {lib,src,tests}/Makefile || die
-	sed -i \
-		-e 's|-g ||g' \
-		Makefile.opts.in || die
-
-	if ! use static-libs ; then
-		sed -i lib/Makefile -e '/OUT_AR/d' || die
-	fi
-
-	rm -f lib/libnl.a || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	if use doc ; then
-		cd "${S}/doc" || die
-		emake gendoc
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		cd "${S}/doc" || die
-		docinto html
-		dodoc -r html/*
-	fi
-}
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index bb1b8fad31e2..16c5e65ab3f0 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${LIBNL_P}"
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+debug static-libs python test +threads utils"
+IUSE="+debug python test utils"
 RESTRICT="!test? ( test )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
@@ -68,10 +68,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
+		--disable-static \
 		$(multilib_native_use_enable utils cli) \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
+		$(use_enable debug)
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index b2b6af6a8f1e..5179de7255b9 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/thom311/libnl"
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS=""
-IUSE="+debug static-libs python test +threads utils"
+IUSE="+debug python test utils"
 RESTRICT="!test? ( test )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
@@ -68,11 +68,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
+		--disable-static \
 		$(multilib_native_use_enable utils cli) \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		--disable-doc
+		$(use_enable debug)
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libnl/metadata.xml b/dev-libs/libnl/metadata.xml
index 9a023d2e9d88..ff40a5ef75a9 100644
--- a/dev-libs/libnl/metadata.xml
+++ b/dev-libs/libnl/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<use>
-		<flag name="doc">Install development documentation</flag>
 		<flag name="python">Install experimental <pkg>dev-lang/python</pkg> bindings</flag>
 		<flag name="utils">Install command line interface utils</flag>
 	</use>
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index e3c9d7da56dc..ad4959874056 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -5,5 +5,5 @@ DIST libofx-0.10.2.tar.gz 225043 BLAKE2B 2ca8cdd9913f2bddb60600d75acfb114d56d6c5
 DIST libofx-0.10.3.tar.gz 225132 BLAKE2B 29dff4cb79a4a535bf255c787e184d103ecdbe975bb4bb223b675bbacaff9f8a228ae0a3dffe7710c2707496ac65c4f48ce993243b8353172c53cb02067d9267 SHA512 6c024628a6a11d9542c669a438223331a033eb820b1a2c3001c60d1ab3fad45ccdec64f9b54dd206fe0058ead8e14e751eb7a3bd88e8f9e1013b0bdd5b6c5242
 EBUILD libofx-0.10.1-r1.ebuild 1239 BLAKE2B 83292626ed46b5c33d6d50fa02e8f564a906040d225c525de948f8eaba3a617aec3e50a3ad06328b7cbc42a3df539489dcf9ba519c61aaaff554657a40a5c06b SHA512 832c114686f8c26d72af61de21bd165e3a6bedb128de84cac53b5cd1e0177420fc6a0928dda3aec320e5f5925f1575ebe2a870629fa3cf08e5a45f482e013631
 EBUILD libofx-0.10.2.ebuild 1153 BLAKE2B 7b81c6001f3fd4269efca53e206493d68ec864b21629a258a6c3b943b7cb3112926c413c1fc40164cd5016f525f424248e8b20d01af20f1b64895619ea1a11d0 SHA512 cd3e5f1e565595b584f8683e6f9ddd211d21a7f650e28defc3a2b6b455942bbf89b65fdf73a9daa71881c5bc5e15eeb5c5b73cc2349f0ea6ee878acb2094eed0
-EBUILD libofx-0.10.3.ebuild 1157 BLAKE2B 3c53d2e9540cd5f0e97e1ba9b17fb4a82b0f3bd900f757c99cd63c3a92363cbfe02632db68469a5fe1b3bdd73d08323d1041376321746c2dc392b9303498843b SHA512 002c21658a1d11af11de67fdca9380e489fc74991b6cdf2bc50f4396cf4b1acdc9407aba9a36206242e31213f6136b59241edf06f53a04505c1bd0bc96411a6d
+EBUILD libofx-0.10.3.ebuild 1153 BLAKE2B 7b81c6001f3fd4269efca53e206493d68ec864b21629a258a6c3b943b7cb3112926c413c1fc40164cd5016f525f424248e8b20d01af20f1b64895619ea1a11d0 SHA512 cd3e5f1e565595b584f8683e6f9ddd211d21a7f650e28defc3a2b6b455942bbf89b65fdf73a9daa71881c5bc5e15eeb5c5b73cc2349f0ea6ee878acb2094eed0
 MISC metadata.xml 297 BLAKE2B 819f3298f3f9a816e9630ebce9f8d163b5974cbd76a1e6bf5ad5c499a3e926b887c0396b6f1c8d13e765b3b37cce93188d15b2ff0bef52d98b7f9bb516225bbb SHA512 58f2ece0d8cb8ffb32fc849e42a49cd086c08a0dbd4e03ab78ec51a9224f3ce60c69acaa56712567ee4e1a4d87aabd7830d2a60af1a5669af7a9eb7b4ec4f046
diff --git a/dev-libs/libofx/libofx-0.10.3.ebuild b/dev-libs/libofx/libofx-0.10.3.ebuild
index ae5c04394d48..1acb92d8616e 100644
--- a/dev-libs/libofx/libofx-0.10.3.ebuild
+++ b/dev-libs/libofx/libofx-0.10.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 0dcac6d3b854..e05cabfe7c1a 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,6 +1,6 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
 DIST libp11-0.4.11.tar.gz 500433 BLAKE2B 6a12d8bc0551b3ef11857c0e60a33ebae4f8dfa72c914e9356c13547d71e0f1000ef4b6b7476cfba7cc3376b44b05c2bb0e7a88a267c13702222a7d2b10e9a78 SHA512 37eeeab09cbef7e1498358f2c614f4ec6cb9f37bc9b19e6e393fc0ed3c47ebad8d484b5f5cf428c76ffdf25d08e337d5148d0ff517957283394111dea83352f2
 EBUILD libp11-0.4.10-r1.ebuild 722 BLAKE2B e14c3b3aeba1c543d44eaf0f20a86aafe71f98708611f19ff0976dcc7f6268f5483de65061cbb9ca95990c3cdd9897505d2a1b444dee0e9dd2894a2824cbab83 SHA512 4e0453e386b440591cf95e47b335a9817c014dfdd4a084eedcd86e2b57443fbd334cf521c8325a473bdb645c03693ac487944f6219bad6915f0f0c13d7d8b35f
-EBUILD libp11-0.4.11-r1.ebuild 736 BLAKE2B 75ecc0ba01da649bebddc4ffce44f1c6286dc76007587ffa088be89b7d0942897001f0c348da3f74afb9782c4cb43d751bbd54872cc26d436b6ebfd61a24c552 SHA512 a37627dc1a05cbe053b0d4928c4858505969e412b20d01698326d92ec9740f006bcc14de5ef5af90d0014559a3645c14930199b84d5df742a48e7addcfb1290c
-EBUILD libp11-0.4.11-r2.ebuild 721 BLAKE2B 8d48f594944ed1dabbbee9734a6562ef6dc902da45f851e905be5a05a8d5e4b567b26f6ee071dbcd37713ac116e1b26ac0d1dcbcf74c4b5216a32ca430791c00 SHA512 65176b9308d2eeec71c8cdac31ad245a98c11a62884608cb36e42647be445f2d671dbf01cc958df86a89b8f0b8c9addd4efb8130ba806125d5e9a74a6c64b544
+EBUILD libp11-0.4.11-r1.ebuild 729 BLAKE2B 31105e58ea691e4a5e06f9969fbf368d51fec217e41cb8e363da21e59571632a67d559c443ddbd656c9423e770c1af37bfa220816dbfdd212ab0ece666a6f921 SHA512 195dc37de7ac381262f0539baefc0e7e71253025615f33439f0e562b332c9cbf1951198ac0648a6fda4a656b7f5ffac8e5859b6a154e5a7896c53e57af8682aa
+EBUILD libp11-0.4.11-r2.ebuild 714 BLAKE2B 12bc35434d592a22fa756f086fec28cdde42dbb8bb13c021734ecc017483e9d2a8b502e85056e48846ed281be467af3e54db7efa3c2f2544a074d856d5ae85c0 SHA512 b4b5b9e386b8eb2cf34e580c33a1d2ae98ed28605fb1a8a04219142f3cb7a770daea063fd5a03024ecb5997d738f1def2bfa3a075ae006b0c9210274d8130689
 MISC metadata.xml 689 BLAKE2B 15a51be6d21ab88ed85ac0bd5cae06e6d9dacb4722f5474edfc4d378f7295617995e4a35d4bf7a14cc8dc3d062633a3c75fad16f3aaea060474906dd60db8797 SHA512 aaa4e18f2a1dd543087050b86c3506541011c0c75cb472ac2227c07cf2749a38876a5ff95e648dad202019358b5fdd49804f67100ccad7ac10e38004bdffd226
diff --git a/dev-libs/libp11/libp11-0.4.11-r1.ebuild b/dev-libs/libp11/libp11-0.4.11-r1.ebuild
index 084aa509f96d..c0e828d219ed 100644
--- a/dev-libs/libp11/libp11-0.4.11-r1.ebuild
+++ b/dev-libs/libp11/libp11-0.4.11-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libp11/libp11-0.4.11-r2.ebuild b/dev-libs/libp11/libp11-0.4.11-r2.ebuild
index 1fe3d069b6f6..e244ffef1443 100644
--- a/dev-libs/libp11/libp11-0.4.11-r2.ebuild
+++ b/dev-libs/libp11/libp11-0.4.11-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="dev-libs/openssl:="
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index d7631ccccaf8..1685a643b17d 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -7,5 +7,5 @@ DIST pcre2-10.39.tar.bz2 1730729 BLAKE2B 9ee01ac2704e9cb7a107d402fa0c32828fc6642
 EBUILD libpcre2-10.37-r2.ebuild 2639 BLAKE2B 34947702bc9bf6cef80e0fc6bff9d58a5776197a6d3509d51f092b5fd7b191508a0c0763848c0bcb7950cb6c8efb1e55cda7c083e8012350c897470badf70537 SHA512 12311f8b31c8f2f39fd67334ac74fefb88e7da6fd7c2bc64b1689701cec30f54e293356a312ef51b9fc02a6d18254dbf5c095db6d2127bc745f848783d88da91
 EBUILD libpcre2-10.38-r1.ebuild 2787 BLAKE2B e6c05981bdd8a95835372e56794bd68f673d6ceb5f994d4e353804b87251028df426468e4cfe02eaaa9cce10800ac88cc37e31b9f5608337e572c72cc889f2f7 SHA512 bcadb60b53eef11f19202ed38b881c8e1f5f1647b4313c1a768e8d48769ed4fe17526bad0b32a9a633852505ee95f3461ba73eb6a05cbad5446ee0a8ba74ede5
 EBUILD libpcre2-10.38.ebuild 2679 BLAKE2B 0c7717f0ff0bcd5d4d0275b18bad23127de544c72672f71e6c2569f23b3b7b2fb4d4eb3e2bce58d6e3bc2dc68f5dd703588707c3c1c572bdd7a857122ca989ff SHA512 1fdcfebcf4c6dfdfc144994d17a91e0962a9acac95d81bd0f91de81bcd39a2fab42be985c2932283685373650463e7f63ac6e73afc7952e6a793acc099b2dd57
-EBUILD libpcre2-10.39.ebuild 2679 BLAKE2B 0c7717f0ff0bcd5d4d0275b18bad23127de544c72672f71e6c2569f23b3b7b2fb4d4eb3e2bce58d6e3bc2dc68f5dd703588707c3c1c572bdd7a857122ca989ff SHA512 1fdcfebcf4c6dfdfc144994d17a91e0962a9acac95d81bd0f91de81bcd39a2fab42be985c2932283685373650463e7f63ac6e73afc7952e6a793acc099b2dd57
+EBUILD libpcre2-10.39.ebuild 2671 BLAKE2B f6266b4c83947619753e726a9702cff5759d4be298da824e2e62a64876c87601121616c34a61bfd19b6358c19d9206e91375604e80443ba6acadda92e7a48e92 SHA512 d9c4c04fa459b76945114e640f3153fad2b5de02d21260927328fcb6856c8ad50c62df7e5ecfeee593a2c18c18e4d7402d5d360c7d681375671cd9ebd0cf94df
 MISC metadata.xml 1236 BLAKE2B 4a7361d870b4cbbdf16cec3dabd66e5f161b5c9dc17c4db1972e99ed739f2f17dbbdea2b9828991137e7cf8db93c87ceb4b2b8b617174979d0a6d6d827e0537b SHA512 57d2fd0a8b3d98dd2d1d40cf4934bf1202c812b9c2a44802a6ca2960e174dc71471ef9fb5f1baed48432ca956a6572f4313fbec5e83f4557f9634e78f2f2a465
diff --git a/dev-libs/libpcre2/libpcre2-10.39.ebuild b/dev-libs/libpcre2/libpcre2-10.39.ebuild
index a83eed244899..f1fc7f74e85a 100644
--- a/dev-libs/libpcre2/libpcre2-10.39.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.39.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libphonenumber/Manifest b/dev-libs/libphonenumber/Manifest
index 2c773467ee92..1b89c9772313 100644
--- a/dev-libs/libphonenumber/Manifest
+++ b/dev-libs/libphonenumber/Manifest
@@ -1,5 +1,7 @@
 AUX libphonenumber-8.12.37-cmake.patch 1963 BLAKE2B 4ca131a59bb4a5558b01eb1428cf9be4e8c006c85235800f09689960c7c489a4da52d044eb0b11b40172bc37382545f46872f35571b0f349a9749ce21237da64 SHA512 feb365105ad3aa6437b495e0ea86d8050bed06444adb6ce79628186f3d8a5cc67f496b1a73ee8bee049d12e6e108921d76cdfd2d0d1a9095b4d5bc0acf5d2deb
 AUX libphonenumber-8.12.37-testing.patch 3349 BLAKE2B 1c96a9efd1919c04ed86ad63713e89ea8a6a21139faaa0b4cff406f0d168c57b981b0af1aedf54e54ed753cfa1c8ea815e78fde86c578c9151bdb5d98e6b4ad2 SHA512 00ed243396507f1d7448faed83f82009de7be1418b499f560b0961ea9796bfe7285d9c04c43dc5f3cd8baa90314a487e377f4fba571c5b492e065a97056ce375
 DIST libphonenumber-8.12.37.tar.gz 11005274 BLAKE2B 2bcffe898ca7aa667a35e9a7340a54f880cdb9f290e807e9ff7f6ee778df83dd80023703595781a97355a43a8096bdc957a7f79336b5bf9d892ada26e35ae025 SHA512 420ea841679c1ff420289b3fea0bb6d86d4d1e99525fce00cc90025c8ade99e56e2dcbb7fca64190437ff0a889cdc7373f182e7699db20a072c32e984b8dff33
-EBUILD libphonenumber-8.12.37.ebuild 1138 BLAKE2B 4e251ed825d964f9a10ae6dde8cdf7060f94e84363d18d4e077e5fe2b888a1c730358a3c992ca9170d198d8e37d8f273b287205044428e08515ead53cd0dc85c SHA512 9ab9079d4ebe31ba07aeaef1c082450c500ef84437955f119f2e15091ea03dfa24c881319b9b7ffd690bc8b9428139bfffbdf3ffeaa4a8e289376511015376d6
+DIST libphonenumber-8.12.39.tar.gz 11007180 BLAKE2B 27a47b35497772740da04cb9b79e1a6b4fd6f9b0d4a89768e1ba9212672f1a0fd06c5837aa8858a4680b5c47ef16721c6ef145d8d2cd77dccbe27bb4b0897dcf SHA512 82570c60b132022a713c0664de2c29997cff0ab8c3ab97dbec0f8d1cd1782090ba92ca7d2f044760f523c986660f13b70aacf8a9c247a3b80eb19d35227bc2a8
+EBUILD libphonenumber-8.12.37.ebuild 1149 BLAKE2B 1482c372b5d7ab343ed4f1f78765d64a38538c94281872dcaa14a009187f654e6a92204d53d95179cf0d8c16b88483e7da5f034f57faee72e6a5ed7c536fcbbf SHA512 3b656755e55d20494ce8d86255b0bfe78e8300194a29e34852902a9534564fc9eb528840bf9603cecc704318cdbf2483f4ddbc32b2d4622515971d9820a72468
+EBUILD libphonenumber-8.12.39.ebuild 1170 BLAKE2B 8f5f3fde899d58c7a56a594605045382de984e8321f1e7820f74fb0d372c23827ba8c5acf0014ecfab7fa76c4265d575a09df1dad72e18505b2955da83c5e210 SHA512 b554925d81bb4b99ab08a5687916672f522f63c84195b404dac063899e943e47a965fda1f0fc1003d07371868ba0a1000eccdb6cf9d18fdb2f5617eb6579eb1c
 MISC metadata.xml 417 BLAKE2B 95de59ae08b1ea02b4e31e2db29ed6e17040d243c0254ae64eaa0c1a4195244063714ebe9f29e0979a9f6be728eecdf47f8bfac77f674128fc37f52eaf8c8896 SHA512 6fc39161d18efec9984fac508c586a579d93ae12a3cd3d4671630af04d8c86db1b86a5f43ac421fa7c0a4b38f7e333676fc36c8066fe08ebe2a92e56f1acb882
diff --git a/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild b/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
index ca29ba7d46e6..f613d7a4ab4b 100644
--- a/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
+++ b/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
@@ -13,7 +13,7 @@ CMAKE_USE_DIR="${WORKDIR}"/${P}/cpp
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 
 RESTRICT="test !test? ( test )"
diff --git a/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild b/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild
new file mode 100644
index 000000000000..7b2495ee4158
--- /dev/null
+++ b/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake" # broken w/ ninja
+inherit cmake
+
+DESCRIPTION="Library for parsing, formatting, and validating international phone numbers"
+HOMEPAGE="https://github.com/google/libphonenumber"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+CMAKE_USE_DIR="${WORKDIR}"/${P}/cpp
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="test !test? ( test )"
+
+DEPEND="
+	dev-libs/icu:=
+	dev-libs/protobuf:=
+	dev-libs/boost:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	# it is either this, or disable BUILD_GEOCODER
+	# https://github.com/google/libphonenumber/pull/2556
+	"${FILESDIR}"/${PN}-8.12.37-cmake.patch
+	# see also https://github.com/google/libphonenumber/pull/2459
+	# using a stripped-down patch w/ BUILD_TESTING
+	"${FILESDIR}"/${PN}-8.12.37-testing.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIB=OFF
+		-DBUILD_TESTING=$(usex test)
+		-DREGENERATE_METADATA=OFF # avoid JRE dependency
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 7bb1f9f1713f..41cfba942fd4 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,5 +1,5 @@
 DIST libpipeline-1.5.3.tar.gz 994663 BLAKE2B 57365ac07d1b61462eaea3be0ae1136f8511ea54484b1fcbe734796da760ced062a43cfb13b69eb24b521448253e603c248c59306f3fb3d871641a17530dcf82 SHA512 db0796bffbcdd8e875902385c7cdc140e3e0e045b3d0eba1017e55b4c66027c20cc2cd0fccaf52f59fa941d0925134011317b9c27986765a1ec2a73132ebaec6
 DIST libpipeline-1.5.4.tar.gz 1040952 BLAKE2B 1e8fa839df90d61add79c704856d606599800f1887e056430f0fb0bd61e511c2a0bb98f2f3766f793aa648b404dfc054277d740ee5dd8a27bec740e7a23e0d13 SHA512 98d630553843176c9f6723e4df1fd844df2e71c402ef869027fb5ebe327eb9d55605a11cc159725f191ff3ef2a3a0b5eeff2d3cb1146b0fef5970923b01e433d
 EBUILD libpipeline-1.5.3.ebuild 718 BLAKE2B 94a758c2901b0f9eed957679cbeb2d57e9b12c6e99c6f2ac32ae2a4a52b492780e210ef9ff4300ac43a8d077b54ea840236aec8dcc9e925a175f38aab892604c SHA512 6549cc511528332a602e48e7469a878cd6352c54ebcb562cb848395ec1b7990b9b1779d8eb260d2c3714bf92ff229e25ad95f1b722937732640c2f42cf77f5ad
-EBUILD libpipeline-1.5.4.ebuild 700 BLAKE2B 62f5f9f7178edfcfbdfe4cfc7078ea0ec2ee031643921c82d62d3be51e771d0339409f703b63efeb236a4e3bf05cd60739399c1cb59f32bf68564f196a3221c8 SHA512 25bbdf0f07dd6856f1c66b6ce918dcd38a650fc3eafd60a74af99455866d8dc6a3a3697bcf7d158fa3d66abe5ee88e2a84f50f4e22fd64728e59ddb74cf1a3ae
+EBUILD libpipeline-1.5.4.ebuild 692 BLAKE2B d51a87036526d3aafd54d2e3319bc993d1a4ce2e3d947f7d44243a9e15cb7b85fd883c89ecce15c38c90ba6acbc5e1ab9c4d24575be40f231b34b7784362f79c SHA512 850349bce4001ec72a32af456f34e24a8a7ea30ddf5e3f9b02a397d0b035356fd91999874376238c6e3f67bb05d8914492338c97d703aece5895dbe5267a1979
 MISC metadata.xml 343 BLAKE2B 4632f82a8ffc94214282c093d731958c3f41439d1c8448ae6ab36713a3431299fa028bca9f95849e856de529a3220f18467f9454aa0feb894d49e366fee479b2 SHA512 151480a72adb05e78fa0be5e4dd3ccab73dd056135f3264f7916affac51d00af84803040b780805cda665a4d02c47dcdbe1790ea8a555653c7c8f38f6c988f29
diff --git a/dev-libs/libpipeline/libpipeline-1.5.4.ebuild b/dev-libs/libpipeline/libpipeline-1.5.4.ebuild
index a1a87e2693c3..e9c99781565b 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.4.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libptytty/Manifest b/dev-libs/libptytty/Manifest
index 725214bed41d..60a73f7371ac 100644
--- a/dev-libs/libptytty/Manifest
+++ b/dev-libs/libptytty/Manifest
@@ -1,4 +1,4 @@
 AUX libptytty-2.0-rundir.patch 183 BLAKE2B 51316869ccd9b490b3087ac1a825d7a7e570a79fe7e5758e76be756b8135a0af2b4a518baefd19f8c0e8f71b95488035f28b6bab9b42eae473f644ca2f8bff83 SHA512 266fd3df8aa88894f832ecff15e88e4f08cc2b188ce585a779b58d19bcdac83b8e7ea921cd96226ea74c402a4e7fc873a7764029af72a81c5ddea7efd307eb51
 DIST libptytty-2.0.tar.gz 45673 BLAKE2B 81112267157c1ba785052b2e1667c4af251991816005375d44efd1c4d9c58cc5e59324df35e556d45e46df6bceccc654d71e6c264dae5a15ea100cc9db63c5a6 SHA512 9cca5fddbcc4025c2bbe043e3367ac902d0024a34301258dafcf0de70935c055279d88227168d112d0e4c0dc37f1f49e1ea587bd6bddf0b9d92400657bc7be08
-EBUILD libptytty-2.0.ebuild 500 BLAKE2B fd3ae2dd4821f3fd63ef5bed143d7aff4cd74e3dfe476b42f0d9446b04895791897312d2b06b75b190878a099e3794f83f559ecee655f553e1dc57238cbfb1a6 SHA512 bf846e5df6c177a3dcbb55a927805f9b83334cbe26ee144a68ca591a938a922d0763cf3a98f7888cc2a6b79acc402f5920fffd5e3c5c98d2d9fbc7a815cd1a89
+EBUILD libptytty-2.0.ebuild 736 BLAKE2B 007d175ab6a65b04a255b8c6733c10f442ae95318a4a527ca603d82c1ffd47bb765cdbbdb5b742a97ea4f6b4a7e5c58b1afcd3725ab407daa2c5859091db8ee7 SHA512 35b6f0029db9c31bae98982bfd17168db18a1315ccfbcfd96c4d27ee299f528d0852b47f13bfcb2382e1bf7e321626e3e8d460bef3dc505c2d93f5fdc7591828
 MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/dev-libs/libptytty/libptytty-2.0.ebuild b/dev-libs/libptytty/libptytty-2.0.ebuild
index 5494e30f17a7..69ee5277a255 100644
--- a/dev-libs/libptytty/libptytty-2.0.ebuild
+++ b/dev-libs/libptytty/libptytty-2.0.ebuild
@@ -12,9 +12,23 @@ SRC_URI="http://dist.schmorp.de/${PN}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="elibc_musl"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0-rundir.patch
 )
 
 DOCS=( Changes README )
+
+src_configure() {
+	# Bug #828923
+	local mycmakeargs=()
+	if use elibc_musl; then
+		mycmakeargs+=(
+			-DPT_LASTLOGX_FILE="\"/dev/null/lastlogx\""
+			-DPT_WTMPX_FILE="\"/dev/null/wtmpx\""
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index aebbd1820a79..da970bb939ce 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,7 +1,3 @@
-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 660 BLAKE2B 59fe8a6915bc4cdd090a6c4546844876f32b8394c1563d48aa8d0e173b904f3757dce83736c34b864a8dd17c695b4663e9e9c1b9d9318364473fc63b12dae303 SHA512 d8d96f2ae6a60ddcc8eabc5e4bea2092fce5298341741d95227ea6aa590b72bad11b20ce2efd31a162269eb90e172d6644b73ca8c3341670f4244d0166fec915
-EBUILD libretls-3.4.1.ebuild 669 BLAKE2B 4e6fb3eda557ffa19559af80e4887693b513202db8f67a61f47618a5d17580fc4502234fc921cb3c627555c640694a90bbd3551e3126614db14f7975d3f505ba SHA512 4710c7fa4fd92e09bfa17757084476e0f8550fcc11a6276d22ee694a479acd27fed20d4109b753a758b6ca35b4b56f8d4026a0e19789d56f1308b50550281d86
+EBUILD libretls-3.4.1.ebuild 663 BLAKE2B aae0f351b3aa8bed9e12226fd7f323e2c58771d750e424c2caaf2cba0fd98559224e75ce84738a5c89301bf37c5a934dbbeac981cbff2188a7cbc2c4fca66893 SHA512 abb227cda09a245991959d7015bce467eac2b2ba0eb5a7f55c9ed7f40abbbeff2d3e45708233fb73742dadbda507c0c2a4c605d2b0e26ff6ea645353444c32ed
 MISC metadata.xml 361 BLAKE2B 9f05ddd1ac3e1a634962c9c800c3bdf60554488c61dff9b215866b24e0b2472d7c0873f0fd6bacec2abbab0e79faca728a4b22e34633c3dde64995b05b86db61 SHA512 c7b186da31da21b4ad5c5662325cb2757e3ee8d7cfd84d75a49b07aebd4dc882cb9b0e16ffce99a8ae2409a53dd750dfb5ec6eff0f9da9f4afee013f102ef688
diff --git a/dev-libs/libretls/libretls-3.3.3.ebuild b/dev-libs/libretls/libretls-3.3.3.ebuild
deleted file mode 100644
index abfa537f5063..000000000000
--- a/dev-libs/libretls/libretls-3.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libretls/libretls-3.3.4.ebuild b/dev-libs/libretls/libretls-3.3.4.ebuild
deleted file mode 100644
index 6ffcd1305e5b..000000000000
--- a/dev-libs/libretls/libretls-3.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
-HOMEPAGE="https://git.causal.agency/libretls/about/"
-SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libretls/libretls-3.4.1.ebuild b/dev-libs/libretls/libretls-3.4.1.ebuild
index 8ee6adc2c9a0..c3548f72f880 100644
--- a/dev-libs/libretls/libretls-3.4.1.ebuild
+++ b/dev-libs/libretls/libretls-3.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libserialport/Manifest b/dev-libs/libserialport/Manifest
index 1e493bacc301..4b7c64007ad8 100644
--- a/dev-libs/libserialport/Manifest
+++ b/dev-libs/libserialport/Manifest
@@ -1,6 +1,5 @@
 AUX libserialport-0.1.1-kernel-termiox.patch 1216 BLAKE2B bbb629086c2e21caf683df74d63abd4c706ac05a4906d8322d369ca491ad2421416ca6abb579ca8c2eff7f862557338ab9bd31bf0954d8b564b2c06c1fad4810 SHA512 12b99310a2072e9a3a5df61cc2b2121e9b7823caebd88d22a344a885ff777ad955787303b6148e0b803a605877136f357ce211dcfeeae4938538d146f679d992
 DIST libserialport-0.1.1.tar.gz 405251 BLAKE2B bc52d7b5303c123a28becde1e77451a921c2b6d5284ccfaca298d0535a793297d30e297109382a7266263530ac9a0e0b598ce8d1602e0700b43bda227f29a6b3 SHA512 7d379d1099173841e6d4df04c8c12dc6a4ebdfa0323ef35da6f3dea20db55d4f6ad81c1f6679f5aac7fe83270176428a817daa8627c336505335a07e06350a85
-EBUILD libserialport-0.1.1-r1.ebuild 892 BLAKE2B cdf1d4fcc07990a2f5b2fb1f8aaefcea72a347dc62ab484e71dac1bb018ce276959e206f1b59c33c700ab87922ab8ae9b994db10e05e0cf0adc086b5d2491aeb SHA512 f34026d0532feeadb441b4e2e0051c2313d73e95bd8fda9f411df364f0a84ed16132c8b1b612d4283938dbe10207669ccc4e445b17d18ea3630397d67b151081
-EBUILD libserialport-0.1.1.ebuild 692 BLAKE2B 106bdff476945cefbbc9162856b0af9747dda3a3b3865754756f7e4ade3aaa3b79460aeaa628ca79e65e6584f093003ea40d153cc891a86ad75cbb25ca17d154 SHA512 dfbef0d6b5a7e303594c9b07298011c2b85ec66e703f9cedcec9eaf161a02d5392ff1dcea3f9289e270650d642316c39cca81e7b027e1ec18f14a3ee9760e4e7
+EBUILD libserialport-0.1.1-r1.ebuild 890 BLAKE2B 1d840dca265152832df93f750feb326cff15f4764a03a83cecdc3c91e40a82c90f0edf2e1a60644075cd032e958faa25b0ec99a0fbc193e5fb5ef5d2c23f2e37 SHA512 713b656a8480512914a98feed7a079cb41ba74922bf4ba0eb5292daa10145f7f62e96c4222f60131982117aab0cce682eb5e302118b3682a1767d33bc907f035
 EBUILD libserialport-9999.ebuild 694 BLAKE2B 9671aab0c1051e374eee35100e207bf27b013e55bcc6085594d4532d474b6455b3c4bf0c575daff46d0e76aa649c9685bc254a971760f71c534b3c2aaec9c997 SHA512 32f60eaa716ea29efc044c78793a4ac34fd1dc2d2943325abb964315d5721151abefd53123028ac5d19b91fe5e4445208a160e8f5ea14681077ff9052563844d
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
index a06498d3dbfc..d842c152ec46 100644
--- a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
+++ b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Cross platform serial port access library"
diff --git a/dev-libs/libserialport/libserialport-0.1.1.ebuild b/dev-libs/libserialport/libserialport-0.1.1.ebuild
deleted file mode 100644
index b6824186f222..000000000000
--- a/dev-libs/libserialport/libserialport-0.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit autotools git-r3
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Cross platform serial port access library"
-HOMEPAGE="https://sigrok.org/wiki/Libserialport"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="static-libs"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index f8129c2ab74f..a5d6a41aee33 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -5,7 +5,7 @@ DIST libsodium-1.0.18_p20210421.tar.gz 1855069 BLAKE2B f9b5843998b0045f97a303589
 DIST libsodium-1.0.18_p20210421.tar.gz.minisig 311 BLAKE2B 12d00384a2acd9c9ac5cfc2ce984c2254a69be93f9cb891513c2f575fbc0cd2c03c2f323aa4b363f54fd7e1bf6b73887c0919e919142f759f0f7baa8680cdba5 SHA512 80fe3a5d41a5550b310e1fce86eed142288c70bab46c761a21206cd0c441b9355d455df49916b3eca134af60444307baa8c5566f1ea369e79f7326a6fac822bf
 DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a04719d708c217bc6f0b344f08d566bde85c4f758862c0ad61924346eac508542c2d9c6313cb1e3e421743e424f396dd1972e8195 SHA512 d7cd64101fed11ce33c4865dec253f1058acab376c3a6097422508087f4449b2f7fd1b38835915843106f620bf86694d846695e0c8a35f921e4f190dea3164bc
 DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be
-EBUILD libsodium-1.0.18.ebuild 1564 BLAKE2B e38d0a2158c560d894579950aeb7f1deca649cc4edc8c1a7ba492e43b0cbab2a9d210f5610c657d75ffcfc1e7dcfd474b3350a9e5371f335bf6a2c59330509d3 SHA512 8aecc81582b1e2776b53483ce37db0a5a98f46aa29de8c1421e861db69513fc0df89fd82ca0fb647b9463871e923044915177ed1d24832e03613ff58e5e63a12
+EBUILD libsodium-1.0.18.ebuild 1563 BLAKE2B 436396cc79b476ac4ae42efcb9f5d41edde6544a57062b7ae11bc0a3796194a92ba0e463ae51219641cb3e599b38c300c1837c3215a79fbcb856fff8100e7e93 SHA512 0f0474831c5f0a315562e992942dc7c62e5527fbcdd760a60c1c8419e1a083cdde0faf6082fb9a519411de7c372e75eb5233830d61d99a5986be3c20ddb594cb
 EBUILD libsodium-1.0.18_p20210421.ebuild 2620 BLAKE2B cfb32d50a4e9eb20e91971833a7541afbbc9e5dcde8f9b9da4a02053e89c5494ffec5560dd4a66571d44b4b697cb14cf883548652c8bf88efa5d1bfdf3912296 SHA512 107a9f9a0c8a5e43f4bde75c4bf7666466b459c90b8813dcb11cffd27bf9c6aafe9a8d27466f52b4dc36202f0148728c2a235624956abaaa2caa6c7cf2350485
 EBUILD libsodium-1.0.18_p20210617.ebuild 2512 BLAKE2B 352e01126528e036183083772b839ee4aead323e6ce2e1ec5a1b2271a06bad004168a07c2e2c7336cc95861e81ddf13b234be4d46ec036619dcf6d722ce82306 SHA512 9de6f693ae17860b086cf01d50c4daded55442ee3fc5bb5dea247a4375ec26f44118e84b92a917c91f4be1023a30750c5dcf6b401fab1e85b7aad8d65ff58d94
 MISC metadata.xml 865 BLAKE2B 04e3718818b19a548afdb2b479d9c24c1b66fb117e91c417ea856cb8bc362634ac717e47dee33de2e626315e8a1c961acd3ef45cde8bbaeadfda5360fcfadc24 SHA512 75aa772e03a2b6579be1a650953766ae4ef06b1a98bc2cc1d79fecbfd0a1b3334b1762605aed7b6f859066d8f63f96ec76e233410a96f45b370519099f635483
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
index e7131e1f44ee..3fa3a86d9302 100644
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -16,7 +16,7 @@ SLOT="0/23"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-jedisct1 )"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jedisct1 )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 90bce6af85a9..811df957b42e 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,5 +1,3 @@
-DIST libthreadar-1.3.2.tar.gz 442260 BLAKE2B 2a743fbcd8ae0b462910b7ccde34a3fcb90239df9bf608c9d249dd9bf100315ade3b2151339ae55b1121709446c23044c3fd7bb420efb009ae8d5fe0a21a496a SHA512 6edc3a1a6eb41a3b9ada35327d712fcf3562875dbddd0bd2f3f016492cb0f10fe669ed1ac3a65573d88261b4de50201b2abe8dcbffa0abc5cc257d7a8c3c4df2
 DIST libthreadar-1.3.5.tar.gz 443192 BLAKE2B d8e06c7b58636b51bd2ffd50f51a8a024780e4955693a28085296ccffeef8ad2866ac12e53b3c78b37a650c4b1c54b5fa8dcbacd1002577cdd7b30eccee2ef69 SHA512 c4c34036a7882d1ecdbc025e0d927b6712fb067aaeee8bae5bc740a5259c5f49d651a8ad6323ddf6cdf13fd2e5e7c396f9c134ef3447b3743ae8e64abd646850
-EBUILD libthreadar-1.3.2.ebuild 912 BLAKE2B 48391b40e27a540218552b5abd895476a1bdba0aec771bd6385f56ae90ce5bb97f0971a11bf4133f4e16072dd8faf83e3404a384cd77ad144074b1853f8bcab1 SHA512 e383c7048c93936ef171bd945fa658350a81aac641a00fefc06b13cafd5bfa48ec0b2c3e20ea035e858c1772ceb7fb27425150a55fef2d60256c2591c2faef98
-EBUILD libthreadar-1.3.5.ebuild 491 BLAKE2B 0576688a8965d61d116eb33040a6eadb27d47df3531a2e8c6209f0cd7c6faba1cdb3a5dda767a44b57087b5d05a0ac682abf7cab526d4100ca719418b4a25210 SHA512 715d4b6daa599ee8f55b232a7a90cc336d79ac26fb04360acae3ce1b0b19fc0c49299341eeedd0f7772090a609a5fea5043fe1b06132c80911d660304d9271f6
+EBUILD libthreadar-1.3.5.ebuild 487 BLAKE2B 82d3fabecec2c763e21f2296315270c01d554b47540afc6780cc47e336e2716a9d3495aa7aaf91a5adad33147a03465ea6930c4deb1cdee6f7222fbb6dc01afb SHA512 15584e850b6870de765c9598f175fb346ab55301c51e1d7fb3d92bd744e86ac3fe0bf26beb66f9a6b0a7b192692a6bff0fa795cf20167b84009279c3ca1bada9
 MISC metadata.xml 890 BLAKE2B aaf5d415466806037fcc87f048d8ebecc04d3c04613e828a3783e194f265bd25938d98e1f83d778c0e970e458115654faa87826af0e1af58f02a5cc1660df08c SHA512 7bf58461d45c6c9e00e3987aa7d66202cab8382fc84e775c17c59158404bdd5d179975d0afdf383ed654e34105820fcf2a83436716eea11c3f808a746d7291dd
diff --git a/dev-libs/libthreadar/libthreadar-1.3.2.ebuild b/dev-libs/libthreadar/libthreadar-1.3.2.ebuild
deleted file mode 100644
index f176144e28dd..000000000000
--- a/dev-libs/libthreadar/libthreadar-1.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-src_configure() {
-	# Copy this comment from app-backup/dar as it applies here too
-	#
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-
-	econf --disable-static
-}
-
-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/libthreadar/libthreadar-1.3.5.ebuild b/dev-libs/libthreadar/libthreadar-1.3.5.ebuild
index 56f7aff09459..36a691d5afa0 100644
--- a/dev-libs/libthreadar/libthreadar-1.3.5.ebuild
+++ b/dev-libs/libthreadar/libthreadar-1.3.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 src_install() {
 	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
diff --git a/dev-libs/libvarlink/Manifest b/dev-libs/libvarlink/Manifest
index 44323f9e9c2d..49df42723198 100644
--- a/dev-libs/libvarlink/Manifest
+++ b/dev-libs/libvarlink/Manifest
@@ -1,3 +1,5 @@
 DIST libvarlink-22.tar.gz 80867 BLAKE2B 4b538846219d21dce92f8b49548b24c6efa72e31fc78ce09e5bb8f76bfddc2c05479bc5b84981042315fae154c2884c9956fb651812ec257bc4a2b0fc0e70021 SHA512 edb6aab02df775b872621f59bb98e8567b74ec4e1311ad5195f87529e7070fbfb6a92e1580b0433efcd7512d5f47f55ed91a406a3fb51f61c8d6feb263367fa0
+DIST libvarlink-23.tar.gz 81048 BLAKE2B bb3410eaef0bbdfa5010a1f643ce0f54564133070245fb1101655698b1d1186ae822cbf6ffa29201104477023db2b91ee5320f0cfa128d95d39b3af6e297c051 SHA512 b118ec9142ee73fe8fd53d5439f19a29013157a339da5bdcbfad2892d450486a1d8200b23101a5ffe15c80f78c90c6d4ce3bc605074bfdee15de8775b1135b5b
 EBUILD libvarlink-22.ebuild 439 BLAKE2B 404caf68b22ba3b05a68e4c0171b00569fca8b9ea4167a75e3abf1760bbd53cd32bc8db77cc2cdd6a0e15129d18e132bf34740f33a2b5641a1ec8265694ac7cd SHA512 ad31df379c1bff093ddffdb8c2ed045ba21da935e89263ac0e587a5a9c80eb45c6b3b99eb21b80fe34e962db8a3c05eef598354340acdcc8cdcc5f0e5545e359
+EBUILD libvarlink-23.ebuild 439 BLAKE2B 404caf68b22ba3b05a68e4c0171b00569fca8b9ea4167a75e3abf1760bbd53cd32bc8db77cc2cdd6a0e15129d18e132bf34740f33a2b5641a1ec8265694ac7cd SHA512 ad31df379c1bff093ddffdb8c2ed045ba21da935e89263ac0e587a5a9c80eb45c6b3b99eb21b80fe34e962db8a3c05eef598354340acdcc8cdcc5f0e5545e359
 MISC metadata.xml 328 BLAKE2B 42775f0eb790f17bd598085e9e6afe34b48f53ec57ff8f9541a45d0f1bd7096943ee42b38396edc1a5521d9cfb5d8f04d26aa0c6d0cc985033063e9ea55841dd SHA512 d2da3af9a630d2d0f4c070b6076033986c494bda8696c98aa118721aaf9adcd4e9f500d407ca545946ac012f2b7fd02d8455081a5ffbfadeea0b028bab3c238e
diff --git a/dev-libs/libvarlink/libvarlink-23.ebuild b/dev-libs/libvarlink/libvarlink-23.ebuild
new file mode 100644
index 000000000000..03eb294c694d
--- /dev/null
+++ b/dev-libs/libvarlink/libvarlink-23.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="C implementation of the Varlink protocol and command line tool"
+HOMEPAGE="https://github.com/varlink/libvarlink"
+SRC_URI="https://github.com/varlink/libvarlink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT+=" test"
+
+BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index e45a8f8ddf49..8d022ee152f7 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,5 +1,5 @@
 AUX libvoikko-4.3-disable-wall-werror.patch 1227 BLAKE2B 6c943d0a77465c176109d790e650044227a82b386d43494e0ea19426fa985d732cfd3e3a9ef309c2de38da6693f813c3f87eef58c72ab809ee8f8d6e70396ebf SHA512 40c95ba1c78e854ef97bcecc3b98f16089d5f26c70051a8022a782338c704428cac0f08e87b7b4db495d78245cf191ed0a00406963da77d515c56f1a1fad5d5a
 DIST libvoikko-4.3.1.tar.gz 658079 BLAKE2B 4f52789b5d62991333ba9b979259a631ef2989bc70358b398a4281d56765046209657fd3e41afd47ee7ba1dbafeeb4a34ffd007e55037bca9958fb813e4b7202 SHA512 6677fac7c0cba1289dda23b0c0a4bbe44480ce747189d40634ac57811728c1942a795efd50270e933373fabab9c54e82a8f9fde06d936442820e3f8019574f08
 DIST libvoikko-4.3.1.tar.gz.asc 833 BLAKE2B 4a69ae75da1973e383ab21cb557352be1344dc6e34fef13e28616fbd9e0003b93ef5e3488f1e776eb476a750980281463ee144edc5849ec7e3159badc160ceb7 SHA512 04a5e8899679e1503ec0d378903b8ff17e8065aa105ba61559b584eb4cde2a5a9b622fd39bd0126bb87915c7dcbac8495e874c3cdabf25232b1ae41491275ba0
-EBUILD libvoikko-4.3.1.ebuild 1252 BLAKE2B e33c71dabb256ba92e6fc0b8a29edd70d048e930277fedf64a7e75316aff51d15f740624d84dd28c16b52596f9c20be3679d0d04cdf353a3b0063c6184246d69 SHA512 fe25dc955192ae53ceb6bb233554f17081652a6c65cdce8c2b9e2e0bfdaa071e7c45cdcf8e03f15627c3964fca653e1e444ae96613a647d987bda916bb342c5c
+EBUILD libvoikko-4.3.1.ebuild 1251 BLAKE2B a508aa47e0fb1e33dc78e4e410b15929249f15e98ed1b051485d8b858e9c51478cc77f094e5de925aef16d77956ae1e0a436e8d4b75c25ce5ae6cf49b75a1af8 SHA512 89145d053a946a97bc6143a0db7c4a0fa685a94a15a312df94970485f75a5e15faffffc183c577fe92ab8b047b4817477c78cfe3b716f4d1aa0d3175bc241ad1
 MISC metadata.xml 420 BLAKE2B 50da044696bd5ea088e340526e669db93321664f40298db2ada11ff15bcdd5a4cea5f7398ea65e8cea86ea484b86c8eb11751c05ad16957c4cd3baba521f274b SHA512 546cc02a57222c8b172130d127eaf0a24869be6138a6834f34e761f40a29636c1acf8697a377208cecf5f3183f186ec267ceddec69bc1fb3229acae48ac22a87
diff --git a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
index 97c542ea96f4..97d1bc96ddeb 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild
@@ -25,7 +25,7 @@ RESTRICT="test"
 DEPEND="${PYTHON_DEPS}
 	hfst? ( >=dev-util/hfstospell-0.5.0 )"
 RDEPEND="${DEPEND}"
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-voikko )"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-voikko )"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
 
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 8340bb503fd5..72e435ea05e4 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,5 @@
 DIST libwacom-1.11.tar.bz2 519285 BLAKE2B fb26190d752316b5d25659d2ae76681bfff1803463360aa138eab91ed7d7ef2d04dfb6bdd4f8c2effc45a495ef3afc312a817d4fd41cd8167172cafd9f5cee9f SHA512 24e8183502dd2b928d53b3d26d8479210e855c94c225649d63ac33062a30615654ff0ab8666a25503fb3253125539cd845ca467fb228a01c608dc3adbbec73b5
 DIST libwacom-1.12.tar.bz2 543819 BLAKE2B fdbfba23d7b1e047757b0c0ff698a484cadc91c199459e1da49bfd5a5406aeb62d2ca43856f7d8363c3f36c7c05f4d3160e8fb576c3d18f085144dec259d49c5 SHA512 4e0084eda01e78f52336f3f1f1ea3ea86cb9c5fdd6d6c0316662405ebe2a328d6837f8db855e58f5fa95a640a5d456a081a7de339a372bf851bc0d5c69530379
 EBUILD libwacom-1.11.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
-EBUILD libwacom-1.12.ebuild 1367 BLAKE2B 952152d17625523859607ef17eeaabe11f946a56271b2602160ae304417af250d54517c14bd4b1f30eaae490b6852f00038fca28a5f77400c810c4466d32c3b8 SHA512 a16aee39b8cbe77fafbfb30dbec6b0ee66ef799b364c563cf5dd4a2459662aad0eeb16617809a7050bb3c07716a6aa3e241675fcd2eed9fc53d50b22ac82b3ff
+EBUILD libwacom-1.12.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
 MISC metadata.xml 309 BLAKE2B 707d30ff0df4fef9c458c658c8d8ae763cc48ded42b7acba94098236fb56bfa486e8be61974113c6234c1831d08939c0c94d65d17abd2bc7a5e092fdcdef2888 SHA512 49b894496ae441153607ef14034c0df9ce6c9582e788cd55afd414a2f8189f1828da1b056142d258f7edb38e8a6ec023994b1d00734010b65ad7b50c2a108837
diff --git a/dev-libs/libwacom/libwacom-1.12.ebuild b/dev-libs/libwacom/libwacom-1.12.ebuild
index de40b8c9ca0d..acfda32d8405 100644
--- a/dev-libs/libwacom/libwacom-1.12.ebuild
+++ b/dev-libs/libwacom/libwacom-1.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index c745be221656..b4a42ea4dabb 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -4,5 +4,5 @@ DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.12-r5.ebuild 7435 BLAKE2B 3f1b64a9984c15dfb8b66453c3bcb0301e528790387dd6327f6fee9c746539b2e4a6feaae5e241b4e88b9578fd6602a5e662c37aa9f3581a13585b7b1cfe9f5c SHA512 231e9b36eb698e02822eb02dabafece8dd402648af4684c50e71c88b806f7ff1a6fd5c6ecdda9c8b567ffdc02c8516528b9d17b5c68e24ab14c6dc5eaa7e82e1
+EBUILD libxml2-2.9.12-r5.ebuild 7434 BLAKE2B d103ffcb4e2eb6f3e6cc1e57be90fb18e2bac3b4eda91c1a444eb82b208f5a2767f70f17f319ddd6c0419be68c32bb68de78a899f7c0bc81a108790ef4752e5f SHA512 cccea99b6dd67b9e4b785836ab33023e423616842a910db486e66440caa408ce80f3a18fa3bdecf5a6b45a504e384d162196a41e003d393ff4acb68ac011ba69
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
index 7fc0cfe3b050..7dd8d6761000 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 BDEPEND="
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
-	verify-sig? ( app-crypt/openpgp-keys-danielveillard )
+	verify-sig? ( sec-keys/openpgp-keys-danielveillard )
 "
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 20d0ef11017b..945bfaa6f896 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,9 +1,7 @@
 DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
-DIST libxmlb-0.3.3.tar.gz 116107 BLAKE2B 604228a997618b0a3fc25a652f30c1761bc95649246310354c8ca76b6b189799ba8fa38a21244e354d42d6c0f1fd1640e71ccc7ff48429d3425ae43787cf4648 SHA512 4d06e7a7d4bf2e7d36713134b95a6d78e79f014e4b0b511ec9b11086e7287f9f5a42496c4bce35ecae68de1333d7e14b9d041b71c9a081267452178dd2405e16
-DIST libxmlb-0.3.4.tar.gz 118304 BLAKE2B e66d6ca72b2e2b568a2775ee44f4eba0c620b50515bb809ab585f488811e5760a61a79a77535c4f3e5ade029687443b4c780abb5eaa29cc044610e2bfe33eb87 SHA512 91ea55fc35e71a6e8c4ec2a07d19d6da27d3a40ac3958285bb15ad6b05a12d944d15f1987d5e8557c8ec1c28b753c1b267670a8e73790e0003ef4d990d617e75
 DIST libxmlb-0.3.5.tar.gz 118335 BLAKE2B bc644ec810d8cfc8db4da5fd9eef0f97eb02efc4d634bb414e0404984ca7fc35be04dd2041dc4661d63515789a65217ae5ba60e8eb8dfc2d117beca73a69cf43 SHA512 2da4fbb0942a5b42c81bdf49926822b75b5a4b497a7f1c0c704b8ff4c249adeb85d22568a28b68b57a66e0019c13e129fd14d517ad49c7dbead4cd39ee790be3
+DIST libxmlb-0.3.6.tar.gz 118521 BLAKE2B ba79d80216705b8f2f6e02a10ebab7cb3765d3718bf821bff4c6fbfe3cee7c2128230f670751948b430bd206f34924be438d4293dc154bcd69338e85cea90032 SHA512 2ea8592aa950be597254beefe1db0097ea3fb36b42e8ace04a13e34a17718bd74f232633e1555cc90283d81568fdfe2a198b68151ead5e0fa5628d344de8df9b
 EBUILD libxmlb-0.1.15-r1.ebuild 1207 BLAKE2B 1ea024b9a69ee5da1d849c1f5ad7f13fd78621498591faa5de9ff48a6889c428018ab880472950ec5ea9fa10c70e2388e7661cee6f7a81942926330008d0b93f SHA512 332919207fd280d33be7e4087b356745b065b8af8be7be3149c40cd741173eaa1d92b3928f6704471c021f61aaf0d13424d6204f60e1733f145dbc92c6985c66
-EBUILD libxmlb-0.3.3.ebuild 1266 BLAKE2B 6f2b652b81cd5a667ae1bd48de4fe766d6ee2d9307a2597e22202648104a1aa85fcf0b4dc41a6c5d935e4a1d25b01c1c57068ed7955f999c79c3dbec68fd16f7 SHA512 9715434eeb8d9fdfbd92dec8283c63b9136ed1742e46de221354c3ffa3a8f5b5760b638e44ae2b8ebcdef62471cf8d0ae0e4dcb13002b2c8609cc59cf71194bc
-EBUILD libxmlb-0.3.4.ebuild 1204 BLAKE2B 0fb25cf75ae6f8c8c6a0bf19609f31f9f62f6283deb5ae429e972c498e2dd351321b3069876032d71fe66d3ba5e64dfe5fbccc829cc99ec14a28adf98e69bddd SHA512 e863b1407d90806a4360b7cd50dc7dd9b01363205a035f692f00cf8e7644e829732790f7456811aca816bfa3712271cd50107e9b8b703fc57d3ff43e582c4037
 EBUILD libxmlb-0.3.5.ebuild 1204 BLAKE2B 0fb25cf75ae6f8c8c6a0bf19609f31f9f62f6283deb5ae429e972c498e2dd351321b3069876032d71fe66d3ba5e64dfe5fbccc829cc99ec14a28adf98e69bddd SHA512 e863b1407d90806a4360b7cd50dc7dd9b01363205a035f692f00cf8e7644e829732790f7456811aca816bfa3712271cd50107e9b8b703fc57d3ff43e582c4037
+EBUILD libxmlb-0.3.6.ebuild 1204 BLAKE2B 0fb25cf75ae6f8c8c6a0bf19609f31f9f62f6283deb5ae429e972c498e2dd351321b3069876032d71fe66d3ba5e64dfe5fbccc829cc99ec14a28adf98e69bddd SHA512 e863b1407d90806a4360b7cd50dc7dd9b01363205a035f692f00cf8e7644e829732790f7456811aca816bfa3712271cd50107e9b8b703fc57d3ff43e582c4037
 MISC metadata.xml 542 BLAKE2B 86e3ac797d222e3ac17592e2920f516387e530e02c5e64df4c64ec246d4cfb32fd80f994814cff093722ab1ae3d14169dd3f3bf17b3a022aa2d4d2f64069bc38 SHA512 52a50c11d1b4b036d22d3c2fc42b22b1b6bdcc04ec5d86b7567e3bcfe3080423867c5689657479c4b17b0826b06325b20d0d4ee8c45a6bafeb1cc2b0616d23a8
diff --git a/dev-libs/libxmlb/libxmlb-0.3.3.ebuild b/dev-libs/libxmlb/libxmlb-0.3.3.ebuild
deleted file mode 100644
index 6ab40a3d2714..000000000000
--- a/dev-libs/libxmlb/libxmlb-0.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson python-any-r1
-
-DESCRIPTION="Library to help create and query binary XML blobs"
-HOMEPAGE="https://github.com/hughsie/libxmlb"
-SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # libxmlb.so version
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc introspection stemmer test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/xz-utils
-	dev-libs/glib:2
-	sys-apps/util-linux
-	stemmer? ( dev-libs/snowball-stemmer:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgtkdoc="$(usex doc true false)"
-		-Dintrospection="$(usex introspection true false)"
-		-Dstemmer="$(usex stemmer true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libxmlb/libxmlb-0.3.4.ebuild b/dev-libs/libxmlb/libxmlb-0.3.6.ebuild
index 84e2880a46ac..84e2880a46ac 100644
--- a/dev-libs/libxmlb/libxmlb-0.3.4.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.6.ebuild
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index d326e3c04eb1..f659cb83f614 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,6 +2,6 @@ AUX libxslt-1.1.34-CVE-2021-30560.patch 6053 BLAKE2B cbeae5b4f87a6a5872a015848b1
 AUX libxslt-1.1.34-libxml2-2.9.12.patch 4178 BLAKE2B 00dc945c2a4d50bb4a428c1ae5fe16128565d6bf8174b245c035c65281c3b1e9c798b61054b538341a2ea099fa4287be99e53c2efae67b8b43649946d6b0b643 SHA512 f688a68e7f9b005a2073722c0857dc4de786a9fb18d50065d9b5cda9bb5cc4597f3f34b4ba5448739b993dab46fb49ee22d3cd15c7c7434bb56d04dc06896e0b
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
 DIST libxslt-1.1.34.tar.gz.asc 488 BLAKE2B fff407ab2c2bbafa804e5a1f84ca447c706d75fd7489c99ac6040b625d0417a0e6c189be3457e6cc6ecd6b7860829875ea95a132fef24f8a532156361f8a5308 SHA512 9b155d4571daede99cdbf2813a85fb04812737b5e23d3f7c9840225b38f3dbf171623a21645daaee190e7ff9ba38bde932922e96a2a2312c203ffa9917c3baea
-EBUILD libxslt-1.1.34-r1.ebuild 1896 BLAKE2B afaf24eff826feaaf6f2ce237c6576a9046665ffe7aca21de53ff39be1df5ad646997cc02e09ca97209f5be4b2649afa992fea78b4471d3f9408e702638e80d4 SHA512 c28937d9ca1b393d9ef56cc09025fb51390466c5c4eafedac6131917054b6846d981ea7d9ea0d0d66b5fce3edb8f633afebce2c98203adef4544dafafbe4ce3d
-EBUILD libxslt-1.1.34-r2.ebuild 1991 BLAKE2B 7ce8f08dbf52c964b574d0f867dbc18e587c1f74a2f3722ab6e03eab5db4bd9c7e54300812d6b6d2e86775c2ae021cfde33a6f338d19e5f311cd6e394a88c9f5 SHA512 31bd596950a0881bcae83c4e5a4d27b1425005bcca49ea17ab2b7dc8a0df6d7ad67b5d6fcda31931544060dc5dabfd608980248303a72d1a0ad647522573fd1b
+EBUILD libxslt-1.1.34-r1.ebuild 1895 BLAKE2B aad9987b5281f44a22887708effce2fa0a534218b972dd23ae25fda0b28a9d40bf3d82dd924bcc7e5b4cc9fd310ac991ae423298784bb4cd39a3ffe82650d23b SHA512 901f36c08011e745bfe308e4009625e732f3ed300215083e2641b7fdca542a5bb1cf943b38d11b1818ce040b8a274ee4c6add77820e9b54662dac63c5086addb
+EBUILD libxslt-1.1.34-r2.ebuild 1990 BLAKE2B f5ffe2c0fb87dca8ad11cfcfb54c96fab9824b20091644aa8c5aef9fbc99cfb76d00de62a4bcf07705003e974db0bc77b34b50fb1d71134e938fc8861bab6e9d SHA512 1652a35a87f40f51d3d9d6759e8fabb135f3e3164794fbfca8e4c551cf4290df07c258d6e962ac6f7f2a69592877ecec5214bed7dadfe804bdab92c169a34edb
 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index 36b22c24d815..fd7981f397ae 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
 BDEPEND=">=virtual/pkgconfig-1
-	verify-sig? ( app-crypt/openpgp-keys-danielveillard )"
+	verify-sig? ( sec-keys/openpgp-keys-danielveillard )"
 RDEPEND="
 	>=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}]
 	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
index 50d9a3936339..b13785e3e3c7 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
 BDEPEND=">=virtual/pkgconfig-1
-	verify-sig? ( app-crypt/openpgp-keys-danielveillard )"
+	verify-sig? ( sec-keys/openpgp-keys-danielveillard )"
 RDEPEND="
 	>=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}]
 	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 4a896f338721..b57e12bc4acd 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -6,5 +6,5 @@ DIST link-grammar-5.8.1.tar.gz 3791847 BLAKE2B 8c89b95eaae87f0b576374c3f8c00529d
 DIST link-grammar-5.9.1.tar.gz 3809872 BLAKE2B fe0c407e2e4ea4201036647cbea7d4c2606fa9943653fcc2d3505963a00773006912b8af5c2762acf498220d2f48319a031736d59790c0fed616432973ea24ec SHA512 c8d8bc99ddd6f6190ebcb24fcafc79497c3eeab1deb3099691f55c735a0a607a8372a8dca5cd86ce7c20cd3a45e4f1cbf91bef39dc781a5b5a2246006b4f601e
 EBUILD link-grammar-5.8.0.ebuild 3187 BLAKE2B c571f8e5efd48157f76551eadef5de79f6d1092ee98299b4d0fd0d7059dd7971140445913dbab7236dcebef7e113a469eeba70b2a4d5c6d0b7a5c072f2235177 SHA512 2971f78f62d10407e12764b930c2f63ce25b2ff152ff9d8cf399163463461c029b83d14db4b5069b41e476509ccbb8c23dc5b0b0b354aa86f43c0471a24d0ebc
 EBUILD link-grammar-5.8.1.ebuild 3055 BLAKE2B b029a010785009c0463a272e8fa70a0166e14419292a4ea8f0c09d4d1bac7bd75ed7122ade19c4615816650dc71a0296c4ff97d0f873f756f8b6f3f9f9c61505 SHA512 7d21f89272decc806e310f961d3e40edc5fa55398aca74f71a9d80b151e18e7a27ee4d243c0fe5aee81ae5662f24ce242ccf3b0254ed9675b57aec786932a2e6
-EBUILD link-grammar-5.9.1.ebuild 3062 BLAKE2B 85ebccac2e225bf7262b9f1cc6af74ccaafa742de603a94996c25328694defb978968871aa5ab1c38afe53ee1371acba455c0677cfcc6a9fa107d0e32b564465 SHA512 161f9b3ca151b30b259ade74401e9379041e8146eddbbc4625c76fafd7a631f5650dc524b8549152bc2f97a9890df7ac8963212a715b6f767b4a7687d30e1c65
+EBUILD link-grammar-5.9.1.ebuild 3069 BLAKE2B eac0da4f591ce50f20f1483e9f4caba16ce3a510434423e2a9d48fc46e422906abd5a64208d85a057db7a751218cf3f684d3f9ee08326c7a4e0e3751b14fe6cd SHA512 fb327c449b874d86549806e367067ad5abc4ded9e22feff9df7e5700aa500f4c20f4121b497c80bd43483ec947c8bf18f0d74f5bd044698b9d51eceaa1d8eade
 MISC metadata.xml 964 BLAKE2B d5e9edeb0dc780ed561105e1834e81ad21c4d495f17cf1db4a66c0b6f862c572d2f4ade6b0a52a14f70ac73bdb58d06686d844bfe760818c7bb5e039f51eda56 SHA512 d3456442cd0a2a5b6e89e2ab3067c00c2bf0faf3f373cd3bf4f0cbf52ee37b882b9e2ed5785e2b43348c6d5e174b918e69c2e8e6bf91b1b16b1d2b692b796823
diff --git a/dev-libs/link-grammar/link-grammar-5.9.1.ebuild b/dev-libs/link-grammar/link-grammar-5.9.1.ebuild
index 2be3e58a4fd7..7d7c3b6289d0 100644
--- a/dev-libs/link-grammar/link-grammar-5.9.1.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="aspell +hunspell java python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index efa498b51830..22fe45a6e0a9 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -3,6 +3,5 @@ AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac
 AUX lockdev-1.0.3-major-minor.patch 612 BLAKE2B 1ce680aa00e86d6b62ad5d44028c1708b1b656c00c03c65957b308c9109118f24681b9d9750f275870a1e43b45e1bf924dbb9fb510f1aea3d5636fcdcf81d3c4 SHA512 9a6b769f8924c51c52b481bc11551cf272ab2be3c4e27f0d5ef103a0e86b3103dbbb9ffe106ad51229c34654b86b78da44e8b3df09b6e49a56e475673ad3d1f0
 DIST lockdev_1.0.3-1.2.diff.gz 7642 BLAKE2B ee0da062e802d1112c49bf3dc4cdd1f3567eb11fd4173fe0170b079c2752231ee93e39201674d8e71a5970f4d7e6443406d159af63687bb37c8c72203132c4f9 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c
 DIST lockdev_1.0.3.orig.tar.gz 29150 BLAKE2B 812acf8b39507e7b00e8fd49e6828be2b6ba21811c3dca49f94543756d428f7fea9d8005e43574653180f71aa634b0f92a2c42380235c2584c6958ca38d499fb SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b
-EBUILD lockdev-1.0.3.1.2-r3.ebuild 1956 BLAKE2B db846cb320977b0f3e3b63afee8cc9a0aaa350bb963c2ac7e412955583cfac4e451e09f0fb31e6c1ab35eadf5c5374842ba01504dea9a1c36e55722d9cffe0b9 SHA512 06bf4982c3bedbb1707769d66783e1650058f16950983958ceef07c5fe5965e0e0ca56a6914dce7e8dde7c4ab4412d31ea26a65ba3f12c45c52ca08fdb14fe8c
-EBUILD lockdev-1.0.3.1.2-r4.ebuild 1906 BLAKE2B 7d563034345c314a09e5de913981e644ca5cab4da4e90d62cdbc351f66b8d5eab929c6c39960cbb81cd596d5ae378b48f2c53efc6ae76f7a341c5eaddec32420 SHA512 a0d7fb443a87668666ea8adc298409f5c3c546b4d031f60720261bb4791b7c7a1613d1ed3e8648b9adf3a7d9801d0a4b251d3361f5719620a7fd106f95e17c6f
+EBUILD lockdev-1.0.3.1.2-r4.ebuild 1900 BLAKE2B c00df70b152d468a26f17637e569ec7a24ad1ec52b2dba5864e8eab72e23e9f72c7f4897d398552c5fb4ea0c5fb6df5d04aabdff3f13235e553229e886d4f299 SHA512 0516e4e47e4c8b8728eaa575260cb98457c3bda45efc5974eeba8b1d612aea4fa0e1dbdd852ce0425f3895150b2ec1fe4d8448870cbd84115aafee154409d863
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
deleted file mode 100644
index 419f982bc81b..000000000000
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit perl-module epatch versionator autotools multilib-minimal
-
-MAJOR=$(get_major_version)
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DEB_PV=$(replace_version_separator 3 '-')
-DEB_P=${PN}_${DEB_PV}
-
-DESCRIPTION="Library for locking devices"
-HOMEPAGE="http://packages.debian.org/source/sid/lockdev"
-SRC_URI="
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.diff.gz
-"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="perl"
-
-PATCHES=(
-	"${WORKDIR}/${DEB_P}.diff"
-	"${FILESDIR}/${MY_P}-add-autotools.patch"
-	"${FILESDIR}/${MY_P}-fix-perl.patch"
-)
-
-PERL_S=./LockDev
-
-pkg_setup() {
-	use perl && perl_set_version
-}
-
-src_prepare() {
-	epatch -p1 "${PATCHES[@]}"
-	epatch_user
-
-	eautoreconf
-
-	# perl module build
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf
-
-	if multilib_is_native_abi && use perl; then
-		cd "${PERL_S}" || die
-		perl-module_src_configure
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use perl; then
-		cd "${PERL_S}" || die
-		perl-module_src_compile
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi && use perl; then
-		cd "${PERL_S}" || die
-		SRC_TEST="do"
-		export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${BUILD_DIR}/.libs"
-		perl-module_src_test
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use perl; then
-		cd "${PERL_S}" || die
-		mytargets="pure_install"
-		perl-module_src_install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog* debian/NEWS README.debug
-	newdoc debian/changelog changelog.debian
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	use perl && perl_set_version
-}
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild
index 49560227160a..f06891e08476 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="perl"
 
 PATCHES=(
diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index 6cb5f24e40ae..ea8a2bcab9ef 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -4,5 +4,5 @@ DIST log4cplus-2.0.6.tar.bz2 1197177 BLAKE2B cb2d4635b109690a81f2e228d48424a67ad
 DIST log4cplus-2.0.7.tar.bz2 1210637 BLAKE2B 59e9c3c351c7893c7e9c39e9d12616579cff3b4dfdd3e069f0adb4b75fb2b46d6fe8efceea2b6103c5531a723f015518bf10ce6a581724b6ae5f49e994b74c72 SHA512 9d1b36d0c2347dd9d9ab8852114b8138f56063c51625eaab7f4c680ee852e1e6872c6712465b10057ec9e42305b83d956f6753100dfd3ec58518d6620cc4106c
 EBUILD log4cplus-1.2.0.ebuild 1608 BLAKE2B db26b191772d7a3b1f616fb713fa9d8fbba984c2aa1c62541c93a2ac18d2b98b3e82b863d1b0ce0b306a59bb8ca2ced8377c41a1637e7a7808aa3e063721f80d SHA512 36d58defbd0d2a7308951f3a1252773149740145b25080a3d2f5ad3fbb0c690507274c90ddd9a0b25935d9515a5e167c90fb14bea56c8a3b65a7945ac3bf9bf0
 EBUILD log4cplus-2.0.6.ebuild 996 BLAKE2B c1d9b3cb47da4ec5bbe864ab4fff99d1f9750374164753395938ce16bf306ad927027b22266681bedcbc9c8baa61243021d2f9f5d4cb5c96164b486c9160ed87 SHA512 d0eab7c467f1cd1a6fddcac998a550523262359e81c6bc93100f867c86cf4b602e6d88b573af0a33daa18a66a88ed6e2243776e43bfee27d4aa4cc0276e3fb1c
-EBUILD log4cplus-2.0.7.ebuild 993 BLAKE2B 98b4720a1f829ecfcff0da8d5390eb1ffa207ab053fc398e5241031b66a1ac403bc32d9fb000df1f3513f67ed83bdc0a0f7dd2bca2f341dd01e66f7c5a00d94b SHA512 81e2037c98f9693608a569d3f3665c5a2f9d85ab20402817c787c3ad7ccf4d4a2fe8da3f932c864fefab3611f3c213f9e49acc074a611cc7e24624a6a8a3e900
+EBUILD log4cplus-2.0.7.ebuild 992 BLAKE2B 64ab4e4c775bfa179aaef698c7bac6085cb1dc21b11e8d844456da7c9049c5c3d86e8e72b774a62f8f975fb2b6ed5978a9ee75b747e62cb45c5b840cc36e17ed SHA512 8f25db3c59b87d008e8df751ef1f3770836bbe276a9c7fd55162d552dd9a97ac1db9e76b96bdb3a65424c6036c26672cff2a927086334cc51e06d36da7ef41b0
 MISC metadata.xml 1019 BLAKE2B 4656573d247296e8ef15672860d7131eb38e2ec19b6a020d545a0df5b2cef3bb2ab23098dadb747960914a0b1afe0e95b3c9598001b4f23f43e531d0ea04c765 SHA512 e0568fab0d1b3d20bf05c3cb1feb65f3e6737de39e5df251ab9fff20b4142e67b143c99749e374edfd6c6c23326e90a4d294551efd2be60b2c849bac40bd6593
diff --git a/dev-libs/log4cplus/log4cplus-2.0.7.ebuild b/dev-libs/log4cplus/log4cplus-2.0.7.ebuild
index 899549eeb02e..8dbf6e61cf0d 100644
--- a/dev-libs/log4cplus/log4cplus-2.0.7.ebuild
+++ b/dev-libs/log4cplus/log4cplus-2.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="explicit-initialization iconv qt5 server test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index 943181d5d7e4..89b2f0d6335d 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,4 +1,8 @@
 AUX mimalloc-1.7.2-GNUInstallDirs.patch 1230 BLAKE2B c5fea7af513b0db45be93861ee6f9eefaa8666645ece9c9112adcc34b17d7578503d7409cd6b4005e1c635d7db86755cf4de078966ced0eb0eb7cd29492f604f SHA512 a847164cbe7b64345b09a455bd6776249b697ec2b2222751f0dd96d87252b8bff0182626de1a4b96aa525861c181101f80950cafb18a782cd7af10d50c2d1db5
 DIST mimalloc-1.7.2.tar.gz 903317 BLAKE2B 6983a575c8e3a9ee92acc0042bc229805b7090794de6e693ff1cc344cd50e333d46f23663fbd16647ae4442b28f24bdc2043b46ed2bc16e13c3f8def08b155bb SHA512 5d78c5cc00dfff3dd7eb4bb59e8eff32397f5110d1183b4656cb56c40b88e2e648e3b18338119412b95ba9526937b16fce3aa4732f241a61a546e2bcea1efc9d
+DIST mimalloc-1.7.3.tar.gz 908042 BLAKE2B 6a96fc33148261e3f69a55196725bb2cf2e45f08a668b3d74fd6e06f808c1ce40fbb4783c5df50abe58dbae8b9c1dd264e6fcc6cce0a259b2cbec397d4667736 SHA512 e5a17b98d77a27d2a544869c2e0302a7e3bf77b5b494b2ee8ddc7af18bf9da152fea41702a8a17eb7e128238259fba6f96fa5bac549f5927453dc9a0bc06d013
+DIST mimalloc-2.0.3.tar.gz 917461 BLAKE2B 4b803881ab75afa358cb2dd251268c0934472074bf1983c3851a9d4f8c8ec0ea3907b52c40b0efe1cc09916cf4c5aa93f786a606e0b999536118b91bb5800310 SHA512 275a5249d09a57c9a039714fc6eef24ae778496954972419f3ac8e33f3d12e9837ba0691a3c08a4ab807c26b868aad3a5b2c28ee10ecaa60fe21ffe1d416f08f
 EBUILD mimalloc-1.7.2.ebuild 693 BLAKE2B b6905afe48c8674e813f55027b3f68371a04d9106759167de2bf58324c4a28494155f2a1df904ce200c5f72a3e31f54b6436a3b9fd42c65756297e45834d91bb SHA512 974885203bc9374f10025401e3d47d709128000893de0f0164eac18fdc8149986af95e74617574b4fd4fa6d3859b3361d2668797504678f765755c79664479b9
+EBUILD mimalloc-1.7.3.ebuild 694 BLAKE2B 13272ef91e6f6e49ccd8c45edd8ae39d8ac39d60e2ddd9d1876509409d56d5d9ecb3592d107c7c269dd4c00100680820b129df66587987e2d397ba313e6dd91e SHA512 bffc969e62417a003cc7a283b2108c78f4d63ee8d2fc98fdf690398ba37b63d868c08de98ab225d8bbecdd4f9f1f941564138996fc4ef9fd09bd6dd982ccccdf
+EBUILD mimalloc-2.0.3-r1.ebuild 761 BLAKE2B 6e6187c1bea297633a50df0d45e8b244e3d4bcfcb003f726578337b08b8754fb96155d98864b93e8d25640228f10bd4fa9606712d0068e38c2439976b241fefe SHA512 108a0ddbbbd54899e569bf667d4633edeeab643c1fa6f4294747a826c5b04dc1d674c92215b51a8a93f4a41d8edc32ffff9115c1eee4cb356a3a24d1dab1fc0d
 MISC metadata.xml 322 BLAKE2B 811930d7bd9b6240b866a9a8e90ff6b4d48ba7e985c61cb475c8b8de67265d8f9b7317a84191cf5b5a9961e130e792b6cfbbdd3cbebe9e3d9128a7a5bcfaaf49 SHA512 b9b3bdc237c9a9f362f90ff72888f5bed80385d3acd27cc1a4c9bcd89939ce3a45593c51481a6529a9aac25a86726e1a0362ce2094e11dce555175e656c293d1
diff --git a/dev-libs/mimalloc/mimalloc-1.7.3.ebuild b/dev-libs/mimalloc/mimalloc-1.7.3.ebuild
new file mode 100644
index 000000000000..40b252a87e40
--- /dev/null
+++ b/dev-libs/mimalloc/mimalloc-1.7.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="mimalloc is a compact general purpose allocator with excellent performance"
+HOMEPAGE="https://github.com/microsoft/mimalloc"
+SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+#	"${FILESDIR}"/${PN}-1.7.2-GNUInstallDirs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: build hardened variant?
+		#-DMI_SECURE=$(usex hardened)
+
+		-DMI_INSTALL_TOPLEVEL=ON
+		-DMI_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/mimalloc/mimalloc-2.0.3-r1.ebuild b/dev-libs/mimalloc/mimalloc-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..0f720eedd8eb
--- /dev/null
+++ b/dev-libs/mimalloc/mimalloc-2.0.3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="mimalloc is a compact general purpose allocator with excellent performance"
+HOMEPAGE="https://github.com/microsoft/mimalloc"
+SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: build hardened variant?
+		#-DMI_SECURE=$(usex hardened)
+
+		-DMI_INSTALL_TOPLEVEL=ON
+		-DMI_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm "${ED}/usr/$(get_libdir)/mimalloc.o" || die
+
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 9abb3161a5ee..8ce555167deb 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,6 +1,3 @@
-AUX mxml-3.2-slibtool.patch 723 BLAKE2B d5e086ac0b600c2314d92224ec37da16b0c1276d2da8032579d95b4ae4eb641c985bd6374411453037779d3cd0d8e86e7d89a445ba263c03d1863968d7e22460 SHA512 3077e580bb44843a09f7a8c80ff05996af70658195eb07e31f5da69409744729e5aacd706ca5f4f91e2ddf75c79f554dbc3667bb6720997c03e8c57ad279db60
-DIST mxml-3.2.tar.gz 9267930 BLAKE2B f244dab599233b8a26aba5a11526979bf2f4d20b5fce67858f7759abc5bd2f3e2aac19d512c887248839d130cf1314065687cd1ccf91edbf5533ae2d342f286b SHA512 ed3f2b361394ef225a708b0032976a3d191d5eaea3022e190b29e0ee140e8f998f1d65c64e4898872b169516cee44f4f5f18401c6410c3b5aa1e9680b23e8675
 DIST mxml-3.3.tar.gz 1550358 BLAKE2B 2b815cd8c2031099e2767caad93cc389962ec547fadade92b0a7fb48a2352fd0940c9e434c2081b7419e0cfb489266d7116dacefd6fb9d7ce40d6de0f49cb2a6 SHA512 5a8453bec17e46afc9b100df03dba2219353a076152f34a5dc41b7f042fa570723effc3472680a4380674c412c3ab31e017f6704b1e8308227a4d9b3f13cb197
-EBUILD mxml-3.2.ebuild 1456 BLAKE2B 55a8efb6c1e105b247c247de0a347310139f13348ee6e8ddc0096ba915026ddacc1e9cacfce388f0ef77e9ad388a0f7f80eda91087295fb6db3164fba025dfa2 SHA512 506db0f7762d585f208d15202d937d5eb52550ce99fe39450b7d05d5ad904cd0944f9568e554b39931a2824edbad4e461bd4d7308c2ade606818749ab475a092
-EBUILD mxml-3.3.ebuild 1344 BLAKE2B a4889416809a773305d33b4836047a73239bdaef01fda00cc96e44ba2e7407e9e2247c7818954204dfeae9bdd62222c46a3dd88d65a8896efaa8167177fc0490 SHA512 bd1a9555c210bfb16370f6b8ba6ae939c580eae720768414f7da810914506d18872250ea3a272c8e957fc7b94ac560e7a712751aabf762635d43610d7ebef4b0
+EBUILD mxml-3.3.ebuild 1347 BLAKE2B 5a90de864906aaf60f3b3c685de49033cbb170e92b82ef9281a110706c08c9cfb1f7374668e859c2a86fc7e89f78f96cca3ec3f516a9611d0c3131ffe0e11f26 SHA512 d745e253e43e9a49a4eb63fabb1698e925a82127a6ab2e545512e4a2248cd50e52a090992243d8ac1ee42938f86a11911794b3af81fe481e1e24633b831649e1
 MISC metadata.xml 1380 BLAKE2B ba169e7d7bf4572b56e2cc8923a48fce4b31af61107bd908d77f4a211aa096b4f0adfed9ae1d52cbad6b4309793f545cbd562a553e0c5aa1d0786b088f472cd7 SHA512 2895d86c62cb799302ba1515a3b638d52ca253f78e07bcc542bbb99338b84bc2079d48f42fb85a627e9252a545a853629943f9a904ead600aff161a24e1f1658
diff --git a/dev-libs/mxml/files/mxml-3.2-slibtool.patch b/dev-libs/mxml/files/mxml-3.2-slibtool.patch
deleted file mode 100644
index b5d0df44df7f..000000000000
--- a/dev-libs/mxml/files/mxml-3.2-slibtool.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4e2e31236f731c0b7e880078269d9f98f595bfd3 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 7 Apr 2021 09:17:52 -0700
-Subject: [PATCH] build: Don't use libtool.
-
----
- Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 8c05daf..cdc3450 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52,10 +52,10 @@ BUILDROOT	=	$(DSTROOT)
- # Install commands...
- #
- 
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
-+INSTALL_BIN	=	$(INSTALL) -m 755
- INSTALL_DATA	=	$(INSTALL) -m 644
- INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
-+INSTALL_LIB	=	$(INSTALL) -m 755
- INSTALL_MAN	=	$(INSTALL) -m 644
- INSTALL_SCRIPT	=	$(INSTALL) -m 755
- 
diff --git a/dev-libs/mxml/mxml-3.2.ebuild b/dev-libs/mxml/mxml-3.2.ebuild
deleted file mode 100644
index b21734763a11..000000000000
--- a/dev-libs/mxml/mxml-3.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
-HOMEPAGE="
-	https://github.com/michaelrsweet/mxml
-	https://www.msweet.org/mxml/
-"
-SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Mini-XML"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="static-libs threads"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-slibtool.patch" )
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os -g//' -i configure.ac || die
-
-	# Don't run always tests
-	# Enable verbose compiling
-	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
-
-	# Build only static-libs, when requested by user, also build docs without static-libs in that case
-	if ! use static-libs; then
-		local mysedopts=(
-			-e '/^install:/s/install-libmxml.a//g'
-			-e '/^mxml.xml:/s/-static//g'
-			-e '/^mxml.epub:/s/-static//g'
-			-e '/^valgrind/s/-static//g'
-			-e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." .\/mxmldoc/g'
-		)
-		sed "${mysedopts[@]}" -i Makefile.in || die
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable threads)
-		--with-docdir=/usr/share/doc/"${PF}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake testmxml
-}
-
-src_install() {
-	emake DSTROOT="${ED}" install
-}
diff --git a/dev-libs/mxml/mxml-3.3.ebuild b/dev-libs/mxml/mxml-3.3.ebuild
index a0e3cdb5191b..cd7924fd99c9 100644
--- a/dev-libs/mxml/mxml-3.3.ebuild
+++ b/dev-libs/mxml/mxml-3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Mini-XML"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index df8c864e11da..8e73264c84e8 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,21 +3,15 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 DIST nss-3.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70c8a7fc4b176a391bf7cd22eae1c93c85533b6af15e1c1cd9fb6b007380741e0b1670f3891f298ffa1b309284 SHA512 62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730
 DIST nss-3.68.1.tar.gz 82405747 BLAKE2B 89a2e893d3af02b192d044049ec84462e53d96bf2ba9a88112b4dfde5af5c0d9a615ed94b5c97c26775de998cc38240d19d5f2e5eb2573a6715d2a7106d99fe3 SHA512 9aa932e8ba1a0c3bffd402f7129d03de30481bde712aaa197bc79d14b307179e691423aa0c6300767fce2c667917c8d2e2b38e361269b7671548d72435887f84
-DIST nss-3.68.tar.gz 82405833 BLAKE2B 0a48c599bb3c97f41e41c5723e6c1b12d7f03469bf37593f62973817b7cbc9257b97a17ca2393d737bda51536c0b81169ec38b9ac6baa2c9dc7a61ae7817f103 SHA512 be1197320620ffc9c00aa8aec14de71b5c0bdbfc286309fcc5e995c74d1249cea798fd226ba613b345719238b73883af9f2bc28e1e1f698563767295df518a6e
-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-3.72.1.tar.gz 83929867 BLAKE2B 8be49eef0c1845a65da61829798d119b6b88b5aad6e07059d42e7c4b41d6a03975d82bb598ba0614f596107eb73408269f6a78c9a173f82566948638aeafde96 SHA512 57abc2752484049b59b3a7606814341c194bfa0db781dd5fc805fbe79787073ab4dbc1944719a8def71e5d4f371f2948aaa558290134c4f247c61dd5e96daf8a
 DIST nss-3.72.tar.gz 83928300 BLAKE2B d92889e27e99095a18090eff0c08b8653ef1f53f4954f5bd018df2f2903647bc71f217159bb4b11f0d6b4fb289fda20bffa2d1d207d1836dcfc33dbd4bedf511 SHA512 1d818d2ef85735837275059fecf68d57e48152f0348ea54887c29171cf029b6944e94d99a8cd96e580a81edb678b79c55515ac0516e27daf6b290c34baed9ebb
+DIST nss-3.73.1.tar.gz 83931597 BLAKE2B 590e3c9c5262f4ca0d9137905ce396ddc81f722fabbb54f235eb1bab344d9b7913b0be8d4ddf99fef34d45ed0102e8b7b571764eefe055eefe6bb487c22bafbe SHA512 4cca26cb430f1c167ce7c3a2654c1315938c73bbd425c89d4e636a966fd052724499f34affc5764ec680eeaa080892caab28ef00fe21992421c739f7623cf071
 DIST nss-3.73.tar.gz 83928905 BLAKE2B 64c95a04c366dc3d57c42ddb105b3afe5b4b579b3fdb554ffa684f74f5c203b136213a1a67a554756be605722ac03c15cee766afba6edf2c7c0b2162a8181ec5 SHA512 84b6e4ce8838f77674a5587cd227fa103c80f1b36c8bfb9b60a175157f131e59153c79ee77b29feffa57f49b217a90a8a091ee368eb0bc03312894e386a4c01b
 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.1.ebuild 9537 BLAKE2B 600eb8f26f86928dd31649faa07fe214cca366569caa370ff74fbc92b7be6939103483f90991d898fe7af94bfe834cf2700e7c76d373b6ac2daf94eefef4c01b SHA512 2f4c88a54496b6bca05f52e769b9989d890cf7aa9b795ad3cf4be107a7e2728688b5e249c17b0eead9c10d1937915c60ab2e391cfef44fc77549d353436a6c9f
-EBUILD nss-3.68.ebuild 9538 BLAKE2B 83224c3ea3e6909bbaeec5cf7986965be1a91610f05d19416c03b55d02379920e42e88a18179432e1bc06a66e96e15b59c7e7b4df1c998c6922308110a185e80 SHA512 56d698ad6f087f8812f9bf0307ed3957379b268f49024b6b17f5417cf15aea89593a833f5a2489a0b46224b6edaa5c253f107e0b86deb65d80c65e2db9dddb3f
-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
+EBUILD nss-3.72.1.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
 EBUILD nss-3.72.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
+EBUILD nss-3.73.1.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
 EBUILD nss-3.73.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.68.ebuild b/dev-libs/nss/nss-3.68.ebuild
deleted file mode 100644
index b4b769ddec09..000000000000
--- a/dev-libs/nss/nss-3.68.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.32"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-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/nss/nss-3.69.1.ebuild b/dev-libs/nss/nss-3.69.1.ebuild
deleted file mode 100644
index 0618a36a6438..000000000000
--- a/dev-libs/nss/nss-3.69.1.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# 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/nss/nss-3.69.ebuild b/dev-libs/nss/nss-3.69.ebuild
deleted file mode 100644
index 973f651b763d..000000000000
--- a/dev-libs/nss/nss-3.69.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# 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}"
-
-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/nss/nss-3.70.ebuild b/dev-libs/nss/nss-3.72.1.ebuild
index 97adb106159f..97adb106159f 100644
--- a/dev-libs/nss/nss-3.70.ebuild
+++ b/dev-libs/nss/nss-3.72.1.ebuild
diff --git a/dev-libs/nss/nss-3.71.ebuild b/dev-libs/nss/nss-3.73.1.ebuild
index 97adb106159f..97adb106159f 100644
--- a/dev-libs/nss/nss-3.71.ebuild
+++ b/dev-libs/nss/nss-3.73.1.ebuild
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 55aebe08d226..dabfbea43ac1 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,10 +7,14 @@ DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
 DIST openssl-1.1.1l.tar.gz 9834044 BLAKE2B 9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0
+DIST openssl-1.1.1m.tar.gz 9847315 BLAKE2B 163262933df11afdb7b0c58fbbf0454b05e02951d28ed24e2c530affa18dee884d86555f7314506852ebfcc092bb509b6f9cd33893e30dab67bfb6f5713946eb SHA512 ba0ef99b321546c13385966e4a607734df38b96f6ed45c4c67063a5f8d1482986855279797a6920d9f86c2ec31ce3e104dcc62c37328caacdd78aec59aa66156
 DIST openssl-3.0.0.tar.gz 14978663 BLAKE2B 64721ee958fc47d57a479dffff91be5692d80d10a6727d804f8a9da66fcaea799b67fda8987f9ecdfb2777ec42033c5e8a6a135e30784d6422eb3c65e676abe6 SHA512 1fdf769ef69631eb802671a9e0bb3a01883d58282f651986212983c2d7c9d3499dabe99a6dee0411e997e6fcfa6f682b121b7698596de0d6c78850c2200241b1
+DIST openssl-3.0.1.tar.gz 15011207 BLAKE2B ea1e560cbebbd3fdb560cbd7db518db2f95d1b7a8397435483829eda815e9f74a175693949c3d013205c43c936d703755ca14afba29077570361fca75164a719 SHA512 4eb29386a6c2c47bebc668e68b61872eed1d136e5620d6f8971393ae7dd8d0f640257278735c76adc0c9569a315fdb929c175a2931d52d3fcc4c527ad6a975ce
 EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
 EBUILD openssl-1.1.1k-r1.ebuild 10306 BLAKE2B 1c8274fb11aafa6aa78f09df1f7a88ced754d08e5b332fe8bec55152da240617fad12a5489549d967da472ee1cfed10ce93689e0e011a54826c55334c3a3daa2 SHA512 96fb34ba04ffcf7e801365ce95d3ab6062b162524c43bab47543f1826a9c94b849b004a58d3ceb3cac3bbe973410d11455488d1e3c3850bb2acabe68c66b6f68
-EBUILD openssl-1.1.1l-r1.ebuild 8486 BLAKE2B 215dac2c120ca81bba45f5f1dc7f5cceae32ff0f473af778d0c7de7a836c8b7901a2ac03d8f506111dc42d0b88c55c173092a36d0956570ba719435727ed5f34 SHA512 ba7cb74d5c40aff08a7ffa31462c65aa7b1ab861cab4e6e599c7d7f94af39cd447f82081ccf938e551c96f3cd079504ea824640beb0993e523733e0102e3c44d
+EBUILD openssl-1.1.1l-r1.ebuild 8478 BLAKE2B 0e9a273ab054526388969aeaaaa149598de32bf5eccca15d2de51dd95826a7a667bda18f0bbe0813b06a2e76f8636a0c6eba2378a7f78a669b3e2adfcc2cdd85 SHA512 dfd010e60842f0dfffdceaa55916fffdb40a2f8db23474fd9ad5361dfa8b6a60ca6e8b01ad143e00befdaaf186fa4856e852353f812213ef7f27bdfa568e3c93
 EBUILD openssl-1.1.1l.ebuild 10306 BLAKE2B 1c8274fb11aafa6aa78f09df1f7a88ced754d08e5b332fe8bec55152da240617fad12a5489549d967da472ee1cfed10ce93689e0e011a54826c55334c3a3daa2 SHA512 96fb34ba04ffcf7e801365ce95d3ab6062b162524c43bab47543f1826a9c94b849b004a58d3ceb3cac3bbe973410d11455488d1e3c3850bb2acabe68c66b6f68
+EBUILD openssl-1.1.1m.ebuild 9054 BLAKE2B 5eb21f8cd39c1093e229f4f6623b19cffd54de31de25c0c0d03e5190c093567ae0bc511f3c23df6ab947077001da0ec5e4e6d879140d1e3334afe5075b0394c4 SHA512 46456534ea6b6028a814fd6ad62f1709b55cbfc72d13e7c237229adda2f545aa216c8090806c1f87c1c1d39a86b39ae38dae8fd4d338ffe6d4e107e121e1813f
 EBUILD openssl-3.0.0.ebuild 8218 BLAKE2B 329ce898bf43a14c1a55e2d5b6cc38cd4420d547e63c475c4005243aea3889df06c9ad2d1d6614f7000d38854add6ad61a54a6815fa6ea595a47992b401a25a3 SHA512 79fbc20bc445355b8f9809f41b0f4e6abed1c2cb7582b9a86a2da02f5978d53bb6f8fa21a86c0a4029d3a38e43bd65554b31c46c64d88f2a78a7e6e69a6dbcea
+EBUILD openssl-3.0.1.ebuild 8218 BLAKE2B 329ce898bf43a14c1a55e2d5b6cc38cd4420d547e63c475c4005243aea3889df06c9ad2d1d6614f7000d38854add6ad61a54a6815fa6ea595a47992b401a25a3 SHA512 79fbc20bc445355b8f9809f41b0f4e6abed1c2cb7582b9a86a2da02f5978d53bb6f8fa21a86c0a4029d3a38e43bd65554b31c46c64d88f2a78a7e6e69a6dbcea
 MISC metadata.xml 1486 BLAKE2B ddf79f8ea66471d1aa2809dce9b3b87973c38a1367566ec77222dfd22062963535241314bd4fd56387f2d133825e43627f363edee9329c14565717511b5cb870 SHA512 92f53ca3d3867ab8cfc4093ac92a9d9885eee8c10ac43f80c4dfb87911fc253557118064ecf1b1fae48c50e1273ef3821c9db84f00760dd0af8d5104a49595f0
diff --git a/dev-libs/openssl/openssl-1.1.1l-r1.ebuild b/dev-libs/openssl/openssl-1.1.1l-r1.ebuild
index 3b4a73bfd284..8cd17efa4f22 100644
--- a/dev-libs/openssl/openssl-1.1.1l-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1l-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="+asm elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/openssl/openssl-1.1.1m.ebuild b/dev-libs/openssl/openssl-1.1.1m.ebuild
new file mode 100644
index 000000000000..7e5a73877b48
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1m.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib-minimal
+
+MY_P=${P/_/-}
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="+asm elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		kernel_linux? ( sys-process/procps )
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if use test && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if use test && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
+		# use GNU ld full option, not to confuse it on Solaris
+		sed -i \
+			-e 's/-Wl,-M,/-Wl,--version-script=/' \
+			-e 's/-Wl,-h,/-Wl,--soname=/' \
+			Configurations/10-main.conf || die
+
+		# fix building on Solaris 10
+		# https://github.com/openssl/openssl/issues/6333
+		sed -i \
+			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
+			Configurations/10-main.conf || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	# echo "__uint128_t i;" > "${T}"/128.c
+	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	# fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		enable-ec2m \
+		enable-sm2 \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-compression zlib) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-3.0.1.ebuild b/dev-libs/openssl/openssl-3.0.1.ebuild
new file mode 100644
index 000000000000..dad6d1b877b3
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.0.1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # .so version of libssl/libcrypto
+
+IUSE="+asm cpu_flags_x86_sse2 elibc_musl fips ktls rfc3779 sctp static-libs test tls-compression vanilla"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export AR CC CXX RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	local myeconfargs=(
+		${sslout}
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use_ssl tls-compression zlib)
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= echoit \
+		./${config} \
+		"${myeconfargs[@]}" \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile \
+		|| die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]] ; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+
+		[[ ${m} == openssl.1* ]] && continue
+
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+
+		mv ${d}/{,ssl-}${m} || die
+
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
+		ln -s ssl-${m} ${d}/openssl-${m} || die
+
+		# locate any symlinks that point to this man page ...
+		# we assume that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index bbf1854e8f70..b94f412928b3 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -3,6 +3,6 @@ AUX pkcs11-helper-1.27.0-nss.patch 614 BLAKE2B 68db71f025aebd620d278fa3847b1ead5
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
 DIST pkcs11-helper-1.27.0.tar.bz2 422425 BLAKE2B a9fd7ef04dce1abbae57b09a12b4be560465ae0cf2910443332882967d00b6380c62944820aa9580e101459d1c35edaae68cd7abbafa308a8b152921ac32f04c SHA512 5799342cb755dae8b7ba0880d652e9d4b4f1e52a74043015e1185e1e059326cb2689bb51957db98060ac2257dee34e2f047dcf3d52ad59fd49b91fedcfc5332b
 EBUILD pkcs11-helper-1.25.1-r1.ebuild 1006 BLAKE2B d1eb0f02e05bd907a02026f5ad13203e16a1aa982d89f4007bbe7f868af5d2247d5a3548a75b96ab132ed5408c897ed4efbe5810665edb1759fd6841e8d54fb7 SHA512 334b7ca21009081a71d987961f8373140961d5f3bb826e6142f2d795c48fccfbba8a3f3ee027cd649d4fa48aac5ab14f96dbff3028cafe634ee7889298be5c7b
-EBUILD pkcs11-helper-1.27.0-r1.ebuild 1077 BLAKE2B 7c004828a65adea230279b25963aef6c125cfac53e893048987b7ec86789f4680524dac6c346d37a3df6a5c0ec0025cbeb28eb236538255b01a53356d8ac6e32 SHA512 a8380ee213083f637d67c3d2a0bae96aed80d8630cbea45e5263d629c1316b85ce04ad703e1635cc1f2e41fe8d0a05ac1362dff2e756cdb4cb7293ec81d427a3
+EBUILD pkcs11-helper-1.27.0-r1.ebuild 1071 BLAKE2B 4d0d25826aa7d793940481c06936db32c76079afc1a070b13f076fe7f04ac1d6aeb3087f3fe3866b239083ed85a97c3fcd92c4457bc9aef2ba08eb3935a0616b SHA512 d99c56df4a2d9c652cf14edca110f8c43c496bbee70e85f1206e4d670739985b63216427f586e7309e4d35b5e71db298b71556dfde176fdc429cd545f31cfa23
 EBUILD pkcs11-helper-1.27.0.ebuild 1093 BLAKE2B 81a836ac0ce8eb6b7a359f1b858053050aab5ea4c28fa21baed1bfd8a77d327cf570201d82fde663b9b89eef9963b6545a46b162bb738370de7ec83a9341a12e SHA512 1d80c3b9bfa79d93609c44f3bd37c9ffe1607b2d450bcd406502fdb1de08ccf57092401587de4fd123767992da7b7994bbd9fa937a516cc3b2fd59167b440d84
 MISC metadata.xml 435 BLAKE2B 7740f428a33cecd516c6cfb96de878c8080b2cba0b42c78cc34bac42d128619cf4a42b966aafe30bfc13a045ad0017285ecff9d60d237eadd715fcdf6029c8b8 SHA512 2a9c9d99cfcac14b7c201d5d931f5d1fe0d544328f32db5048a9cd15f0a99ef4016e4b5ec4391500cb5a9e3c00205c72211c61c1fc13cda330faf6b7eb9eeea9
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0-r1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0-r1.ebuild
index ea71073fb0c1..cf2c626c5acb 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0-r1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.27.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${PN}-${MY_PV}/${P}.t
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc gnutls nss static-libs"
 
 RDEPEND="
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index 1b02c7cbc2cd..7fbaa6105177 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-wayland-protocols-1.3.0.tar.xz 39052 BLAKE2B 4024ac8c31c1620eb88b027084e9219368f570719cdb53ccff30594de7ebd5e0c01c8baf580d9c19115aa4632bc960fd8e44fd6bf97919e61faf24c1a43fbfdf SHA512 4c0466bbbe07399d4c54d4f04d7bee92826a6009c61fd7e6898c04d12e906c68fce25c520583225aef18737071b71b85814070a769a4f00e2a71b709568c1695
 DIST plasma-wayland-protocols-1.5.0.tar.xz 41488 BLAKE2B 1235506ffb69fdbabd2d8a0b6c9b477a50c83431571b000a10907caa16b178ddbe628d63b4fdf2c98905fdb8a8fdd0699ca13dc3b718ab672b08719f9f434ea3 SHA512 bec83ee401e71fff3c5a38768034b0dfc1dd191af634b9ffa765bf86d9c14143abc2c5abd743dc53cc6c0aac1dbbf79104683c9ff5c6d880b03e71399806a6d7
-EBUILD plasma-wayland-protocols-1.3.0.ebuild 456 BLAKE2B d113741fb4d0489f54d7bcd634fdbc5ef5cf68548e9205d949f4590289cfe7ef45871aa347fafeb7aa43611d14a62e01b68cccce084da258a79ebee20088d59c SHA512 63cda578179f33820fb8710b663fca6fad11f6a67b73790085a5f5cca9d60273383789adff1b69464a1d742ed28ccea00321791861ef8baeaaa0aa317f38ebd7
-EBUILD plasma-wayland-protocols-1.5.0.ebuild 459 BLAKE2B 6d1c31c6ab31cc8250475f5f9b43082091cad9fa7511c5349f35ffcb6bdd8836d5f1cef24838332da089eb49d49142173bf67fe06f5dd74f351114359e6293b6 SHA512 8b6fe8f00086bd7267569e9bff734aa9c9a58a500b4c66bce5f1597b1e043e6705352ebb69556970352a93bc558de7befeae8047f53008b6b5f175d0ca6d2f38
+EBUILD plasma-wayland-protocols-1.5.0.ebuild 456 BLAKE2B 425946fef6cfee0f1cccefb45d8707eafffb73dc52da77e0c5a39db71fb4b3d6827a80b98c2f7453924a0654474d66ff66e032a5f2ba2a572a64980814826e43 SHA512 b04df25f624c2317b93d7e985b21f19c00e1aaf31ba0a744a71ff96c6bc735cee639a5ccd832be1e62259438cb8fdf7b90b1a2f214216e6139921dfcc6120c74
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
deleted file mode 100644
index b0b60287dd8e..000000000000
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_NONGUI=true
-KFMIN=5.69.0
-inherit ecm kde.org
-
-DESCRIPTION="Plasma Specific Protocols for Wayland"
-HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.5.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.5.0.ebuild
index 2f7cee93c893..ddaf7dc1bcb1 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.5.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.5.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 71cb1560b15e..820f7410028f 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -16,6 +16,6 @@ EBUILD protobuf-3.17.0.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009
 EBUILD protobuf-3.17.1.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
 EBUILD protobuf-3.17.2.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
 EBUILD protobuf-3.17.3.ebuild 3756 BLAKE2B e6c40342fa60a698262bec36941c120f32db5eb67d751cb9f3b28ff066a88f4f4bc78220d6881d486bcd665f6418edb474fea727675fcc47c2e6de3cfa5bc8e5 SHA512 56856012f7a731f0a3338070c7c04107e6088fc8f20ce15fd7736ff07e8980073e85f99f78f67b414410a9d8788ca7d939e66ce1ec3e4a39af86fb07947a8029
-EBUILD protobuf-3.19.1.ebuild 3713 BLAKE2B ee6effc25e72192a28a3c49532b8567f21fe0fa3f9f8605a24c99fe8994d96429192ff7ffd974aea18d7235a32e5462ad1587dc3605b44eccaf167f0cc517535 SHA512 4b2f0a9722e93bc004e200918dd948971313c187c7818e915b7f7a0da9386a1956234cdabb936d87838212f25322eea165808fd26b15b57833789f5ee2f2486e
+EBUILD protobuf-3.19.1.ebuild 3708 BLAKE2B 1f596489f33c626c5f5b465b49bbe98cc640eae738e226e50347a616aa1892979090f3dde82e0d56b78891ef8ea32e80d8a579a881c6e44cdc69ef787813cab0 SHA512 5c48ac0105ad5371e2cece05ff3b67366a8aefdd6f6895cedc9d98e2d85124903281316527f543bd5991adcac0243fd6481a622439f53f2f2a48aba8ff651df5
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 8819fbde3c69e3455be70b5c800fd31d3095c4616c6e5e2f0182e88f54e78e52c9fa2bc7dc94fe7552b459c286b00bf8a357325fc30fc26af572f45f174bb4c4 SHA512 52999f41a6dac48b6ee5c76c2172bb37b48b8994f6c4cc568a5ba2a93c028248320c25240a1e7dacb5e5c02c75ac6571ddec8722e30231face8ac9f352901a22
 MISC metadata.xml 623 BLAKE2B 0073d736a4b20a2bb9d49c48e0191843286c8c09553a8b662e64494b0674fd8d1b411a7fdbb85e088783cac04af5ab590f9e7ee99027197f37270588a005caca SHA512 a242b229d34554e31aed2638e2febade4e1c3df86c2bfad87fa42d0be307a10a90d94e92dfbebed6ff6a50b3724b7a9a274e967a81bda8a6ae4b3eddb4c23a71
diff --git a/dev-libs/protobuf/protobuf-3.19.1.ebuild b/dev-libs/protobuf/protobuf-3.19.1.ebuild
index 40c652ccb9b2..04eb1c53d8ad 100644
--- a/dev-libs/protobuf/protobuf-3.19.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.19.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/pro
 
 LICENSE="BSD"
 SLOT="0/30"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 35610647be98..353b12ed1c3e 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,3 @@
-DIST qtkeychain-0.11.1.tar.gz 41001 BLAKE2B 155ca333d403e6ad91c2f733dec06e7957d3998c8124156cf33ea9b79521a6838e9c5a317b591897543b820d436d89ce3eada6425318d801834c133b6c55c982 SHA512 45551003000b8ed76d44767c54d18dcbb956d5aeb63d8bf2f0fc06c61eab4d7d2e70b894e9c0729722dfcb5004f818f4f4c9a413444fc2aebe0271f104b500e6
 DIST qtkeychain-0.13.2.tar.gz 43494 BLAKE2B d90799df83e8bed7f4ee9cdf6c7f56c86b1aee7123735963c4e2f858a69bbf28bcd062c6a302f8687626b1884acde61d7f7882b985517b24a1358b57ea13cdcc SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb
-EBUILD qtkeychain-0.11.1.ebuild 912 BLAKE2B d3aadb60a1d4f2bb71e5c375e295b52604d56ba985f7c1deffdeab62cf5fb2a6bc1251aadf2ac165b257fa8365f9c6e9624f6e02db0322127b173a0a4a793024 SHA512 c1a328752f37c523e5f9425d9a15110d9bc24fbc6759b99d3fc7e60a2bbc36472321d3f765a8c55f76fe6536011c5857cdda6e5bda86c462132e0b38b059979a
-EBUILD qtkeychain-0.13.2.ebuild 897 BLAKE2B 3091fb7dfc4aa11a3301b1c8bb3d947f92f7fc4300baf24e2e31b3e77f4a28883a69302ffc9b83510daee5ed38894ccb067d6b18fe5fdb4756a2d8ee8cacd106 SHA512 cc2d4ca3d7f8011d4fab6a8a7a61d3f14a7374077450d1f47d44f3717ebc27a8aec40dd35f87bab220c7a84c5deddbfc3b25d8e76225ed777a2cc9fffa213fd4
+EBUILD qtkeychain-0.13.2.ebuild 894 BLAKE2B 673229b19fa2b9130291eea89e26f31c317e21acd0c4ac8ec9d94afa85cdc8d6d621a566e3f1ca773bf085082b0c638e53d6004ea89c2ce23cfedc91f6f51ace SHA512 37b37327773ef66fc79a4e4cb5898feecc88791fd5be8ddf00e99c6dcdf88d37b7165210fa7e30c8d1b0b1fb9090ca851549a116e1ed6504cca6459b0dec961e
 MISC metadata.xml 340 BLAKE2B 4ae9796b7c395cbb0dc0c4a06d203db9a270ec00dba635bdeb0f46b350fffd3784f98a700f645238824cf6b474215c1cbed4c1ede1df16f47185598c81de5610 SHA512 3bf8c371c3268190a04f67f2213b89efe9f1dad96cbf2ee5ad3d112d5ea6b164ccbfefabaed55a6e0cdfa3e4bb06d6e7959b88513567a1d619aa1138957c5027
diff --git a/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild b/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild
deleted file mode 100644
index 168255e0a6bf..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-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"
-else
-	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-fi
-
-LICENSE="BSD"
-SLOT="0/1"
-IUSE="gnome-keyring"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	gnome-keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog ReadMe.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT4=OFF
-		-DQTKEYCHAIN_STATIC=OFF
-		-DBUILD_TEST_APPLICATION=OFF
-		-DBUILD_TRANSLATIONS=ON
-		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/qtkeychain/qtkeychain-0.13.2.ebuild b/dev-libs/qtkeychain/qtkeychain-0.13.2.ebuild
index 3cef787f6509..c8d2c178448a 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.13.2.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.13.2.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 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}.git"
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index e37a98668900..47b487c9e9a7 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -4,6 +4,6 @@ AUX rapidjson-1.1.0-valgrind_optional.patch 814 BLAKE2B c12e3571050eb63da3e02eb0
 AUX rapidjson-1.1.1-valgrind_optional.patch 868 BLAKE2B 39e46efcd4ebea2f85b40531e46bfcf23eed894e93b6fe4cd8fcb7ac8c614d5e6e98c21c17304f3cf6c7c6415eadaa32b4c496f559f07fd56870820a027dc2c1 SHA512 a71016e4dc17d40afe18ea84c915ff52ce78a28c8e9a0d10342db34954993e2d65dbff7059c6683837334414c73ade934c805d0fa3d758358f7b236d1b57371d
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 EBUILD rapidjson-1.1.0-r2.ebuild 1196 BLAKE2B e1f709ff94d5cf7cb1c581cce49415cc76e221f8a2134e5b7c3f2ececd39aa7ac86e945653e331523675c02ace4e1e2256221d700141815a83b61b8fc94ca01f SHA512 e4fab2177decc21c90598409eda202ca59ed4b2c8e99e920ec8ecab72c2a5f6aa30cbd3064af6ddd6f7e388f8523a61cb38d3ecfd63a6af02d59b3aeb02f1189
-EBUILD rapidjson-1.1.0-r3.ebuild 1369 BLAKE2B 8fd5b2ab67949d2dc6cb001f12a68d85a8ff4b2be80773bbbc1d71585e17a6eb1d28215c5e8b7340f46d5c188c9bd15c0f189ca4363fcaa5936831419a035972 SHA512 88d005d80f8e3c8dd6ccdc43d586cf286bc26245909456f0c36239921b6f42a5e10386818ef7ef6413957a554f097de44083ecab18695d22df3aa98d201e7f5d
-EBUILD rapidjson-9999.ebuild 1341 BLAKE2B f985212651256604f3e2ef7c58581dbc21d95c4b2d53a25847a70403520956b30b87cc3d9d18d316004d8dbcce96b906aadb7bdb28a8b15e0d84f370bf500b6c SHA512 0c4b5c74f2510a8623e09a2b10a7e564ac1cda70875d061ef2a02e4fe0dfe219b8118295c1a996399e00a9919f2af4cdab77e2a100fbd492a6efd74280183302
+EBUILD rapidjson-1.1.0-r3.ebuild 1400 BLAKE2B 2c93de56c2c9702399657a515fd13bb0ee78b23e3a17d153322f312d82c877a93450f16ff4ac0983180a15b101f0d8eec145a6b367ac2a9df120adf4e6dfd4d1 SHA512 37966fcd469fa7ff2f6b975c6b4cc77289b08769483bb3f61c843bd12e8dc8a43597cbb379f77f4c52322dacd5e19861234dbf3d58abc3d48483bbf6936e5628
+EBUILD rapidjson-9999.ebuild 1372 BLAKE2B 63ce9fe9810b4634c309033bbc6d1fe8dfec760054bd729dee5fd09bd3fcade93b01e404bf8668dfd9ee796d5ffc1c7834b2b1d67af8fceeafa2a037a776c640 SHA512 e73764145a92116b5bc65d4c336f775e4ab142b560d9ec26b9a63b41d688ac4579887b8da9b720142ee05401d9460bd4c9aac89db01bb2edf6f23a341a11a15e
 MISC metadata.xml 396 BLAKE2B d177f4924bccb6e3900f0c431d7924334b0b22fb29463afbaaef3f0277aaa762829d1967c5159fee70785cbd650e00386e7085e74ed46f5636a4566f21247e6e SHA512 29f756f76db339ccf8367aef394335a2ffd158f83d6f6babb48ec3eda39b078125b10741e8cd5e87ea136bac243b0df77816efb7ae1ce01ee0507ed0c8e82ae1
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
index ac4033ac66cf..da68858dfa4f 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
@@ -48,6 +48,8 @@ src_configure() {
 		-DRAPIDJSON_BUILD_EXAMPLES=$(usex examples)
 		-DRAPIDJSON_BUILD_TESTS=$(usex test)
 		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
+	)
+	use test && mycmakeargs+=(
 		-DVALGRIND_EXECUTABLE=
 	)
 	cmake_src_configure
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index 081c33172b8d..c13c44dc56c8 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-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
@@ -49,6 +49,8 @@ src_configure() {
 		-DRAPIDJSON_BUILD_EXAMPLES=$(usex examples)
 		-DRAPIDJSON_BUILD_TESTS=$(usex test)
 		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
+	)
+	use test && mycmakeargs+=(
 		-DVALGRIND_EXECUTABLE=
 	)
 	cmake_src_configure
diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 322ba200a1f6..24928e189b84 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,3 +1,3 @@
 DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
-EBUILD rasqal-0.9.33.ebuild 1706 BLAKE2B 5ff1bca830df27e006e7d83d8bdc205b7e886f3ba2163b25198278bb1dea7254bc45dee32ab7f5bb7e0ab9db5e9b81e43b09b74a7c562cef5a5449636fde6271 SHA512 ca88a54790168ed62ea58e34de676a3b142eda261ce8630429a6158f24935e9767880f23775ef8b5738fc9056b0a96941d66cb23683db0003933404de6f80db6
+EBUILD rasqal-0.9.33.ebuild 1713 BLAKE2B 8bcbe9460ef384e6f7e0aa392aa5ea825f7c4bd85b734a9c9373bcae3a5668c7899c1e2ef1803330f4457fb1520c10e4be67cc03da5fb32c267cebcd8003ae65 SHA512 ae936d1918e4281ad424663013b594fe9b415c7c35215984edbdcec7ca42fb1fd5e8b214d00c4e78f08dc85d1d4e321e779a57824db4e0a0ed6d4d405eadfdd8
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
index 78ef01d39a04..83da546435c0 100644
--- a/dev-libs/rasqal/rasqal-0.9.33.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33.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
@@ -11,7 +11,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index dff5730e08be..0f4d2441ac53 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,4 +1,4 @@
 AUX redland-1.0.17-mysql-8-my_bool.patch 462 BLAKE2B f1a34d640698149b45a6a23c961690c79c02760b16c1087a79c27e8443cb956e953b02f9d435176c890500e4942cd37fe2c0105295490a3f4a629a651146fe33 SHA512 c796f5b6a3231a150310a889890137a7dd510cc75c8b80fead9db3c8fa4de27a132c58ad261188a6c6359f1debcd9b5ba273b7af4af3242035d4f6bc12364643
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.17-r2.ebuild 2530 BLAKE2B 67e24da1de10b664242284fe8da55f9f9dd6820de0793542716c50a49f7776bc8bf0eff52ee1ae694f73fdcdf582d72f099bd2708418fb90992c7fe990e2d41e SHA512 4599e7aaf32e21612498851647cbe6b8ea5f40df746c6230bc9cf21f6d6ab3f654189ba853a83e44a3d2a8660d3f7863978dfa26a9340f1633538fc579aa1c71
+EBUILD redland-1.0.17-r2.ebuild 2537 BLAKE2B 8810955d4024ad3bc65d84e297903964be5d0d97af1d1d324acb7b5a0ecbcdec5e51b7f1113cec5b683407f0bc5e9ce59ecb71246639dce006d709fa33856122 SHA512 a6e5e9650cb1de3446734696406d2d959f709b0db13d9dbd4fa2fa954d843c4d49c58aa2f83f28ef48b40973e49867a9e4646cf63c342d264ff7b7998dd97a57
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index 4b5f75099a81..598623f138bc 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/rinutils/Manifest b/dev-libs/rinutils/Manifest
index 3bfb0883460b..680bbf66c27a 100644
--- a/dev-libs/rinutils/Manifest
+++ b/dev-libs/rinutils/Manifest
@@ -1,5 +1,5 @@
 DIST rinutils-0.10.0.tar.xz 17268 BLAKE2B 2c651b70295d10690ca76bf1349ce83728cd5398fe4babf821ee6a0d61d4c7d107c6c68595e19a841fb5baaa0057237357b3917acd61c02599781bf0252fd512 SHA512 d3780b34b4eda4658f65cf7555553430441fcd45fb2d4fdba22a8f48c0df09c6c0a4e9543262c797c0602e2f9bace2d3f41514ae202ee13183286c9fb1f38677
 DIST rinutils-0.8.0.tar.xz 17112 BLAKE2B 362cf1e00092347e17a2a7da259316013af19f66ecb435b9e061355c7e3797b695b2334c86595380e70b6ea168fa50d4bcb055e75fa407601368d5a869a6d721 SHA512 06bbcdb5092762bf2ed92d4082eca17e8dc0e822ce8634f8ec8782fe7eccb4b954c081dbba3f1e2f72e0285607a813f020d4277af77accc43135bde50153359d
-EBUILD rinutils-0.10.0.ebuild 577 BLAKE2B 6e0ae3704878aa80b51dcc2b5eb02b42c762c4e3656c2636565ce75147c1bbcf9d8c5a621fd5b488e1d6e6fd70e6275144188304a83c0da7ef6e014fc42bd499 SHA512 ab6dddfdb2ba5c4378b5d041672ac40e025ed60f8997e9e2d00cca2a7ff6eca13526fa5bc0bd972057ccc0fedc0c16c833ffed71b6e48ad603689014582b90c2
+EBUILD rinutils-0.10.0.ebuild 574 BLAKE2B 5c5e80e6d6ea8f11d53cfbc150d3d7d6d0193158ac7cea68aec82dd0db3ba052a618518df5277201e42d3b13160ea34c8da28c634d1c85d9238d026b0684ee26 SHA512 8507f335499f14fc23d5ac82fe43d991b2b26a76a3213ae4f4e26248fe0214304467555a5eb5ed7e0a0c15d71dcf6e122d327f403a73d239866a82cbeb4c74f3
 EBUILD rinutils-0.8.0.ebuild 574 BLAKE2B fa7bdb165e681f21f5ebf05cf10f6f0ec058901baffe51a3f0d07ec66fea819df45cb17263a14068136e782e5aaba0a6a935bfe57e7ca33d2b7483956818aedf SHA512 e3d190b0156fd781a7167dd29a2665a0c01b075134cca9d0f74497ce7509ddc3923511536c1b995ee22df9f1a25390a19f65395b7d415246ffe774c2903a1477
 MISC metadata.xml 331 BLAKE2B 13bfca0ccb2a90655ee3b9c9ed39a893bdaabc7a9155e6cdee251f26ac5eaba68120b75a62ada42e2dbfae6aa1b007891ead4474cc3f7cfde0d5ce0b53c9ae36 SHA512 771495cfe5d20f7033d45ca1cff49be98d5b1c11d75b29a8e9ddea47a986c6567ca6662290def45fe7a6c6f3507372f8865ee8d3a9e078175e2aba755d561069
diff --git a/dev-libs/rinutils/rinutils-0.10.0.ebuild b/dev-libs/rinutils/rinutils-0.10.0.ebuild
index fc60f8875451..090feb7a7fd7 100644
--- a/dev-libs/rinutils/rinutils-0.10.0.ebuild
+++ b/dev-libs/rinutils/rinutils-0.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
index 4c1261a970f0..547e889f898d 100644
--- a/dev-libs/satyr/Manifest
+++ b/dev-libs/satyr/Manifest
@@ -1,3 +1,5 @@
 DIST satyr-0.38.tar.gz 433626 BLAKE2B 682d28a932758353e986d2906baf294183756d60a063ce03ba79506b58c92e4fc039c2246c0d43910f6d27d62dd674ffd3b772eeb6e8de46d8080735754b3d3a SHA512 09168050ca7bae00fb3d39f23f8c1e0adcf9cc4d3e491aa002bf9a0a7a265df980d12e430ea7f3eaa9010e0432821b106db5ce3b1e8d935d78b1e56d37110051
+DIST satyr-0.39.tar.gz 434581 BLAKE2B 7b4e11d8027877aa3b9e8144f8917f03b489b157c1112794a3c2bea9998a4367a7ec06cdec6c144fd96ecdabc83a85c5fb2644df02d59086ea3a113b1402fabe SHA512 f6d24ae054867ccdbb2dabdd63c6b351f7eec9ffe5426bdeffa86d585a52d13b07dd31e26b7d14e4850a1fdca748b0d5e23bb51fbc2843af79bf306f09d3145f
 EBUILD satyr-0.38.ebuild 1907 BLAKE2B d10c50fa965196a2ba4ba6eed912e0d2a3c0e586659f6c6a82634790b458227c68752930a45f011bef9466efc10e5cdb85fd4b5c10265f436b659f229d2e6388 SHA512 446133195a7f681e2d344f60959539d9257be1b1d1f8f2c2b8297c34ab9b4f885d5e66e06da5330486284211b81abe2941257b12beb6f95e7e37da7f3661de8f
+EBUILD satyr-0.39.ebuild 1907 BLAKE2B d10c50fa965196a2ba4ba6eed912e0d2a3c0e586659f6c6a82634790b458227c68752930a45f011bef9466efc10e5cdb85fd4b5c10265f436b659f229d2e6388 SHA512 446133195a7f681e2d344f60959539d9257be1b1d1f8f2c2b8297c34ab9b4f885d5e66e06da5330486284211b81abe2941257b12beb6f95e7e37da7f3661de8f
 MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/dev-libs/satyr/satyr-0.39.ebuild b/dev-libs/satyr/satyr-0.39.ebuild
new file mode 100644
index 000000000000..754906da9469
--- /dev/null
+++ b/dev-libs/satyr/satyr-0.39.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit autotools multiprocessing python-r1
+
+DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
+HOMEPAGE="https://github.com/abrt/satyr"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/4"
+
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	>=dev-libs/elfutils-0.158
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	dev-libs/nettle:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-util/gperf
+"
+
+src_prepare() {
+	default
+	./gen-version || die # Needs to be run before full autoreconf
+	eautoreconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	use python && python_setup
+
+	local myargs=(
+		--localstatedir="${EPREFIX}/var"
+		--without-rpm
+		$(usex python "--with-python3" "--without-python3")
+	)
+
+	if use python; then
+		python_configure() {
+			econf "${myargs[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	else
+		econf "${myargs[@]}"
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	else
+		default
+	fi
+
+}
+
+src_test() {
+	local extra_args
+
+	# In order to pass --jobs to the test runner
+	run_tests() {
+		cd tests || die
+		emake testsuite
+		./testsuite --jobs=$(makeopts_jobs) ${extra_args[@]} $@
+
+		# Only run the python bindings tests for other python impls
+		extra_args=('-k' 'python3_bindings.*')
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir run_tests
+	else
+		run_tests SKIP_PYTHON3=yes
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_install() {
+			default
+			python_optimize
+		}
+		python_foreach_impl run_in_build_dir python_install
+	else
+		default
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index 0687b9bfb3cb..bc9a43cff763 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,7 +1,9 @@
 DIST sdformat-9.2.0.tar.bz2 644484 BLAKE2B 2f6382414bd7d47bfafb66c8352e5a90cd236bdfcfc7c3119eab154b8d0bb5fddf2127b16e222bb90326dbf91f95b111643eede17ebe38f27bb164cf31d7f263 SHA512 bc9422207f56d7fd5f53249f856be5fe00f078e168d7e93ab10f5544e4963888cb7c0a1b1f449739e2490b0d5aad3c5a72d8408333dd6ae550b5d66f6bcde42a
 DIST sdformat-9.3.0.tar.bz2 648239 BLAKE2B 3dfedbcb7b52d3c9384f7a4b119b3e664b9e6bd6bd93bc5ad7a5db4228474bd3e6f8d98d1fd761f49386175e45b7083b57cee02cf4a930e19ba8ef78187af71b SHA512 16ff7643baf5738a1a833f1484c79566960c9093c4a3842ae82a14faca14feef34e7293fbc78c0fea78e8a1b1b9710414587ca5260c17562759df245d458b942
 DIST sdformat-9.5.0.tar.bz2 651125 BLAKE2B 08ca0e9df9620345905e5307b555fd72c106a59090b7d2fd8fb9cc32198d07fa31fa64e60a25dc47844ebc279bb6e3ad78e457e6ba563158404a3198222d08e9 SHA512 b96797df2a7f43b4d426673fad7dbc0a5e20a846a66d804c7c3eb01ec008b52f8bc119ae1e6062a4a748240fb7172c909fd1e66ac3b52f3d01bc5a347d734908
+DIST sdformat-9.7.0.tar.bz2 699483 BLAKE2B a7f831fa42cc6371afaee47876bee5d2b8e9ef3b05a9fa8281e1746d0b038fb75b0f96d5e84b615b114a25424de65be08dbea052a53813d01b07ca8a1c0d08b9 SHA512 8b05dfaa47dea7cf55dafbed828b3c361f1c13f368fd4ac50cd35c1be859e401bdbd500a79286f7b8b0e6bac04f92a4c406e910a22aa1a9583aa8ffb660c1f89
 EBUILD sdformat-9.2.0.ebuild 952 BLAKE2B 6f46f1735ee83f84243dfd9332cd394726bea3013373c59511838e83f4125bb488eb27046ee367daea372be35c1e25d30dffbd4a3d0dfe61979290c99fdf48b6 SHA512 1f7e0a34746133bc8faaa549d462b4f2d1027a3fc89773183a9beed1f39c67211e6f6c503408e3b9fea343a364730ad01f47afa8a01547b48badb8ed402800f0
 EBUILD sdformat-9.3.0.ebuild 952 BLAKE2B 6f46f1735ee83f84243dfd9332cd394726bea3013373c59511838e83f4125bb488eb27046ee367daea372be35c1e25d30dffbd4a3d0dfe61979290c99fdf48b6 SHA512 1f7e0a34746133bc8faaa549d462b4f2d1027a3fc89773183a9beed1f39c67211e6f6c503408e3b9fea343a364730ad01f47afa8a01547b48badb8ed402800f0
 EBUILD sdformat-9.5.0.ebuild 952 BLAKE2B 6c79ad8f8f87fa02dd88f32d63477134198f136815a12cf7ee03033b916575a11b8a93e83e270c69a35a0e7b49f7f69a75b673afaf459b746d522d970213bebd SHA512 9d8a6344d42ba5583faa6c78a57929a8c95cc4dc60b075ba56ddb3f332237bfe52854a60d2222dcd3673242217b023c54202e32f9261dabfdc0c522c1f98f9a1
+EBUILD sdformat-9.7.0.ebuild 952 BLAKE2B 6c79ad8f8f87fa02dd88f32d63477134198f136815a12cf7ee03033b916575a11b8a93e83e270c69a35a0e7b49f7f69a75b673afaf459b746d522d970213bebd SHA512 9d8a6344d42ba5583faa6c78a57929a8c95cc4dc60b075ba56ddb3f332237bfe52854a60d2222dcd3673242217b023c54202e32f9261dabfdc0c522c1f98f9a1
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/dev-libs/sdformat/sdformat-9.7.0.ebuild b/dev-libs/sdformat/sdformat-9.7.0.ebuild
new file mode 100644
index 000000000000..7e9289e7fc28
--- /dev/null
+++ b/dev-libs/sdformat/sdformat-9.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# subslot = libsdformat major
+SLOT="0/9"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/urdfdom-1:=
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:6=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/ruby:*
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_configure() {
+	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
+	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
+	local mycmakeargs=(
+		"-DUSE_INTERNAL_URDF=OFF"
+		"-DUSE_EXTERNAL_TINYXML=ON"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index fbf3d7243086..6a19f282465b 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,3 @@
 DIST serd-0.30.10.tar.bz2 586386 BLAKE2B 7f84b425a9eed36c5b59b22b8fd2cb9139a3de2bd1a47f92fd9888c433d931dcf83f13c2460d821c04f4244a79aa4330ba973017508ecb5f4564e78ae45b9b9a SHA512 ed7b49abfd3dc3a724b047f5f0cd07b811596330c96d91c0ce90540440f03260e05daee76c3ccccc3d4ca39afbbd4f3d07decbb601730e90c133a09c640c0006
-EBUILD serd-0.30.10.ebuild 1165 BLAKE2B 8f749c6105e90111f78bce6ffb1913f0c5cebf970d724e9c9365c75009d6cc7dcf752b0a5c3afa9eff4fbc42dadf00349258caf4da91271b340b729f671561cb SHA512 7c0977d9da129ef5c5783c782f9444c1e0581664cf2c333a1127defe93dc10bd65a3084411c38a42318b3fd35d487f7c17991ecc8214dc76281b75815f127d7c
+EBUILD serd-0.30.10.ebuild 1219 BLAKE2B 0837bb3d8169f3cb341e26d3c174576086883dd84af5e4dd7c3de3ab6e559c2871673febf34a1c3cc7331311ea513cbada5d66b7a562ce7bd0c6614edb5f4a42 SHA512 7d824ed149a697a7b08892d46c04bbc8a3cdaec1b3d7944a6815db2eae684252cbe95288834383331697f03508fd7b5fe71ddb1dc7a00eba4f0cd4d4a5c8fdcf
 MISC metadata.xml 659 BLAKE2B 7d8a07b42b1ca5f3f178fbd8e465d6e594e1005510ea7aa999b4d4435d33269ad7a45a9fc6b70a663895824379a1ac2c388dffabe3d69e877cd2a92b7375b63f SHA512 0d431ac490c2b20d6da92afd0c2e663926bcaa3e1bb4273a0178e969a619988e25184939bf6424c2ffb7ab90813ffc6941534b9ae72d59793b6ad1f4aa15a034
diff --git a/dev-libs/serd/serd-0.30.10.ebuild b/dev-libs/serd/serd-0.30.10.ebuild
index 8301a43e480e..232142dbbb43 100644
--- a/dev-libs/serd/serd-0.30.10.ebuild
+++ b/dev-libs/serd/serd-0.30.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
@@ -18,7 +18,11 @@ IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	doc? ( app-doc/doxygen )
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+)
 "
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 66afbcd5b3ce..4a063c8d9cc0 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,17 +1,3 @@
-DIST skalibs-2.3.2.0.tar.gz 205976 BLAKE2B 01e1694515093494d0d216e5b5f17524118c6fd3f5fe23b775c50055269472a8d82883b8a8a9f40b35c5bc1f36d867a1daca7f279d316b3789fbfc0c56c882d8 SHA512 f5a4b85fc43f49eccf5a2ac2ce5b142afc28fe4af781e59d1ad21a7eb5896075720230391234fcf7879cb29ba2d1624926d8cca77c3925327aa7a9a5fefff91a
-DIST skalibs-2.6.1.0.tar.gz 210504 BLAKE2B 47be3c920d7e0db9baa5982c5e1273e3132636d84767b5a0087bcbda0c18039b0ca26428c1db9a33a0ed5186a9c94860c73aaccd7ecf38da21e56e9b3e5ffb4d SHA512 52db44f398bcc08a2b4243a32254fef87d11f152dd6e9f8fa85dcc548fff5dcd1ef83ffbd32aa572837f344f9a3e4a31f156edd5ad6b4274d8138fbf24213a57
-DIST skalibs-2.6.3.0.tar.gz 224463 BLAKE2B 0b051cb027b2c7335c5b6d581aeb8ff4fce8262b58551a9a0ec87d03148280a66be07a0f589731c65ef9b5298e64be93a5bd2a45818bc131cb2df5f31ac1040e SHA512 4f904cde17fa91070317b9ddd542715c5b4e19a8ccb3ae3b2eb014a782ae66b38033f7f5614d92cfb64e251aa4e97e11c03695f161cdd2b122b61fd3e627af9a
-DIST skalibs-2.6.4.0.tar.gz 226780 BLAKE2B 80d01d3696452b54d0247c8e523c059bb5ecd59fdea0d18a80992c3db70deab935fce13b5559835f98ccfacf81a2a81e8a6b432b67f851a42f8441f7f7ecc19e SHA512 19062853bd9df0dadeceaab96aca9d2a68d93aada7552d306902d1b13c55d421bbff7fd37dccaf1a81d66bbecf43ed2242961fdb7bd51ff22e9b6114c1b2bb77
-DIST skalibs-2.7.0.0.tar.gz 226543 BLAKE2B be626eed2f6b898c3b1cf6026f527730146a5c4175a76e43a2c9e0b22d7063de84378668e7e1c28c183b8ea9e187e92f86a1de06294ab708562f17ae7ae70b04 SHA512 33624b606a0846478e6fde10057633b43e76bda299d067cff269582c252f05108ebf28c539865c7f24b67e99575328fc7789326dfbb2e81bf209aa51445f04a1
-DIST skalibs-2.8.1.0.tar.gz 227598 BLAKE2B d5121299ee13cbc12908778e8fab2eb4b7ec3c6e3ed59fbda29a66e8e37b02dc3639c9f00628274f430f1c49ea1a2fb32459f2720686ee046016c7a6e200bc5c SHA512 d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86
-DIST skalibs-2.9.1.0.tar.gz 229792 BLAKE2B 82102e98ed87941b8653785a3a26b4dec01608d1b8d81b4caed4e0040d50c68ff31aa22f3f39382d8ecf6a646c50d0cdceaef3b79138222527348a85d5a2ae8f SHA512 a85a9397cdb10cbc42fd7ef4984a77802cf8c42abeabc8ff18de6d2e11ff97d950418aeda5f2dd66a04bd30004a5c4608e7cc6f4c7e23b91f56ef1ff59f4b6d5
 DIST skalibs-2.9.3.0.tar.gz 231372 BLAKE2B f0d0b530eab4d0c98346a94af078604d741a6da4ac9625b6b903011b791c16789a8488b562623376bfc1119fca5a2ab1c2dc35b563cb1d8ff36edad2d7793922 SHA512 41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11
-EBUILD skalibs-2.3.2.0.ebuild 1030 BLAKE2B 9a929766737a4e0a0f32fcdfe31d37d6bf1a0a12d921b22f4c25947183b59eff0ae70dc74f350b2043a4ab1b864b763a65014542ed3a69b9ff34672adf465f78 SHA512 ff52e56a44d1ec81ed2e21fb0bfd91e42b88228f19b63b32b843b90b103cfb971e7f9e94086e2afbbe0ae37d64d24aa637a8f54ce7c720f12eed2efefeffc578
-EBUILD skalibs-2.6.1.0.ebuild 1102 BLAKE2B 6e9f79ea36986f7695841068d69eb5fdf791b0dcd4982deb854983e9d2f30b2616b265e51c1b860df6b485d6178d94f9bb1a12df4d240182814d0e7f9aec5283 SHA512 f9afc8de965ca315a935cbccffc1083a165f8d2a6ac1742b431f21b666def320bd5ecad49a02bfa30c64fb97cc0bf2be3a77660741cb60af7c8c369873f956a4
-EBUILD skalibs-2.6.3.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
-EBUILD skalibs-2.6.4.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
-EBUILD skalibs-2.7.0.0.ebuild 962 BLAKE2B 9021ed99abba3ade6a91c7114f82dbbbd67d74e0fe6a25d161899e15c8a3633bb51221dd8a23ee3c71047d006333f8cc2322a01a91ed0bb8ca5525cc0d71bbdf SHA512 99aba2aea0c3160111ad3e405df848f77862a13caa96c654ddfc8a803190ffc8662e064f7a64096a0d3dd41a78f049e9a55265f5e98dcd55043aa6c958e18710
-EBUILD skalibs-2.8.1.0.ebuild 882 BLAKE2B f3740ba8bc67c046903273f9afb3694f8333df95da37fe23a1a52143a0b1b7ebd803d7f42c0adda6ed6271c5782fa4da54e17eb1647df86818c1712a43ff4938 SHA512 4d7e3cf600955a6e34b9c540c24d54ef6de8094cf6ec2082064f1802e7f2adb3d29dbff2cf67674ac743c526b0cdb614053f42c6e49f35f21c00b676a2678f05
-EBUILD skalibs-2.9.1.0.ebuild 860 BLAKE2B 65d7eefa6cadf7f8681efe4a6fc40f3644bae136b839a3f8817e38a576aaae1a22404c0b95a0139bb4bab3ae84756cd888099a17f9fc6c3ffd769acc3af09dfc SHA512 1e5af656751aff2ecb1dd09a81b5208959f0ae80511ff30eb2984680bd337b45a9bd1d16a4e4d949dd4182f6b6ce5aa790525658b5ed773db592f61d805c345e
-EBUILD skalibs-2.9.3.0.ebuild 860 BLAKE2B 65d7eefa6cadf7f8681efe4a6fc40f3644bae136b839a3f8817e38a576aaae1a22404c0b95a0139bb4bab3ae84756cd888099a17f9fc6c3ffd769acc3af09dfc SHA512 1e5af656751aff2ecb1dd09a81b5208959f0ae80511ff30eb2984680bd337b45a9bd1d16a4e4d949dd4182f6b6ce5aa790525658b5ed773db592f61d805c345e
+EBUILD skalibs-2.9.3.0.ebuild 858 BLAKE2B 5024db40b6e36cc0abcf81cc42e8abac9d2aeab566449a8347d19c90443f69139f9071221801c8bd977ae2a487d817c0b9e0beda89fcfd3b62f2593dccb916c4 SHA512 f8443be69d7cef64b10c4ed86110c3f12ef373d793cf70c545a4d8ad943624492102c76b815d669c73977c9aa88a344269792284621db3dc500a30ef143d7caf
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-libs/skalibs/skalibs-2.3.2.0.ebuild b/dev-libs/skalibs/skalibs-2.3.2.0.ebuild
deleted file mode 100644
index 5e4fbf25c1b8..000000000000
--- a/dev-libs/skalibs/skalibs-2.3.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="development files used for building software at skarnet.org: essentially general-purpose libraries"
-HOMEPAGE="http://www.skarnet.org/software/skalibs/index.html"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 static-libs"
-
-DEPEND=">=sys-devel/make-3.81"
-RDEPEND=""
-
-src_prepare() {
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable static-libs static) \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--datadir=/etc \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--enable-force-devr
-}
-
-src_install() {
-	default
-	dodir /etc/ld.so.conf.d/
-	echo "/$(get_libdir)/${PN}" > ${ED}/etc/ld.so.conf.d/10${PN}.conf || die
-
-	use doc && dohtml -r doc/*
-}
diff --git a/dev-libs/skalibs/skalibs-2.6.1.0.ebuild b/dev-libs/skalibs/skalibs-2.6.1.0.ebuild
deleted file mode 100644
index f7134b79e0c7..000000000000
--- a/dev-libs/skalibs/skalibs-2.6.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="skarnet.org general-purpose libraries"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc ipv6 static-libs"
-
-DEPEND=">=sys-devel/make-3.81"
-RDEPEND=""
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/etc \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--enable-clock \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use doc && einstalldocs
-}
diff --git a/dev-libs/skalibs/skalibs-2.6.3.0.ebuild b/dev-libs/skalibs/skalibs-2.6.3.0.ebuild
deleted file mode 100644
index da01456a849a..000000000000
--- a/dev-libs/skalibs/skalibs-2.6.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="skarnet.org general-purpose libraries"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc ipv6 static-libs"
-
-DEPEND=">=sys-devel/make-3.81"
-RDEPEND=""
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/etc \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--enable-clock \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use doc && einstalldocs
-}
diff --git a/dev-libs/skalibs/skalibs-2.6.4.0.ebuild b/dev-libs/skalibs/skalibs-2.6.4.0.ebuild
deleted file mode 100644
index da01456a849a..000000000000
--- a/dev-libs/skalibs/skalibs-2.6.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="skarnet.org general-purpose libraries"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc ipv6 static-libs"
-
-DEPEND=">=sys-devel/make-3.81"
-RDEPEND=""
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/etc \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--enable-clock \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use doc && einstalldocs
-}
diff --git a/dev-libs/skalibs/skalibs-2.7.0.0.ebuild b/dev-libs/skalibs/skalibs-2.7.0.0.ebuild
deleted file mode 100644
index 58829b19d4a7..000000000000
--- a/dev-libs/skalibs/skalibs-2.7.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="skarnet.org general-purpose libraries"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc ipv6 static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/etc \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--enable-clock \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
diff --git a/dev-libs/skalibs/skalibs-2.8.1.0.ebuild b/dev-libs/skalibs/skalibs-2.8.1.0.ebuild
deleted file mode 100644
index 9cbca05c8f24..000000000000
--- a/dev-libs/skalibs/skalibs-2.8.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="General-purpose libraries from skarnet.org"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc ipv6 static-libs"
-
-RDEPEND=""
-DEPEND=""
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/etc \
-		--dynlibdir=/usr/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--enable-clock \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
diff --git a/dev-libs/skalibs/skalibs-2.9.1.0.ebuild b/dev-libs/skalibs/skalibs-2.9.1.0.ebuild
deleted file mode 100644
index 73dd8d6e2540..000000000000
--- a/dev-libs/skalibs/skalibs-2.9.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="General-purpose libraries from skarnet.org"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc ipv6 static-libs"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/etc \
-		--dynlibdir=/usr/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--enable-clock \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
diff --git a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
index 73dd8d6e2540..116469617d0d 100644
--- a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc ipv6 static-libs"
 
 HTML_DOCS=( doc/. )
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 8b4a34b1ea31..e79a2cf5cb44 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,4 +1,4 @@
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
 EBUILD softhsm-2.6.1-r1.ebuild 1017 BLAKE2B a1e514cca56474f94598cdfdfbe40c175be0cb3e2b473d1d1f680d9a2201295d92fe46f918f764de6988ce377ffb9e577ad7437bfc28c0a9b3630ca7d5bc2a26 SHA512 c442ea340ef1917c96a3293483c351812e1f824be0ca6f394b7c0f29318295161f14acfeebda3acd3f86b799552b161093693bf28ed6e42b82ce97b8994c5ee9
-EBUILD softhsm-2.6.1-r2.ebuild 983 BLAKE2B f5a865595cee156a83dbff7c64ac3d784fab85a2ae51c7af08ffd35d8e421e8b57faf9f83038de02ddfa0cca3002429ea60c4a067e08365ae32ba2dae26e2d52 SHA512 42528f9a0dab280e5af1755b05e494bbf4255cc418965e12d7a66ae3f21b120cedcd6e40e326a8c11cd19d1d29cc2d2c6dd9f8d80cde4142a4786388b54086c7
+EBUILD softhsm-2.6.1-r2.ebuild 981 BLAKE2B de147f4cf805c23537d7430421eabb5e8cbc711f4c0a5b2c120cf81319458cee18a5d5d8c27ecea3fe13c3d589efda38b61cedecde0ee08f105fb54a49b9224d SHA512 49ba64706f6108b845ad3d99b696d8224c2e3678c1e23123938c6f53f3deceaa34aab4831420b944d119fda3cddfe570b155f2202e1e5cd9c291c35c00888cdf
 MISC metadata.xml 293 BLAKE2B 160341ef0b3359ef0db3bd7c78fc0fc0cb443d46c3e9d41fbb6b517c86a3f7afb7afee87d1afcf45b65b2e94b89c4b35e5a74dcb6ac4533be8c843d2190f228b SHA512 6994691430cb2953ff999558029f1e210d3b6f335c3637eb3d96e31310d706ca066b9cc7d94859a2a3559c8e9791b4d260decf240bb73401da9b19851b711bec
diff --git a/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
index 6a7ef28681b0..cb48ec27b916 100644
--- a/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
+++ b/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gost migration-tool test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index d35b9f41f2a0..800a912d9dde 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,5 @@
 AUX sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch 673 BLAKE2B cec32a83d67d5d8157f13dae4ba0d2e59e32aeba233cfc76811cf3f66f1d1c2e76d439be40f2de4ea8901da88a5f547e699aa57bc989360ebc31e5e1a4b1e099 SHA512 f4d310e31b1ad7075ad0ebb6d7d249dcd2c773093f36434518891b5b44d43851c13c2d20d2fc9b96f7e85f4ca30a27f7b248300a8ad2e21724e8e4bd100508d6
 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
-EBUILD sord-0.16.8-r1.ebuild 1267 BLAKE2B aad2745047c6c441f69388f849f95c38e8b01a2bf8e519a74dfdb4bad2ea21af82c3e1cfc37ec2c74e1c44eb353d59535ae1abafa8ff37fdae906e1c48ffedea SHA512 7b5a44d14deb6260aa541143af447be49dfe81a9a2faf5a9aa06097adbc434aecdfa596e2b153b039d378d8fac02a27e4d1bb6f7393758b800fa099fc4de3c06
-EBUILD sord-9999.ebuild 1128 BLAKE2B 77268a5bc22cb33548eb443e14cea7adbf3a1789e05c9b8070e0c59c91d7c315a64aa3ba924d3d21f8bd1c32a6408c3cf66435f38f88df77fd3559c02bdf0a9d SHA512 926eb592bdf596e9d1b64410e391b74a4a39ce97695aeb337bf7adfb6bf457a596a5999753bdce53f1c797dcf6ddd7d4ab919693d9f3ecbceb58abed139c3e65
+EBUILD sord-0.16.8-r1.ebuild 1269 BLAKE2B 1673da8136415824f6bcaa5fb6774b4ffab40f095dceed0e84ab201322b73e2c3691a116b63e96e2b1f31c646d790a5e83b0a67afe91fe9597fda116b629f9c3 SHA512 1ce5e65487ed5a7780175433f0de3e1eac1f4f598ad648129c1e57c92aef387411d78d8ced54940f67eaeec77c5face5619ad91a19cea6eafea74e09c03cab6e
+EBUILD sord-9999.ebuild 1128 BLAKE2B f3bd1ae3e1dac7eb242e590dbf0961118a93d202c38efc9ca5d921becc740e3ac05d5aec094dab3bb6270b43e7c9703358ccb48d506c66c570550e6a499a4e99 SHA512 fe1fb72b64d1aa2f1274500b271ad117dfb1ddd35fa7087303eed3dc01123ba0ae8a7ef827e8aabbe69833dac5db14743689852e7d59fefdd183f77e13176f7c
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/dev-libs/sord/sord-0.16.8-r1.ebuild b/dev-libs/sord/sord-0.16.8-r1.ebuild
index 879b669d4ab6..7e4fb5a789ae 100644
--- a/dev-libs/sord/sord-0.16.8-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index ec49a9b8931c..815103371d51 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
 
diff --git a/dev-libs/tree-sitter-c-sharp/Manifest b/dev-libs/tree-sitter-c-sharp/Manifest
new file mode 100644
index 000000000000..cd5e6661fa36
--- /dev/null
+++ b/dev-libs/tree-sitter-c-sharp/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-c-sharp-0.19.1.tar.gz 842687 BLAKE2B 741a6be6052d739b9aa066adce84b492aa48726653a03e7b58bfc6b5e35d6b928b02deb32b568500a156466d39fd430abe1a452d24213ca4f999d01ddc081bd6 SHA512 74b91086d2aeaba5be7932cc2a479040291db754bdca46bd59cb3af8e42b38e9113d99de3b88d4c1dc41227e2e84ee18715a01709af72c374f0b6c8f36cd94eb
+EBUILD tree-sitter-c-sharp-0.19.1.ebuild 287 BLAKE2B 955334d8a5e4f597c84e5dcc24836295e07a5541d0d862ac77b92f2ca5a72979b21590712afcd4abffdb0f22d5cbd697c9dcd1ba0bb1c5f0f644a2db248cc814 SHA512 8cfe6ce538dd8ad974df564cbfc919f3716a2510cbfcf9cc079eb81e0a37fb0570133f0bf06524b20703aa3514bf07ad4698267c688a8561c33409db3719e003
+MISC metadata.xml 591 BLAKE2B 934a0a7abc9d7e78f6f367472143a533e3983a3728e5d1a209eff1e60bff48e458d84bb7ceff8c8711839b9dc1916af3aa05f0eb2eae7e1de8047b01513c72b9 SHA512 d4c8a9261603de29f560314647f4bff68780d070d5f116c92621373299b033490089017a24b8e6844ea9b504a22f94dad1f0ace7283f06d14bba5ed77671f7c8
diff --git a/dev-libs/tree-sitter-c-sharp/metadata.xml b/dev-libs/tree-sitter-c-sharp/metadata.xml
new file mode 100644
index 000000000000..09096aa6cbec
--- /dev/null
+++ b/dev-libs/tree-sitter-c-sharp/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-c-sharp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild
new file mode 100644
index 000000000000..d849ec835360
--- /dev/null
+++ b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="C# grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c-sharp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-embedded-template/Manifest b/dev-libs/tree-sitter-embedded-template/Manifest
new file mode 100644
index 000000000000..afd8588cf6ca
--- /dev/null
+++ b/dev-libs/tree-sitter-embedded-template/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-embedded-template-0.19.0.tar.gz 11228 BLAKE2B 31d2e6afb4ec82db57266f642c8e7ec1794dc74e2b86853f069dc0673b3651a736bf5b86916b00be2bd4ee3e1ae75375b994c46fac5c00a732cee43aa315be4b SHA512 960db15be1e740908e1ee623de1371a82ca13a240cd7dff9f4e8490cad5168252880a2f4cf432e8537fa826585a55a0f1032c1becbea868a6b1971ac480cf839
+EBUILD tree-sitter-embedded-template-0.19.0.ebuild 338 BLAKE2B a8af61c9b2eb4c6ab29d84c16ae572ed517c4a64720ff0391b276fe0195a29cb57982d9d464d07d0be521664d606ab7714e56ac7fbe2a59e739664501a3b0553 SHA512 de89f284d268130813079bdcb1c9548f8a019f5ca15a32b2809fbaccb8a029f0e1e032a8b3624d2f4667e767da91a9c246c4e689632150bbc58785fcf2860c4f
+MISC metadata.xml 601 BLAKE2B d169afb02f016f8d818c627b4eaff9919b429f50905bca27f36b2cbc1f6459a623e6248bce775219a03bc49df3162d7f19741a713975e3369121438a47bd694a SHA512 8bd293144c3490c02b883e57a4858e01ba71d4a783ea461aef65d2187285a12f0860aaebd47071598c4030798a7f5a84b366978d5a768be48340262ebcbd9c64
diff --git a/dev-libs/tree-sitter-embedded-template/metadata.xml b/dev-libs/tree-sitter-embedded-template/metadata.xml
new file mode 100644
index 000000000000..edb56989e7c5
--- /dev/null
+++ b/dev-libs/tree-sitter-embedded-template/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-embedded-template</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.19.0.ebuild b/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.19.0.ebuild
new file mode 100644
index 000000000000..e158f8374e1f
--- /dev/null
+++ b/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.19.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Embedded template languages (like ERB, EJS) grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-embedded-template"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-haskell/Manifest b/dev-libs/tree-sitter-haskell/Manifest
new file mode 100644
index 000000000000..8420c69d7d64
--- /dev/null
+++ b/dev-libs/tree-sitter-haskell/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-haskell-0.13.0_p20211114.tar.gz 834925 BLAKE2B d7cadc960ddb49efa6c439dfc13b674d398a4576fb85fd5ef12b4015049fd629722fe0d2788ab4c0052f1a3a6baa9fe5de925d86f7098495429190871340823b SHA512 db3f2ddd20195521a5a03d6ecf1305dc222343ba54ebdabf0cc68db680553908ce6d0ccba4fdcf9073e4f5187b2a6fae6364bda935167ca8d4e421500a86fdfa
+EBUILD tree-sitter-haskell-0.13.0_p20211114.ebuild 342 BLAKE2B 1f0ab8a065932c5d5a8b1c596988f2e0e2aeb6a1b2981c4dcf068afd6f0ba31828dfd65835c8d07616339e8e93f5637b73415d77ddb50d1e140d34c2913f56e1 SHA512 fa96c6fd3d0720ae3e8580238c57a76b8f8db5f83c609d3ada52e8e59e11bc382d47cad64e6551a9769c0284c9f3b795872cd1aa99114c263ca6281b660467d2
+MISC metadata.xml 591 BLAKE2B de43234859632c502bf05ebba13511c342b7ff50ad8351b823f9c669e5be5317ebbc97b6695244e48d0aeeb5e15e8c39ad9e99544f14fbd0c9e59c07f8d1c1e6 SHA512 31cb8a6a08586adf8ae4cfeb6083c18d3638ac125156e3d3fc1152b8720351b5e4dcd2cb8c985c4dbc88343e7632b3d9a3b0611362860f2d478642b567b0bc1b
diff --git a/dev-libs/tree-sitter-haskell/metadata.xml b/dev-libs/tree-sitter-haskell/metadata.xml
new file mode 100644
index 000000000000..c2c1fae88cf0
--- /dev/null
+++ b/dev-libs/tree-sitter-haskell/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-haskell</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.ebuild b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.ebuild
new file mode 100644
index 000000000000..f051d384a9ea
--- /dev/null
+++ b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_PV="d72f2e42c0d5ccf8e8b1c39e3642428317e8fe02"
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Haskell grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-haskell"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-java/Manifest b/dev-libs/tree-sitter-java/Manifest
new file mode 100644
index 000000000000..91e159514812
--- /dev/null
+++ b/dev-libs/tree-sitter-java/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-java-0.19.1.tar.gz 134115 BLAKE2B 92b2388d644659fa84646deeff06cda9c1c3bf3dbf6d06bda8e8dea14c2e748813cbaec440a458f98e0f1182e7543ca6a1d4c30ecbd2ba7733e09acf3aeff623 SHA512 71bd34132785f1b95538ce321eba4d6258fff309abf6150852b749336d7ffa5e4bd06f52fb5b6db2e2845592e6faf2ad4cac226289a0078f06cf2fc2f74152bb
+EBUILD tree-sitter-java-0.19.1.ebuild 286 BLAKE2B 68e4ac588efafbd6712ced67283f4b1173e5c3e372764e67832fd17bfb5933c3aec53d7d48bf006fc814af230f08128888519d4e5420a7a1feac615c0e7952f2 SHA512 ed6cf11b1f47cb45e92bae6ab85f26d2ff806470c4c73993884b5aee4c2b9b95110aea0420e52d60b7dd8b43c150279daf3bd1b501a4844f9a373a22ba525d93
+MISC metadata.xml 588 BLAKE2B 88ce9555955c499803acba69db7733648c601a313c72341e7d6d2524c6c5cf2531240bfa8f4bfa434dae5701329962c063541a783afef62ef7dabf0a1b8baf59 SHA512 89656f51a155338c4a5ede3b62af175ce61bc8936f3f3d3012c61889f1062abd0c21aa5c89d960f2f57fab67b8115fa1565df6d995a1df65b20b5594c51f8912
diff --git a/dev-libs/tree-sitter-java/metadata.xml b/dev-libs/tree-sitter-java/metadata.xml
new file mode 100644
index 000000000000..4c98a62d0f91
--- /dev/null
+++ b/dev-libs/tree-sitter-java/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-java</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild
new file mode 100644
index 000000000000..d90c0532fc87
--- /dev/null
+++ b/dev-libs/tree-sitter-java/tree-sitter-java-0.19.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Java grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-jsdoc/Manifest b/dev-libs/tree-sitter-jsdoc/Manifest
new file mode 100644
index 000000000000..dd58986095db
--- /dev/null
+++ b/dev-libs/tree-sitter-jsdoc/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-jsdoc-0.19.0.tar.gz 13214 BLAKE2B 25a8d06201d0edfc3243a0dc178cc2074141f9df24482535c4accb6e23b7493abb7b3b0d7b2a73b5bb25f1d261e214cdab5667c09fe9114f1837012f0fcf3085 SHA512 abffccff5f5b11aebee1226db87fa79d87e675111b32f8d1651679d7d68634201b2d74e3993bc514de03c5b93440e73bdf2ae6c1c879a7dc361c8d6ae550e972
+EBUILD tree-sitter-jsdoc-0.19.0.ebuild 288 BLAKE2B d591d0b8c372deceb86434e9a1bd27bb49de32774ae3c0f7f148f73cc4beda4a3e6880c1dd2144e059cb1c3d098633b6060f77fc691406d7ed145ff0c71f5431 SHA512 a14ba6fad38415b2c070d40240b85ba25325084ccb63430bb68f28d1312c554d8037374ab580ed197769ac65c80708f32cc5e50c818ecf06b32d626939c773f8
+MISC metadata.xml 589 BLAKE2B 5514864afa23ed829ad2f14014189fc48f82d2581f49f7ca2e443981d29010d208ed24c6e53821d9cfa5ba5840f6e0223ff955639a3ab490da91bfd28c66f5d7 SHA512 eae30d7183f1f1a1ed58676a17cc8ce651d7302654f2d62897661c6045fd8ef3d95778894a7f4f5ad08d030bbc56ed5d0a2c99144995ee2bd3007e779f3280be
diff --git a/dev-libs/tree-sitter-jsdoc/metadata.xml b/dev-libs/tree-sitter-jsdoc/metadata.xml
new file mode 100644
index 000000000000..ec13b7ca75b7
--- /dev/null
+++ b/dev-libs/tree-sitter-jsdoc/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-jsdoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-jsdoc/tree-sitter-jsdoc-0.19.0.ebuild b/dev-libs/tree-sitter-jsdoc/tree-sitter-jsdoc-0.19.0.ebuild
new file mode 100644
index 000000000000..def783cc6812
--- /dev/null
+++ b/dev-libs/tree-sitter-jsdoc/tree-sitter-jsdoc-0.19.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="JSDoc grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-jsdoc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-julia/Manifest b/dev-libs/tree-sitter-julia/Manifest
new file mode 100644
index 000000000000..eaa893ac1df0
--- /dev/null
+++ b/dev-libs/tree-sitter-julia/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-julia-0.19.0.tar.gz 591870 BLAKE2B 0a15485ce7eb87f080add5b2dae19004349f3c79a048b77552915ae776860d722d6d6e07422ab82fb932f795285b545fe1b6579824a8f4905fbbdd4b96f16ea4 SHA512 ee3943683413e3d16d60ec1bf1f3cc816011c4d458b5c44d7ce42e5f14c8aa22e35ce07747f0737c9b514fa7ea8b866d4fa6af5c53069b755e0d6d3f7bcc8e2a
+EBUILD tree-sitter-julia-0.19.0.ebuild 288 BLAKE2B b93db5b8625d5235e48a25a0de7860743e64481139cc5930a52230a99dd3e2469ccf86027caf57b4d48b252f0b76b631b25c380e603dc2df496205bc70736fc4 SHA512 be9b1b51f03b43a0006d3f66ce209930fb5011ff662883952324b74f0155f358588a0336e4e893de71cf1fa1448b175b973758b12256bbdc8b4cde27c4635820
+MISC metadata.xml 589 BLAKE2B 8cabdc9290613e525855bec3c8a1b79d4b153d35041c2ce4cf5bd969d97e5642bd81c1595c957ce7dec7fea2c4a07bf148145ce5819ab859f0215e3e8ade4687 SHA512 e8313866f62b7591d777b3d077af71aca77206eb5d733e3ac80e1aceba4171f16fc3cdde23fffcc37b15efe59e3add0e3a9a80567e01ff0d6256dbae6438afba
diff --git a/dev-libs/tree-sitter-julia/metadata.xml b/dev-libs/tree-sitter-julia/metadata.xml
new file mode 100644
index 000000000000..c9980de7efc0
--- /dev/null
+++ b/dev-libs/tree-sitter-julia/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-julia</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild
new file mode 100644
index 000000000000..50f64d0091a2
--- /dev/null
+++ b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Julia grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-julia"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-meta/Manifest b/dev-libs/tree-sitter-meta/Manifest
index a617458f1151..11645507e970 100644
--- a/dev-libs/tree-sitter-meta/Manifest
+++ b/dev-libs/tree-sitter-meta/Manifest
@@ -1,2 +1,3 @@
+EBUILD tree-sitter-meta-1-r1.ebuild 950 BLAKE2B 9a081ac05e3123232fb60b573b5c9c6774ff352bcc7946161f69e713a088b0ed2b49607bce9e2022c660e36e96d63f88616676c58b56826eca58a31f235e1bdd SHA512 4adfaa3d76351a4a94c61fdf50221189545038f962b9c31b52bc34d0d5b0cb0ab7ce1512541f0b42f9ff78a4fb54cebd504a53c3871191b67332436460df45f7
 EBUILD tree-sitter-meta-1.ebuild 631 BLAKE2B 258966b03e18ecf79927eab5378a2e54a9e2358d970078635d51153dc0d167487bcbae9ffb406ecc6e78083e0e04e1673030695d0bde575ae328465077b6890d SHA512 21f4d32458d18bc02aabf9dcacbce05ac81145a5cab4c9b031d8c4787ad878a265cf2bd6c21cb78ce56874a5972d72ba0a5dfb23e926a0f40836639f1dbc8f73
 MISC metadata.xml 382 BLAKE2B 103f3f60a545373c69cb5c69db29e1c48a78251777620b4ee3a90e3e420709403e46c587a2110ae9c744e1d1a754ad69305b40fe5bb73286ee5128a4686ad20a SHA512 1709fc6aa4004efcef3fee80ce1226f1d9b1d2427ae53c8186589360aeda358f8ef629907b89ac7aade02660ec4f2a5e8fef4bfc1558ed61d517dd42a1840c64
diff --git a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r1.ebuild b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r1.ebuild
new file mode 100644
index 000000000000..7a83a7ae802a
--- /dev/null
+++ b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Metapackage for Tree Sitter packages"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/tree-sitter
+	dev-libs/tree-sitter-bash
+	dev-libs/tree-sitter-c
+	dev-libs/tree-sitter-c-sharp
+	dev-libs/tree-sitter-cpp
+	dev-libs/tree-sitter-css
+	dev-libs/tree-sitter-embedded-template
+	dev-libs/tree-sitter-go
+	dev-libs/tree-sitter-haskell
+	dev-libs/tree-sitter-html
+	dev-libs/tree-sitter-java
+	dev-libs/tree-sitter-javascript
+	dev-libs/tree-sitter-jsdoc
+	dev-libs/tree-sitter-json
+	dev-libs/tree-sitter-julia
+	dev-libs/tree-sitter-ocaml
+	dev-libs/tree-sitter-php
+	dev-libs/tree-sitter-python
+	dev-libs/tree-sitter-ql
+	dev-libs/tree-sitter-ruby
+	dev-libs/tree-sitter-rust
+	dev-libs/tree-sitter-scala
+	dev-libs/tree-sitter-tsq
+	dev-libs/tree-sitter-typescript
+"
diff --git a/dev-libs/tree-sitter-ocaml/Manifest b/dev-libs/tree-sitter-ocaml/Manifest
new file mode 100644
index 000000000000..9bb0a12a5fd8
--- /dev/null
+++ b/dev-libs/tree-sitter-ocaml/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-ocaml-0.19.0.tar.gz 1314747 BLAKE2B 8bceac43a40b11b27395a52a450ab734312fbb43cd4b711ca27e629f16599a04cbb55b13a05540ad20f7aa00f068ef57752b7ba42c45bbc75fc87c344133a743 SHA512 897ce5fcb58241c8ec123536ce52eba64698cb5da08403801f4d1760fab1addaced0b3cda5c24460cf2b4531215becf3a6b29c34ba871370b02b467a13b171ba
+EBUILD tree-sitter-ocaml-0.19.0.ebuild 319 BLAKE2B 4aa49f72bcd9d4634076a5495d5c3bdae9808fa8435c12592ce944fd3c524314ad831c936f44d485f1e8a53fdb8c1474179925fd2af30264de9b72bf66ef0b2a SHA512 f1bdfe01a9a52566d6a63c33678393e823330883350c7eab618a1fe5ff7608bedbd5f4c70929bef950f079072d9ba07f73346e1bf39cc21a01ae15c32944464b
+MISC metadata.xml 589 BLAKE2B 835c1f29c9b98a4708d0c3016f27f5fd7e01681a13e0de424b8be5b303e0c5d322ddbbbed82e1b1366f1006bec368d9e6392d33a598092cf788154e37284c5e2 SHA512 9ae243be11018b6327ff783b44348475dbee8fbfa592449653e0c1343d36f53c0f4b8cca2c30acf87b955cee2aeff4cddccae88c35e95351e9f25fb51c08e99a
diff --git a/dev-libs/tree-sitter-ocaml/metadata.xml b/dev-libs/tree-sitter-ocaml/metadata.xml
new file mode 100644
index 000000000000..38ac08cf86e4
--- /dev/null
+++ b/dev-libs/tree-sitter-ocaml/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-ocaml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
new file mode 100644
index 000000000000..adc64bb944d1
--- /dev/null
+++ b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="OCaml grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ocaml"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${P}/ocaml/src"
diff --git a/dev-libs/tree-sitter-php/Manifest b/dev-libs/tree-sitter-php/Manifest
index ace651df06be..3a0f9abcd7b3 100644
--- a/dev-libs/tree-sitter-php/Manifest
+++ b/dev-libs/tree-sitter-php/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-php-0.19.0.tar.gz 155930 BLAKE2B e78b0a719f2e8cde6398a5645023c09135f61bbe138abeff8160bb1688bab84fa7ca51438e380d79fc0e05efa2e4897a7ff05fd677ac0b8cb4098e27d576a10a SHA512 bf82af3a4c0da96f58e93aaee2724f327c11e297bcd455998e0863aa64ab6ae85d1d212afa51b75c8e8ab998568cc71b0309ee3d1d41b632ef0283478ecc5711
-EBUILD tree-sitter-php-0.19.0.ebuild 285 BLAKE2B e1701e36761728a39c3364b58d109a749caf925d7db0b13a866e2fc6cf586cb1ad9b0dbdc032aca714e7ef8826e4d776754c2007d16f3983996aba41803d7a93 SHA512 258c1afb460b7ee40d72c1c94ff208c3f3b533ff3476fabd400e303a6bebb569595e23627c1c5abd9c49f9063d9be8a83221ec828d0318db4faa08772969b5c7
+EBUILD tree-sitter-php-0.19.0.ebuild 284 BLAKE2B 33836d9eed4c3bfc1e34cad53193863f6fbc92486c523e4c713b8f832c9986566b723703cf562a52a2fea426aa81ec0860911254888481998b3853ff4be727c1 SHA512 f591cfbb19333261184f0e7a16a13b948c9bae6a994b1d44139a2b22f9b66df9aae3edf9e958097f291f2dba1666ee7e3025a90bc82f539bf00ae319f70e8a66
 MISC metadata.xml 474 BLAKE2B 330a4df7c512fd53d7c9f93e6a945687d408577a5171ca6996cb8062c85c07b07f13ae4a376f08bcdd656db4680dbdf6eb5e9b2f877101262152394043222dbc SHA512 d1477e7c7edfc5669637548f1a4d76929e71ad431ab2e7a7969018e32c187233de278cb6e9c746df7a57588cb4e97903e093d7b217dcff9701b9e1ee29ec9346
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.19.0.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.19.0.ebuild
index c19e350e35c5..88b916096b59 100644
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.19.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit tree-sitter-grammar
 
 DESCRIPTION="PHP grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
new file mode 100644
index 000000000000..e7d94a3cac72
--- /dev/null
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-python-0.19.1_p20211112.tar.gz 141155 BLAKE2B ee524faca6bebf6c7f27d34ba418c4494877d6cf33a17b4ac0e5c148db58a8e17b2ec8ba992139b72e1fc88c9c93bcdb6a8cbd4a47b9cc65ad3097e08b4ee339 SHA512 25d5b3f8bac1daf8c9971278b8c209f2d953310cd31afd2e375d48354845930e553d0067dd9c0e93565d1996a803d0b5445f48720b0bc7f3d38e73f40cdbbc90
+EBUILD tree-sitter-python-0.19.1_p20211112.ebuild 340 BLAKE2B 8c8f3adf3cde7fecc1228886b2e9bde51e36a16b0bbcf5027c8763666d6ae1748c7f3345ff5ad3308fe7f293a9a964fb00b7f5d6771c2aa01be798ddaf6ab8a8 SHA512 7ef197eeb4080aa48f9576e182381fce2b728a696fc3cb3c1473d0277fb7436e90628b128678d4071586a3a5d299abe81d2c05e24e1c06e0dc8d7f4a072d2ecc
+MISC metadata.xml 590 BLAKE2B 314aa76372b84c4db68d6df9e87c0dc41ee11a581a293204d8d949a01836906ef4cb313723b715a3e5a1beec5446807a0d3be4179d63caee3d9ffa5bfd583d7a SHA512 8030c58b69c07ce20ba3b4004dc3bd47160708ec4546b4a8782a342bb6359b15a0141ff73a0d08d3a3fc8b5275cf894668e49ffbe305fe9e71318e25c9f1b583
diff --git a/dev-libs/tree-sitter-python/metadata.xml b/dev-libs/tree-sitter-python/metadata.xml
new file mode 100644
index 000000000000..64809d1b4963
--- /dev/null
+++ b/dev-libs/tree-sitter-python/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild
new file mode 100644
index 000000000000..e24b3667a61c
--- /dev/null
+++ b/dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_PV="24b530ca158d2782ea9046e756057a412e16b52f"
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Python grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-ql/Manifest b/dev-libs/tree-sitter-ql/Manifest
new file mode 100644
index 000000000000..1b84d8d1b35e
--- /dev/null
+++ b/dev-libs/tree-sitter-ql/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-ql-0.19.0.tar.gz 105323 BLAKE2B 3f19ba4b8f0504eb3857a69ea01a81bf22e26861390cfb964d80c6fb6677edf1c3683e29821f4becd548b4ddcc9a038407c74d945179a63acf3eb3bb7fbee80c SHA512 12ec3c85775dace0d80f426675bf27b06ffd96d4ffe4bac1e3018be911cf97184efce92a6c373ee4198639323a453e21350496074fbfaf82519a972acc763455
+EBUILD tree-sitter-ql-0.19.0.ebuild 289 BLAKE2B eaf913162960b0fd510a9dada333ae6f71ecc06bddb349b7cdecf52f70be2de4b885ff75f37e7e4824ebe9dfc2b963cf4f3620dafa695ea5c346bbae947072ec SHA512 50dd06c54d5a58742c1fb9f6ce5273cf731926b318a5a612a4366fd9dd754dd3f5de3539db99648bbd90e76a0065ba866a8291293237fb75257ae0bdddb77bd2
+MISC metadata.xml 586 BLAKE2B 676766925f94d5bc67849a84ab9772a696f637b7163879e3a3dec4095c89b9a5a2929da60b27da15580da2620c9b31d75c53e0b8ce10b53b98ae68f7a8c6ae0f SHA512 c308731c32af277ec0daa892a112759dc8c627ffb0e13f3586388059daeb66be11c3089829fb6b0bec8a3cd2be4c58f8d32e70a1c7c5471fba60d06c878e0773
diff --git a/dev-libs/tree-sitter-ql/metadata.xml b/dev-libs/tree-sitter-ql/metadata.xml
new file mode 100644
index 000000000000..193359552851
--- /dev/null
+++ b/dev-libs/tree-sitter-ql/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-ql</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-ql/tree-sitter-ql-0.19.0.ebuild b/dev-libs/tree-sitter-ql/tree-sitter-ql-0.19.0.ebuild
new file mode 100644
index 000000000000..64e8ead45e85
--- /dev/null
+++ b/dev-libs/tree-sitter-ql/tree-sitter-ql-0.19.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Semmle QL grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ql"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-regex/Manifest b/dev-libs/tree-sitter-regex/Manifest
new file mode 100644
index 000000000000..d739bc2d8a2c
--- /dev/null
+++ b/dev-libs/tree-sitter-regex/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-regex-0.19.0.tar.gz 17452 BLAKE2B a1a4db494b685c9e4df3dba790b8d4938d604c02c419c040d783aa11093fb1d988f807d002b798ff53e6b64f294df6b24b6774642bb331ad0dc2a9a61f2ad88c SHA512 d2ecc9637f7e130b16103b375592e449f3b58afcce7d284e269ba7a20e96ca5d6c118a8c99819e7c9d0f8d4ceeb139ba493fcf6e001da25610a70030db599991
+EBUILD tree-sitter-regex-0.19.0.ebuild 302 BLAKE2B f4e626c555ae7c2d6d3fefe59edb743043fc9eef0bfe3abeca925922a4578204461f094bb7ec46debeba97b9f7e065b68f2fb230a84e899c7a4919676f1d186a SHA512 5bf9fbe04ff1e795109567b91e6b9ee22a15567c3d8e27ba2c3622ce4b9defb3ae5be7e726d90e56ecc42a165a994625ac53b1435512cda69ca6100fff76b8b1
+MISC metadata.xml 589 BLAKE2B adede0c3b75681f6152e1cbfc86e11bdfb722910dd00c2510e85f31ac41defdb10a2398c35af26562336f481e052bc0fd0f3b2ea38dc1dd5a480cc50b06db539 SHA512 371059d9d132db944f7a5a1ad0b9a025e1cd1c1e8385dd5be96f70c9d3ed5a21d9e2c584d2f7a723c978d0302f58f06363577a586a23cda1acd42148c43ec535
diff --git a/dev-libs/tree-sitter-regex/metadata.xml b/dev-libs/tree-sitter-regex/metadata.xml
new file mode 100644
index 000000000000..a23cbbe1237e
--- /dev/null
+++ b/dev-libs/tree-sitter-regex/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-regex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild b/dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild
new file mode 100644
index 000000000000..8c5c1cd0a4e6
--- /dev/null
+++ b/dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Regular Expressions grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-regex"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-ruby/Manifest b/dev-libs/tree-sitter-ruby/Manifest
new file mode 100644
index 000000000000..599b32abd84d
--- /dev/null
+++ b/dev-libs/tree-sitter-ruby/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-ruby-0.19.0.tar.gz 325077 BLAKE2B eb39ba999ccf582b698138ebb7a7f9cbd949510046460d84e37471634700b0751219a7a266652256225bc6fbdd80340cca38662b180c2314f82c5ed7de3324cf SHA512 dc092b55a73a7ffaf698c784e0a6e8fd115478ce8eb2de00301bb8c2455044a4b7f4cd04ab36eb19401386b55088ad3fba6cb9cce9856b6f607bd76caaf0900b
+EBUILD tree-sitter-ruby-0.19.0.ebuild 286 BLAKE2B 69415d6531792f875c976424dab2282e2897447979ee3ae53d4c2b186d976e9f5b3b452008b592f748da5e09cc302a6531ee83ae6ff079e4edec9ce38cc95f2b SHA512 e4f6da080fc8cf8b56b43fe065f5c1de41ae71d4598a8056679752d34687f8b457f5494413fe55f0feb8a07e216f5ed74e03dcfd3e76ee2990c83d4d8e175a5b
+MISC metadata.xml 588 BLAKE2B f65e4387bc73c2a5ea42d01200905c6baa8c1305f718000754cb9f434792b8f8b899622006a3802f5723a4caf5e49b3e79309f500ae12f670bdc4de406728b35 SHA512 a85270c5c86eaaaebcc1bbe849beb022e2ab8e465087c1e1b0f3279c7a9e45474b36770d5b30e32b5be8e44c338c5428e74c5094f17ffdb35e2e8b186b42b195
diff --git a/dev-libs/tree-sitter-ruby/metadata.xml b/dev-libs/tree-sitter-ruby/metadata.xml
new file mode 100644
index 000000000000..920a37c3ce40
--- /dev/null
+++ b/dev-libs/tree-sitter-ruby/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-ruby</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.0.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.0.ebuild
new file mode 100644
index 000000000000..d8c9f660754e
--- /dev/null
+++ b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.19.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Ruby grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
new file mode 100644
index 000000000000..bb5325d56402
--- /dev/null
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-rust-0.20.0.tar.gz 308481 BLAKE2B cb5e8b210ab58ae0a771deb82f1963a8001310673b44203df20425df443f179289bff29dbab9f58e5450f0d1a2ec377ba7601204ffeac7c461c03be90789fc5e SHA512 1c7283e973f50989980a5a05217d664e87665c5ea2338978deaf0cf88f624c45fde8162848c68bb3b8836d32cbf9be80b1da6fa7aa03fa3cab8d8efb49e3694c
+EBUILD tree-sitter-rust-0.20.0.ebuild 286 BLAKE2B cb0ea2b972649a98f1ba9ea4865090950bef36c95971b0694fcb6f6bb85102c54c116b5d4f30633439352137b55ba8c0971ac34d57e68146eb1c78393d54686b SHA512 0d683371ab4a696625e4583e6f7c4f02c8067d80085f074f678ef82d8c16c3ea4b79fcab47b02c9e240f0764ef6c1e7304e145ab34d1b8f4f0c31692271fda2c
+MISC metadata.xml 588 BLAKE2B f4eba8aa545f8cf0e0582b56774b12bf22aa158ab6f4f54b8c3088e809799eb7df528c51b51a1ecdc55df1fc54619e26b5714833be982baf6b617336cc01c6f1 SHA512 b0008fcaf3f00f64e7f470e462a8e94254e537c4076e053ae172c5a3b67b1a25dd27a81eece8873d66f6a0f2310cf865c9b7f6aa1c70f0892c78bba877d4fceb
diff --git a/dev-libs/tree-sitter-rust/metadata.xml b/dev-libs/tree-sitter-rust/metadata.xml
new file mode 100644
index 000000000000..b82170949bb8
--- /dev/null
+++ b/dev-libs/tree-sitter-rust/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-rust</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.0.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.0.ebuild
new file mode 100644
index 000000000000..b23c7b8febda
--- /dev/null
+++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Rust grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-tsq/Manifest b/dev-libs/tree-sitter-tsq/Manifest
new file mode 100644
index 000000000000..a0a527f8089f
--- /dev/null
+++ b/dev-libs/tree-sitter-tsq/Manifest
@@ -0,0 +1,3 @@
+DIST tree-sitter-tsq-0.19.0.tar.gz 15030 BLAKE2B b6bf4e7915dcd7089d1b536aac6df963638df63d7a9a5e94615eba86da44b8e9a6240699dc237fc9f018598384c05af8730ce7d5a2cdd090a5190f2cc5a582f8 SHA512 2150af3463ca56da50c9212d3830e248c8088ae63e914967cdbf77ca72d535b4f09950f71c2d814844d4bc41fc0df36ac00ae391e579d7be9d6ee7e939ebf2ba
+EBUILD tree-sitter-tsq-0.19.0.ebuild 551 BLAKE2B c253b30c876c3fe2df08e9ab319d4276268ef6a2b3b0bc5bcab15feaadca42388a44c671787413a7d8422e71a741a2186266599f925464658ee346e9d80a1cdb SHA512 4d25bfe0ad482278f24d439c1ffedc812763b3be0e7f666162d8ceabb3453f63a3448d9fedc30e04880c937ad8636f03eb8dd8987648d3f004290e01edf40207
+MISC metadata.xml 587 BLAKE2B b4426339bf8f0b7c3833befb2fe392b322a61977fbccd4c93d75e92d978b271c14e93bad69887010860bd30ab4d990a2182888a0d40cafed42b885bb705b8577 SHA512 d036fb113357a4d7799d388a9c7a2c1caf99478f1dd9de7017f89f268d874fbd2e417a0ae0c004d25c20406e6c805b15fb5bf2397141e5041fd9f8778774aadc
diff --git a/dev-libs/tree-sitter-tsq/metadata.xml b/dev-libs/tree-sitter-tsq/metadata.xml
new file mode 100644
index 000000000000..ee14ccfa4e76
--- /dev/null
+++ b/dev-libs/tree-sitter-tsq/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tree-sitter/tree-sitter-tsq</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-tsq/tree-sitter-tsq-0.19.0.ebuild b/dev-libs/tree-sitter-tsq/tree-sitter-tsq-0.19.0.ebuild
new file mode 100644
index 000000000000..30c1ea20d279
--- /dev/null
+++ b/dev-libs/tree-sitter-tsq/tree-sitter-tsq-0.19.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Most grammar packages uses "vX.Y" scheme, but this one don't use "v"
+# on tag names.
+# NB: keep an eye when bumping to the new versions. It's possble that
+# they can start using "v"'s, so this kludge will not be needed anymore
+TS_PV="${PV}"
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Tree-sitter query language grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-tsq"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index a051087d0903..7dd5895b18c6 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,7 +1,113 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
+DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
+DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
+DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
+DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
+DIST ascii-1.0.0.crate 31727 BLAKE2B 9733e1aa9d41e3b170ac07e63708e7be0f15f9eda73ba371cd239d9c46e881d1e46c2e80b5c5440bf1a1f0b8f6e66199241a455db9a3a535672881bca4e0d13a SHA512 5696e14883d4946c4acbace84ee4c65af527a6b1725a7d16ab5d5b8cc671ff211324f15f3fb0755cb1c9dcd598a054b32cd51c69ad06391e7e147880f5c97a1b
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
+DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
+DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
+DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
+DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
+DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
+DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
+DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
+DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
+DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
+DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST html-escape-0.2.6.crate 29876 BLAKE2B 0ae67445ca39b0ac418a6faf269d6aa3bbb5a39f5a3c02df35cf20eb88c46cb7e8edadcd779eda8e274edc523715d6982c6af412aa955adcfe87888a45bfbf3b SHA512 42df48cb3e517adb7f0a907e8ecaf41fbf2bc17572454c16f0e343fc048a84eb77eb8db8a0f6492eda68b4b929bdd50c192b530325c9df59348b687abed7ea87
+DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4c33de17fd5ed70b9a46727272c9facf1bbb79e2981a4ad1953cabeb53d71cefcdc2a1e9e9f57c4a9f0d22 SHA512 71be89a626b087ca3a33576857799c15634263e2bbe43290750eaa6b074088cb6b54b3f778930e3dcc796a883daf662c0935178d4f096c751027bbe727124212
+DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST js-sys-0.3.48.crate 67010 BLAKE2B 8429e077997c953cd0fab9f40e3f02feb59b19e46e909bd25640c8e35c07f5c2bfcdff6387dd18ba797b94d691e94ff79942caba7471842a9d948d30600ca5aa SHA512 4ace82697ff6f4239c96c532a1f86a5ed74783fb19579eb266940c101c74ce434e7e1127a3d8d3a045bd37036998ccb5f4f01f201431f84f5c02d05104076f69
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
+DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST once_cell-1.7.0.crate 28040 BLAKE2B 6b7be102447a7a23f7a8f3134794d35166e2210159c45781f43fb41d96d285979e40375fb2eea4507d9b9c0ee5b580c57ff24b5faef51808ec66fd8d7eb6c077 SHA512 b7ebfc328e02084191d145260cee671740d434a3af10f9fd8f6ac71d3b522f6e31bd320e095b1801f613398b3d128ecca825df785cae60c674cae94d1488bb5a
+DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
+DIST pretty_assertions-0.7.2.crate 79200 BLAKE2B b7736ce11bbc5d2a778c2525e80993858c5d2a7182123c3f5aa2cde6ffe5621ab8033a91d578f4fba9badc3f503a0f14873d234b41974161f8148f2b27510e12 SHA512 edf898bbb15f4f56d2d7688d90d44d0ee7913b7d78b4774548eb7a88e8f75b0de9635c93b107744a2501839202ecf828004d179c6edf84706ae160186d47d177
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
+DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
+DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
+DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
+DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
+DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
+DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
+DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
+DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
+DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
+DIST serde_json-1.0.63.crate 115110 BLAKE2B d62655c480702de6ebc772df9ed54e07cd1a0d19fa5d40c95547176ce073370f70f517ee43f63da55055ce15f143be25b4dbb75b67bbf05abe1b0edd1bed7499 SHA512 7de96ee7ac3d7668394cd338efab73550545b8652e0ab412e558470deb8f7cdb85c9de7559cb43f3c79063f80e98c91a8a831d39faa4b0e6393aa0c9cc90d29f
+DIST smallbitvec-2.5.1.crate 14761 BLAKE2B 8a18f8a0a13fdd90ec7d651e7243e4cb382b860480ac079cc1db0235ce12f01f4b415453538f829960e6581116ce8b940ff72531abd334d71552d68a61edc519 SHA512 348e30ef6982b6d50a398db9f19ccb9a14e5ce239dd33771366575c332396df91a2f6384e9afa13538daad5c726170518b19b367c97d9bd9f46b120b88e4ae47
+DIST spin-0.7.1.crate 21944 BLAKE2B cf272cd5a36718f67d2cb5ee7ba74ac84a54a09263a69c7a26b9297dc346b3f5686c42941378e3c0e191f3cae221210ddd59978333862a305464221a3d016adb SHA512 be7d79ef6182138407697d4de0c8696bfa35b0ccc8b1e6232eb2e3904282f5818008bb2a23b5544979f1b300643877cedd79179c3d91c5954423c2fdcfd0af07
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST syn-1.0.67.crate 231889 BLAKE2B 28807964411994b126e132c42b1361d55788a641da24773d1f1006373d3c21048f78553682441766b7257e5b4a4a1833954075fd2c4965f949d8465ee57a3ca7 SHA512 06a5f203c7e4c6f6bed489bea7e171cc8f29020401eb32405373a838526c6a5bed47e1310f41636d475358c420b82837bc7c1f90374fa6d0e842dd0224de3552
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
+DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
+DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
+DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST tiny_http-0.8.0.crate 41711 BLAKE2B 2b0a1e4cff50e201ac1583b9538c407312808275517c81b0227731840cf9c9cbfe3a387a420976191480e38a7826377dbba54d55222cb6adf07f1e86b55bcb91 SHA512 f130905d537579afb401644b32da8a1d0bac0902a16c48039fb45935371ad75ed3a687ab0362d926922bf80a07a2df13193e285c2dd34a1aca4fecb37952058e
+DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
+DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST tree-sitter-0.20.0.tar.gz 2876764 BLAKE2B 058f62c2067ce5fcf9440f281c63908f93fda09a6b3604d7196b9c56a15ba88ded7d75f9c21b4c5c4209f587fb5f326ae655cb5f5d84b46bfd783b2147048568 SHA512 a51fa0af45a6a99bb74ff53c15a4d7939eb24c6720e65ec7a96f74ffbce54801f14539e071ec6a4891dae778d7dea5edcecc6dd57716cc70a891c9e6cfa55013
 DIST tree-sitter-0.20.1.tar.gz 2903038 BLAKE2B 092b3110ca2dd2dc2f6298dad98c2400064ba7b7bce90cdf7c50bdfabf0bf52629f5315728b578ae46efc1a4c2f71ff024ffae202205a3b563188e3537565359 SHA512 172e9b2fba5d4610f663934dff1cf4580d09631a3d8d5d7249b6a80288aa9fdda9f5eac50a501935a87414563b46f843c3d98a1f7e45302a5c61dd3c08159606
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
+DIST utf8-width-0.1.4.crate 2995 BLAKE2B a314ab41d6544aa024a1a8dd4c52f5fddbf53a3847256329ddd779d1a6af7391fb156a33d39551416dffcf8a17bad5709cd5a97e0177ce21ba511291a87901eb SHA512 4777d0f4c971c33eedd808c110e48fdedc92336c17292e6df0704637c8d63905e1b0b6825fe958eef8e4e98327aac7126897b8681b80fb22c916b3a352ae0660
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST wasm-bindgen-0.2.71.crate 159260 BLAKE2B 9b58bce9adf9f9d0aad7f36558125acdf474c5dab2d049f7535d91f94fe7fe2e1c3d7dba7fed9880a621c923bbb351598afabd8db5705d1d87a389987aa9e9bd SHA512 a1e20ad8f239ae6180bdefb0d48914c4b3bd3c8830e110a9037c001dee2d6345d0a8525ec68f9107029a989e659278011f8ab4a13c32bdf36b82a6429c75c639
+DIST wasm-bindgen-backend-0.2.71.crate 25432 BLAKE2B 939d5791d320b0a46781fb2e660b271cce17b1876ed1ac2efb0533cdfa7fb24b5a2b9a28451ba03d87cea0195f2aa7a864dfeb52e9d5e3518453cdcc5c06eeb0 SHA512 40e1c7e63c51ef149065f3c35ce0e735f4a221e3de3e5f0004f9e597ed29812bba690cb069314d97c3843474aa611ebc05664be4f97dfbf5d240515e3a3463cc
+DIST wasm-bindgen-macro-0.2.71.crate 11548 BLAKE2B 61f29f066c91ea85274c3155f07c4c2087297515c93037d9ea791c0d2bd9b0b2287721b7937b2edb1c61bb270caa57ce8a282c29c9cef64c2d753ca171aefba8 SHA512 7f5086af3e43f37d46e2a1f18a44f2af69e8483f6cbcce85dd9b84a3ee6ec4323e2904974b55987dd026073466a21241d13207664ec4771a1fcc9db3e55ad7d0
+DIST wasm-bindgen-macro-support-0.2.71.crate 17855 BLAKE2B 5f24ff07d1bdc58e2becba42506a347432b369932df9cac68ddb3536fc5331a38f6b0b501866d6a44077f4094a5b3cc11af607e7c9eb1f92ba30460b5329b514 SHA512 eae16c62999d0cd66fd64b1dcbb90a5b572bcec6ac3f2c2f06ce8a499dd282cd13e3535bffd0fdddac65bf33bc4338422c805e7f2989c5336a3dccd6a2e69609
+DIST wasm-bindgen-shared-0.2.71.crate 6693 BLAKE2B 4b494abcd8c548d635ed953eef9dc8d2972355c63ccca991fc3f740f3dfbd4d26a4c1ebb9e45fc740489055299fa48b72965600906a804186cf0bf6c562e062e SHA512 458b140966f52be47a0f4c68cfa1b46cb39a4fd6742bbe34c892255b42e7605f2ec3cc9cb9d31e3c1000eb5048a8dbb608e42261e30e90308a9db33b14385d40
+DIST web-sys-0.3.48.crate 648255 BLAKE2B 15d4530f6d2fb61431e4949d2dcc4ab2386df2d86a22004f6c78f33646314a634c92f582fd56e8bb038ee3f6af6fbe7fc4491c9ae0329bffcf249e9d230bfd52 SHA512 3b0a6227cbfcd2829bd2d44f1bc5d600fb05ed28222babd23b41308e3e79350b8724efc8716a060ecb70b4100613a41aaca0b6080a2f23b223c453ec60a7174a
+DIST webbrowser-0.5.5.crate 11194 BLAKE2B de9e7afab8606cecf9c39d84c743ef7e78a81d85e189c145a4e3235350392a55c2713fd8798e10a2ca133011f893df0475df3451096648ef5d13c958f33b6c3f SHA512 1a8332b3c5cb9114530beb83b15219d6dcf2aef628fa6f4a6b45f1b8eb3c38ad07ef933f3de21159c3df523fb904630f32ffcc14d75b209fd5e48d8e20e4ee94
+DIST which-4.1.0.crate 7684 BLAKE2B 4d8eb0a263c14b506f446fa808d9326c6e4e781cc2d79a1f6efcf7b9bb9a294d3266a2f3de4526ac0ec08ca65a18622ac064e9ae1e86dd1b325b122f684371f8 SHA512 4fffd3dd4ac73f5c232ee8a53bbc948a7295a2a51ec3f792d5d0aa84ceb6c2322fc11b35d29f5d3181c763b34c434c5ea2807ae6cc3393cd30d68b0fd44c7a22
+DIST widestring-0.4.3.crate 26215 BLAKE2B 7e5cdbb58a23004bb76cc12d451fd891ef08c05f730b059eb62a0f5e9482dde58c4059f9c0892fb1ebebbc8ee85dd20ece3ebf12c48790dca5eaeeb20b81dc34 SHA512 48561bd8a3b589f2a0328d1286177fbc6c5bc534756898912cbaab81d742b64ef898eed75073484d5e30762ceda9d2e88710074e7e9ce1a7dd43b5d871de3860
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD tree-sitter-0.20.0.ebuild 782 BLAKE2B 2207fed9423a9c7150ba369093347d9812c991606ea502af8ce6882f2ca6ecf8178378ef80b406c2fb14d89f827decd8307aca7d71f20587717a5d0876e87623 SHA512 8805eb43c8f4446a017a113b0df8a16e890b7a7e1c52bb7a59fc245acbe4322dab46de3879982dc86d1f3ac65e75db575d0967e0ccca1467a4392b6097c1d939
-EBUILD tree-sitter-0.20.1.ebuild 790 BLAKE2B 9d446d0e2ab6fb491b19a13c3c4013b10bb647a784fb961778b331eff768007aac980fcbc0e456ac2e2f37beba2a370964b7412e76652a9a36fc26196dd0b73d SHA512 d8e990d11caa183e2bfac21661663a631bc42790bfc74021b36cf485ea83c4bffb3b2d746dfa13e9e78135e0a2b5153610bb21511a3911d857abb53539524ab2
-EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
-MISC metadata.xml 707 BLAKE2B 670f8025f612aea1f36bbca51633165f87121de19ab8446a282d04dc2fc79bbff82ad13744543c62451c7d5274e10023e949976d307e2b913f1e9bfa65ef78fa SHA512 74ac5dffb37618b813c5046162615ee82ab417f43229cdd28004677f746a7f310669b862bf160f3d02c3c470ffee274618072300c6d3dd42472a577584a57546
+EBUILD tree-sitter-0.20.1-r1.ebuild 3267 BLAKE2B 4e8f7aff44758df190f586e35d1f20f69db40f70b6b37e35ad8f8e42a9f6b52e0efc8c875f9c9d9b2a4d8bfbc3f78d842923bcbd99f086d5bdeea97a3b82736f SHA512 8ef64aa21f586b8a77ff0d0ff3a7487204dde8b40f3f0ee3c95888c83861109a37bc548bc46399560542ca165e857e8eeaeb5062d1d944e59f26b8cbcb0948b6
+EBUILD tree-sitter-9999.ebuild 1325 BLAKE2B 7b9c819316ac10e44a7be3c44045f51c304b1d1152f96198d7473c2ac9a553fd4f2d12295c89ccc5a91c747b883d9c0ac4a45dc5d5445582413f5bab73d4816b SHA512 f50d2b69292e127f2f60c3393a83078515e2c20f9ff8c58f00d1311ace23f56ba34a0c52126f8b7a2abec3f7a563a453c3422900cb0abfa1153764eac0d94cad
+MISC metadata.xml 948 BLAKE2B 6dc828ba11cefbf079df9a114e72d95bbf94b3443ef4f7a19362d7c07a16ee2fedef464e2fc7ca90e1f214959c90e8425628af037f29b12d5a2d1deec5819f5c SHA512 fee67486332a2e4c7eeed0f44046d5fbb595e77e44c0e578c2e115f8141b22af85da01ebf412454f02097433e8a6ce3bc01be136baa372b7bf54db9e2d1f3789
diff --git a/dev-libs/tree-sitter/metadata.xml b/dev-libs/tree-sitter/metadata.xml
index 969374b21719..6c52f76c3daa 100644
--- a/dev-libs/tree-sitter/metadata.xml
+++ b/dev-libs/tree-sitter/metadata.xml
@@ -9,6 +9,13 @@
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<use>
+		<flag name="ts-cli">Build Tree-sitter CLI tool (for developing, testing, and using Tree-sitter parsers)</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">tree-sitter/tree-sitter</remote-id>
 	</upstream>
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.1-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.1-r1.ebuild
new file mode 100644
index 000000000000..db5901f18e86
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.1-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+
+CRATES="
+	aho-corasick-0.7.15
+	ansi_term-0.11.0
+	ansi_term-0.12.1
+	anyhow-1.0.40
+	arrayref-0.3.6
+	arrayvec-0.5.2
+	ascii-1.0.0
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bitflags-1.2.1
+	blake2b_simd-0.5.11
+	bumpalo-3.6.1
+	cc-1.0.67
+	cfg-if-1.0.0
+	chrono-0.4.19
+	chunked_transfer-1.4.0
+	clap-2.33.3
+	constant_time_eq-0.1.5
+	crossbeam-utils-0.8.3
+	ctor-0.1.20
+	diff-0.1.12
+	difference-2.0.0
+	dirs-3.0.1
+	dirs-sys-0.3.5
+	either-1.6.1
+	form_urlencoded-1.0.1
+	getrandom-0.1.16
+	getrandom-0.2.2
+	glob-0.3.0
+	hashbrown-0.9.1
+	hermit-abi-0.1.18
+	html-escape-0.2.6
+	idna-0.2.2
+	indexmap-1.6.1
+	itoa-0.4.7
+	js-sys-0.3.48
+	lazy_static-1.4.0
+	libc-0.2.86
+	libloading-0.7.0
+	log-0.4.14
+	matches-0.1.8
+	memchr-2.3.4
+	num-integer-0.1.44
+	num-traits-0.2.14
+	once_cell-1.7.0
+	output_vt100-0.1.2
+	percent-encoding-2.1.0
+	ppv-lite86-0.2.10
+	pretty_assertions-0.7.2
+	proc-macro2-1.0.24
+	quote-1.0.9
+	rand-0.8.3
+	rand_chacha-0.3.0
+	rand_core-0.6.2
+	rand_hc-0.3.0
+	redox_syscall-0.1.57
+	redox_syscall-0.2.5
+	redox_users-0.3.5
+	regex-1.4.3
+	regex-syntax-0.6.22
+	remove_dir_all-0.5.3
+	rust-argon2-0.8.3
+	rustc-hash-1.1.0
+	ryu-1.0.5
+	same-file-1.0.6
+	serde-1.0.130
+	serde_derive-1.0.130
+	serde_json-1.0.63
+	smallbitvec-2.5.1
+	spin-0.7.1
+	strsim-0.8.0
+	syn-1.0.67
+	tempfile-3.2.0
+	textwrap-0.11.0
+	thiserror-1.0.25
+	thiserror-impl-1.0.25
+	thread_local-1.1.3
+	time-0.1.43
+	tiny_http-0.8.0
+	tinyvec-1.1.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.17
+	unicode-width-0.1.8
+	unicode-xid-0.2.1
+	url-2.2.1
+	utf8-width-0.1.4
+	vec_map-0.8.2
+	walkdir-2.3.1
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasm-bindgen-0.2.71
+	wasm-bindgen-backend-0.2.71
+	wasm-bindgen-macro-0.2.71
+	wasm-bindgen-macro-support-0.2.71
+	wasm-bindgen-shared-0.2.71
+	web-sys-0.3.48
+	webbrowser-0.5.5
+	which-4.1.0
+	widestring-0.4.3
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit toolchain-funcs cargo
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="
+		https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		ts-cli? ( $(cargo_crate_uris) )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT ts-cli? ( Apache-2.0 BSD-2 CC0-1.0 ISC MIT )"
+SLOT="0"
+
+IUSE="ts-cli"
+
+BDEPEND="ts-cli? ( virtual/rust )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+		use ts-cli && cargo_live_src_unpack
+	else
+		# behaves as default too, so it is ok to call it unconditonally
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_configure() {
+	default
+	use ts-cli && cargo_src_configure
+}
+
+src_compile() {
+	default
+	use ts-cli && cargo_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	use ts-cli && cargo_src_install --path "./cli"
+}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.1.ebuild
deleted file mode 100644
index fa5c4b5c1917..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.20.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
index 7097ecdcab15..0c65cf2416ce 100644
--- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+CARGO_OPTIONAL=1
+
+inherit toolchain-funcs cargo
 
 DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
@@ -12,22 +14,50 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	SRC_URI="
+		https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		ts-cli? ( $(cargo_crate_uris) )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-LICENSE="MIT"
+LICENSE="MIT ts-cli? ( Apache-2.0 BSD-2 CC0-1.0 ISC MIT )"
 SLOT="0"
 
+IUSE="ts-cli"
+
+BDEPEND="ts-cli? ( virtual/rust )"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
 )
 
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+		use ts-cli && cargo_live_src_unpack
+	else
+		# behaves as default too, so it is ok to call it unconditonally
+		cargo_src_unpack
+	fi
+}
+
 src_prepare() {
 	default
 	tc-export CC
 }
 
+src_configure() {
+	default
+	use ts-cli && cargo_src_configure
+}
+
+src_compile() {
+	default
+	use ts-cli && cargo_src_compile
+}
+
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	use ts-cli && cargo_src_install --path "./cli"
 }
diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest
index dcdc66a86cf8..dc9ec92b2e17 100644
--- a/dev-libs/urdfdom/Manifest
+++ b/dev-libs/urdfdom/Manifest
@@ -1,5 +1,7 @@
 AUX cb.patch 768 BLAKE2B d777c9c55e81019c496c4dffbe2b113d4e0586b713fd2f6c630616a5d9e3f5c83bc23f6dcfd9bc034c78a635a92a085afc9a3f51079805c30fd2d31f8f3c59b9 SHA512 fed91e83af1c3f5c3de9e51ce7134e6c9f94a262817cf14034b390c6527cece0b867e4742a0754debfdf358c0816c9443fc0b84d9cffa531094f33861bb1155a
 DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B 19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87 SHA512 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003
+DIST urdfdom-3.0.0.tar.gz 285706 BLAKE2B ef9cc251c67f20458c9038a738dd8b7a91d49b0180bbffe9cd12e793f12f4f1f10b5322a82f94bc36a5a46db7e015b157c84cda73535b7a60417f2f4bb389fe5 SHA512 1fa3372d5beed6b119444ef99d50991a417d42bc7a3152e4697dc26e1bd1e351d45edd4c56f9dfff6f2c8480b3f43c6dfe246d22890db0f676d68591a5c0aaf6
 EBUILD urdfdom-1.0.4-r1.ebuild 820 BLAKE2B fde755690e23f29d8513686cc252d9f711a7fcdceaa4c03865a44755897760170507dbced212ef38b163236a98850de0d69a73202d81fb3aceb3775022bfb65f SHA512 40b2bef45084b976a4913ffa9062ba8d46d9a4682fd39bdef786a20e599ec0719620a072f346d42e2b50605f3e94a6a8edf3b853b6ec8868c7ed2f42a15cc1d7
-EBUILD urdfdom-9999.ebuild 785 BLAKE2B 005167cf6dca7e85e01b03cd761e3920319d1e1c6efd13c66f45794cf4b1264701837073a800ce2d06c99ee87b835e8d2ffca6957a4ecbd27132f2d7a16723a1 SHA512 2c37fc029ff9e4a138c98ca0f5cdc4bb90a5507e1efced479f693dc6da9922bf759b75cf22cd8328711d17a79c7bf5b418b6d1dfd7dc673284aea9c3525daff6
+EBUILD urdfdom-3.0.0.ebuild 652 BLAKE2B 8a3f4504a6f828948229d6d491fb4d5c179dd91c1bcaf7aa28df252d7bd4c7e1913ab20f5a139d022b4716a64b3bbbbca8d42cc5dd77754a088b1888fc708a2c SHA512 21b7ab7921a539b648a13d05f570f3bba4d8cef5b66ab07cffb54b04b7007dfd720b480e16aa09b1878998cba70dc83fc1a5b84aac1fcb0b9f43c32cb6929ca9
+EBUILD urdfdom-9999.ebuild 652 BLAKE2B 8a3f4504a6f828948229d6d491fb4d5c179dd91c1bcaf7aa28df252d7bd4c7e1913ab20f5a139d022b4716a64b3bbbbca8d42cc5dd77754a088b1888fc708a2c SHA512 21b7ab7921a539b648a13d05f570f3bba4d8cef5b66ab07cffb54b04b7007dfd720b480e16aa09b1878998cba70dc83fc1a5b84aac1fcb0b9f43c32cb6929ca9
 MISC metadata.xml 336 BLAKE2B f58bcfbda7136818c016ed571b04cb23d3f78072eee420280d354e3e24d752014ff884e064d4e5b402a60de04c802f818dba1e83fede7345ec44234bc72986b2 SHA512 8a12a7b50521d4b7d8675bc33fc94852152560c3dbfa6c0b52a0eed36cd1c9b926dcabfc1e0c33d84e9de69d333e2b306780ffac7abb563cd1dd81a60222599d
diff --git a/dev-libs/urdfdom/urdfdom-3.0.0.ebuild b/dev-libs/urdfdom/urdfdom-3.0.0.ebuild
new file mode 100644
index 000000000000..37c71100352c
--- /dev/null
+++ b/dev-libs/urdfdom/urdfdom-3.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/urdfdom"
+fi
+
+inherit ${SCM} cmake
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="URDF (U-Robot Description Format) library"
+HOMEPAGE="http://ros.org/wiki/urdf"
+LICENSE="BSD"
+SLOT="0/3"
+IUSE=""
+
+RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
+	>=dev-libs/console_bridge-0.3:=
+	dev-libs/tinyxml[stl]"
+DEPEND="${RDEPEND}"
diff --git a/dev-libs/urdfdom/urdfdom-9999.ebuild b/dev-libs/urdfdom/urdfdom-9999.ebuild
index 1f7a6d0de978..37c71100352c 100644
--- a/dev-libs/urdfdom/urdfdom-9999.ebuild
+++ b/dev-libs/urdfdom/urdfdom-9999.ebuild
@@ -21,16 +21,10 @@ fi
 DESCRIPTION="URDF (U-Robot Description Format) library"
 HOMEPAGE="http://ros.org/wiki/urdf"
 LICENSE="BSD"
-SLOT="0/1"
+SLOT="0/3"
 IUSE=""
 
 RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
 	>=dev-libs/console_bridge-0.3:=
-	dev-libs/tinyxml[stl]
-	dev-libs/boost:=[threads(+)]"
+	dev-libs/tinyxml[stl]"
 DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index f2940790ae66..6e807f3a1d54 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,7 +1,9 @@
 DIST vala-0.52.5.tar.xz 3583412 BLAKE2B ee81903be59267ce3499dfd7ef4e73708431641a16ca3c806a64d1660b85e8977f125cd67de0f2cfec610d37395c5a56028eb1c888a024bd9a1b159e2111e75b SHA512 88522ab5d12a8fbf538ed6ca56a1f402f3749bdfcfc9cdee2ad7ebcf98ebcd606e976fded83f2d853ac32cbaf326d96d1d888a5c56d018389753ac43456fa82f
 DIST vala-0.52.7.tar.xz 3591372 BLAKE2B 73ae3ffe9ecbcbbe385fc7ec16d45e968872705762de38cf2ef0bb6e33dfe6002adf750b2cd6bdf0d5ec17a6904dde07fbe55ea2f41079add4cb3164917cec1b SHA512 6876c898a601d056c12b59a421883256a480eedbf3098fb62082815775fb5037723c7e8820066e52dfd30053b79c63152822a1a11d70b7c4e372378605d966c9
-DIST vala-0.54.3.tar.xz 3892348 BLAKE2B ff3336ef52bfd95c27d7d720ae00ec3825c4cef785411dafe47a7a78b8398c16643803d957e8a34f5836a957ecf6ac617146a8602907a6595e4d6c9c20df7e6a SHA512 dbba5adcab21eb172ca8adc276864e65f87215a754a592bb294e347b85c159744eb02cfc65be6dc0392b875477cc2eecf3baa0d070902c903e602e2eeac2b6de
+DIST vala-0.52.8.tar.xz 3599348 BLAKE2B fd21f1a08efc798df0d57a283b19bd2558786e86820c21f7a3fc08c092cf71297e7a3e24585a6a77119a8bfa5f44ca4c2922c31fb5b45a97db7413a4788ecc56 SHA512 648d17f431dd7ad1aab70532ae760d3622b911828001334e9dec98cc22db8be61a00080b1bf1ca14b9589b44a25ff5516d71d1b9f0acd98e1dc88e86f12cdfd3
+DIST vala-0.54.4.tar.xz 3906944 BLAKE2B 50951b58b742880e3be98dfee7027bd52449e9c7b6cc2e537ced8e792395bcc5fe0d3f23bd5c35011c747781a1b40ab230c4120860065b19552c28dabda90838 SHA512 d676e4760040912d94a2d6e8a5f27bf05ceb72d01ed4d9adf0052ec792f4e1aba139d7f65694b2d80e475d8ffd69f1cfa55547a692d0847595e52f5d491c3cb3
 EBUILD vala-common-0.52.5.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
 EBUILD vala-common-0.52.7.ebuild 653 BLAKE2B 636ec05dcaa3f7c8f972cf86a1e67aad7044b9a0c59b12b6842c65c283065bd9d0235993d4616e8c61ea0e987a6bd0f4578c7228ccc8c015e073580a46360361 SHA512 83d831d84a48749d16fae9abb1d4ca8935e76a46973569de316a32edf91e27287faecd39c595073c912f153d2ceae82812b15f4899c86c97e692427bee584a5a
-EBUILD vala-common-0.54.3.ebuild 653 BLAKE2B 636ec05dcaa3f7c8f972cf86a1e67aad7044b9a0c59b12b6842c65c283065bd9d0235993d4616e8c61ea0e987a6bd0f4578c7228ccc8c015e073580a46360361 SHA512 83d831d84a48749d16fae9abb1d4ca8935e76a46973569de316a32edf91e27287faecd39c595073c912f153d2ceae82812b15f4899c86c97e692427bee584a5a
+EBUILD vala-common-0.52.8.ebuild 653 BLAKE2B 636ec05dcaa3f7c8f972cf86a1e67aad7044b9a0c59b12b6842c65c283065bd9d0235993d4616e8c61ea0e987a6bd0f4578c7228ccc8c015e073580a46360361 SHA512 83d831d84a48749d16fae9abb1d4ca8935e76a46973569de316a32edf91e27287faecd39c595073c912f153d2ceae82812b15f4899c86c97e692427bee584a5a
+EBUILD vala-common-0.54.4.ebuild 653 BLAKE2B 636ec05dcaa3f7c8f972cf86a1e67aad7044b9a0c59b12b6842c65c283065bd9d0235993d4616e8c61ea0e987a6bd0f4578c7228ccc8c015e073580a46360361 SHA512 83d831d84a48749d16fae9abb1d4ca8935e76a46973569de316a32edf91e27287faecd39c595073c912f153d2ceae82812b15f4899c86c97e692427bee584a5a
 MISC metadata.xml 326 BLAKE2B cd8c49993b750ebef93c620f819f42b858431d1aab4d2066a124a5118d5d18f4970b9d1eccb77121089264db7cfbe69ca06fb2fc2d2c4db98047629af9878db5 SHA512 52854d43fb74af5402cb1855409ab25d6741ea6fe48ae50416044d7b518745b02752e69cb9680e9c132e3a2f65ae29d92e9e771ac883e2ef01ae91effdf1097f
diff --git a/dev-libs/vala-common/vala-common-0.54.3.ebuild b/dev-libs/vala-common/vala-common-0.52.8.ebuild
index 043fa5ecbb04..043fa5ecbb04 100644
--- a/dev-libs/vala-common/vala-common-0.54.3.ebuild
+++ b/dev-libs/vala-common/vala-common-0.52.8.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.54.4.ebuild b/dev-libs/vala-common/vala-common-0.54.4.ebuild
new file mode 100644
index 000000000000..043fa5ecbb04
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.54.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
diff --git a/dev-libs/vc-intrinsics/Manifest b/dev-libs/vc-intrinsics/Manifest
deleted file mode 100644
index d3d8a9f1db20..000000000000
--- a/dev-libs/vc-intrinsics/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX vc-intrinsics-0_p20200904-cmake_libdir.patch 717 BLAKE2B 7c3d72b87b0acc67c223a3468e96ce68c5c1a166bccacc045d73e5d29a063856b23ba959ff1e13d07333d20803cedfa3f55f490ee9ee7700c708876de1960f71 SHA512 927c89f748fa21d3ef9349749c3428014b055a88d557dfd310f2b76c7f9e263400267558a83871ab132c295a997dc0488b9df2167378b9c1dc691469e1554f4c
-DIST vc-intrinsics-0_p20200904.tar.gz 97118 BLAKE2B 7f1a4f0b3b5f8abba8972668877562fbc6835ce8cfa9e0b336541ee6db72ff1469917320b63dee7d193af89593bb318c9fcd000ba5e8d62df5729f69cfdcb9c7 SHA512 7b5f87dabcf1c093c50721390dba9c82a1f0da1a087d00af4bf1c2e080bffa531b8d16fe8faacfaeb4862b528929865263d0e84a5ebee6a76eef1436dc4e2ec9
-EBUILD vc-intrinsics-0_p20200904.ebuild 1355 BLAKE2B e4ebb93f1eb3b500027788d4dbb6d089411af2a443579ee60096b33a5e0421e3673a4503b435a452549077de2c309d18718fbd94f26ee3be4e4604c617456325 SHA512 836b14997f421581e21b2af7bb8a4866392f000610e09d792adefe85077f416fd5b3a40934f7a57e85bc1c0ebb555d6ec1f43e36be87e7a5ee9ba7936fbf2ee9
-MISC metadata.xml 252 BLAKE2B 7b5981bd52cd8ec77b7e785229806f8a82d675c2fdfaf15d63274a32a72acfd37368546fa342c5321b7e3dac0dbecc9a30cdd7eb6433aa577898dff2e8cff6fa SHA512 ce753136e00910efe1d50ec5bd6e4834b9af5495e6a5aff3cff0d073ec7495f2ef65bddb5702ee0a1a00395e65340c50c800568e0892498e35aef76dbb6b1e32
diff --git a/dev-libs/vc-intrinsics/files/vc-intrinsics-0_p20200904-cmake_libdir.patch b/dev-libs/vc-intrinsics/files/vc-intrinsics-0_p20200904-cmake_libdir.patch
deleted file mode 100644
index 694cb1e28562..000000000000
--- a/dev-libs/vc-intrinsics/files/vc-intrinsics-0_p20200904-cmake_libdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/GenXIntrinsics/CMakeLists.txt
-+++ b/GenXIntrinsics/CMakeLists.txt
-@@ -52,15 +52,15 @@
-   # we need to limit it to external build
-   if(BUILD_EXTERNAL)
-     install(TARGETS LLVMGenXIntrinsics EXPORT LLVMGenXIntrinsicsTargets
--      LIBRARY DESTINATION lib
--      ARCHIVE DESTINATION lib
-+      LIBRARY DESTINATION ${TARGET_LIBDIR}
-+      ARCHIVE DESTINATION ${TARGET_LIBDIR}
-       RUNTIME DESTINATION bin
-       INCLUDES DESTINATION include
-     )
- 
-     install(EXPORT LLVMGenXIntrinsicsTargets
-       FILE LLVMGenXIntrinsicsConfig.cmake
--      DESTINATION lib/cmake/LLVMGenXIntrinsics
-+      DESTINATION ${TARGET_LIBDIR}/cmake/LLVMGenXIntrinsics
-     )
-   endif() # BUILD_EXTERNAL
- endif() # INSTALL_REQUIRED
diff --git a/dev-libs/vc-intrinsics/metadata.xml b/dev-libs/vc-intrinsics/metadata.xml
deleted file mode 100644
index f239bbef222d..000000000000
--- a/dev-libs/vc-intrinsics/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">intel/vc-intrinsics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild b/dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild
deleted file mode 100644
index 7ecd07659322..000000000000
--- a/dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm python-any-r1
-
-MY_PV="830067832d4af0fbd5710e9a45669a02fcfb7c3f"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="LLVM intrinsics representing SIMD semantics of a program targeting GPU"
-HOMEPAGE="https://github.com/intel/vc-intrinsics"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="10"
-KEYWORDS="~amd64"
-IUSE="test"
-
-LLVM_MAX_SLOT=10
-
-COMMON="sys-devel/llvm:10=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="${PYTHON_DEPS}
-	test? ( dev-python/lit )"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( Readme.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_p20200904-cmake_libdir.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"/$(get_libdir)/cmake/llvm
-		-DTARGET_LIBDIR=$(get_libdir)
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DVC_INTR_ENABLE_LIT_TESTS=ON
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}"/usr/bin/lit
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# These tests only work on native builds
-	if multilib_is_native_abi; then
-		cmake_build check-vc-intrinsics
-	fi
-}
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 6019da8382d0..1f02814e6e04 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,4 +1,4 @@
 DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
 DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
-EBUILD voikko-fi-2.4.ebuild 869 BLAKE2B a70729fe98dc6fbfbb296432f8bb7e5e9766896a932fadbd115e307c107b3ed52ef39a983a4153154544e070141fe39c0c480e656977347cb89502db737f0bbd SHA512 2e0aee9206204998b87e737a19bc1ba40a59d7b81ea60649ffa4b90953e0e75aa7393d62043dd6bc86a7591f55cc3b1acd979336d4bb4d5c9d0925e3b93edded
+EBUILD voikko-fi-2.4.ebuild 868 BLAKE2B d7184dcceec265824877e5d6234f68877abb798d687557bd635e64cb5588bb9a99a6c142a76bc53f057339051aea940ec4520d9260ca2cca5e324c7ed7a7db63 SHA512 37027aa58408aa4538a8a2962807e3ae95e7fd8cd95d508253eefd224ff291f39fdfdd1149412f17364d254df703095198a5a6fe3c60decd71a0d6ff84db643d
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
index 24cb050502cc..ec16f72b2f4c 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-libs/foma
 RDEPEND="${DEPEND}"
 BDEPEND="${PYTHON_DEPS}
 	dev-libs/libvoikko
-	verify-sig? ( app-crypt/openpgp-keys-voikko )"
+	verify-sig? ( sec-keys/openpgp-keys-voikko )"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
 
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index bed86d4aa0bc..2a4c3af81f02 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
+DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 EBUILD wayland-1.19.0.ebuild 1469 BLAKE2B a44e69efbd172377a84d8bfe46ca35a9f10652f37ffc949d7b59d9130ea460ab42db6affacf076bc2bd574c70629d814cf829d452a88ae7cfc0c135097a08d72 SHA512 3a368fef2f2170c29ffc2598b0cf634109c10cb1d845803299a07a3a6634864650283190fe81cda401c2e4de488cdd0f632145a590caee959c25387461fe380f
-EBUILD wayland-9999.ebuild 1476 BLAKE2B f367b4aff2adba99306d601b4abe4c41fcf803eba363ef8f265e4893beafab9477ebdcc7f1373734cdb58ee0205aeb0dba0087691d858a649396cfede9f0adcf SHA512 1f5076f2c7699bdbd14d2d5e63c43eaee550d109a39709e1435204c721036af9eddb13bf4b6fa57d930e142347d2cfae139c037677e7474d967908b9d23578f9
+EBUILD wayland-1.20.0.ebuild 1516 BLAKE2B e22d931ee9acbbb3649fb888e0bbbe911a7ce34824fff5187c1476e0614d152b2f7afa9537561e3ec8791ec51fe0683c812e35081f456b729e193fbc649442c4 SHA512 08c911a8941744012b548c16278b9c687cbcac2487cef6cd4409081aad531a22b663aa5008ee7c14866364a7ef5ac95d73f69a9c50c296ab0ba3c7a71ce9e9e4
+EBUILD wayland-9999.ebuild 1516 BLAKE2B e22d931ee9acbbb3649fb888e0bbbe911a7ce34824fff5187c1476e0614d152b2f7afa9537561e3ec8791ec51fe0683c812e35081f456b729e193fbc649442c4 SHA512 08c911a8941744012b548c16278b9c687cbcac2487cef6cd4409081aad531a22b663aa5008ee7c14866364a7ef5ac95d73f69a9c50c296ab0ba3c7a71ce9e9e4
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland/wayland-1.20.0.ebuild b/dev-libs/wayland/wayland-1.20.0.ebuild
new file mode 100644
index 000000000000..49ec2b8a68f5
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.20.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+	inherit git-r3
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+inherit meson-multilib
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	~dev-util/wayland-scanner-${PV}
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+	)
+"
+DEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool doc documentation)
+		$(meson_native_true dtd_validation)
+		-Dlibraries=true
+		-Dscanner=false
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# We set it on purpose to only a short subdir name, as socket paths are
+	# created in there, which are 108 byte limited. With this it hopefully
+	# barely fits to the limit with /var/tmp/portage/${CATEGORY}/${PF}/temp/x
+	export XDG_RUNTIME_DIR="${T}"/x
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	multilib-minimal_src_test
+}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index 058e90a73824..49ec2b8a68f5 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -17,10 +17,11 @@ HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/waylan
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
-	~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP]
+	~dev-util/wayland-scanner-${PV}
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.6[dot]
@@ -41,6 +42,7 @@ multilib_src_configure() {
 		$(meson_native_true dtd_validation)
 		-Dlibraries=true
 		-Dscanner=false
+		$(meson_use test tests)
 	)
 	meson_src_configure
 }
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index afdcd4a8f629..e2609153597c 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,5 +1,7 @@
 DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664
 DIST xxhash-0.8.0.tar.gz 145909 BLAKE2B 3e4e715d20ad09da2fe706a69e89a305d9f4d19588a28361f519d424c002345ba76b48d5adc0b600e34e595fed20a1ce8b8c5f22457cb05c4233810e9af9b823 SHA512 c3973b3c98bad44e1d8687ab4f9461aecd1c071bb3d320537a4c50fb7301edd13e990bab48cc6e5ca30536a814c8fa8cac24ceb1803a7e8eca30ef73d449373e
+DIST xxhash-0.8.1.tar.gz 171552 BLAKE2B c0efc1aabf68130d7028a6e43fb04826de4ec485bfb5e915bd9dad823149b970f964784e14c35babd46b9811b961ce3d0be49feb1640e00780decf037427f5fc SHA512 12feedd6a1859ef55e27218dbd6dcceccbb5a4da34cd80240d2f7d44cd246c7afdeb59830c2d5b90189bb5159293532208bf5bb622250102e12d6e1bad14a193
 EBUILD xxhash-0.7.3.ebuild 909 BLAKE2B 4ddff20b80164afcc422e805b75312d62038e57266d16da0d691499728adb17a786f3cde155f1aec5e3619654088dae7aa986e74f5d779a7ed01c8f75c54b1b0 SHA512 503faff0defb0b06b4aa378b3ba587f9d791a0c177eecf087ff4aa36ee2c86d7b6679aa1d305e0612fa32bb0fa6e18edbcd6dbf89e62a7d01de4308a601c0142
 EBUILD xxhash-0.8.0.ebuild 909 BLAKE2B 4ddff20b80164afcc422e805b75312d62038e57266d16da0d691499728adb17a786f3cde155f1aec5e3619654088dae7aa986e74f5d779a7ed01c8f75c54b1b0 SHA512 503faff0defb0b06b4aa378b3ba587f9d791a0c177eecf087ff4aa36ee2c86d7b6679aa1d305e0612fa32bb0fa6e18edbcd6dbf89e62a7d01de4308a601c0142
+EBUILD xxhash-0.8.1.ebuild 1099 BLAKE2B 0b8ef717cc5ceb05f1b7e96c66a8c28d03b8f86c40a20b9b0b2493aecb2fb24f9172eb65fbfa7192d69d57706db00fdab511b8ff5bfd45bb94993030a7398ce8 SHA512 c6e97ce7055e16672ef1e8f5c30e7ad081d820758e1a59a362187ee3d3fc4bbe0adbc43fc8ad002ea16104c91af7dbf01b5ed77b503ee6891fa03245878bb61d
 MISC metadata.xml 393 BLAKE2B 7c331e1bd89d9e7bdc0693e0942d1e83418746a63c560c666722ba78c82948f39691a4e93bb5b5e1f021ac496b5fea312b97ace2dc8d5f5aa37590aa020cc6e4 SHA512 b96d0fb3f8ad4b65da25054883722d0abfa937b714f72d3fa8d0dd66ac4e224d5c5e8a0f7ae3bae5825ff9c198a2e13eefc6759a23b6ae9b79e3cda2648bca1a
diff --git a/dev-libs/xxhash/xxhash-0.8.1.ebuild b/dev-libs/xxhash/xxhash-0.8.1.ebuild
new file mode 100644
index 000000000000..b6f70f5fe92d
--- /dev/null
+++ b/dev-libs/xxhash/xxhash-0.8.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Extremely fast non-cryptographic hash algorithm"
+HOMEPAGE="http://www.xxhash.net"
+SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2+"
+# https://abi-laboratory.pro/tracker/timeline/xxhash
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="static-libs"
+
+S="${WORKDIR}/xxHash-${PV}"
+
+src_compile() {
+	PREFIX="${EPREFIX}/usr" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	PREFIX="${EPREFIX}/usr" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+	MANDIR="${EPREFIX}/usr/share/man/man1" \
+	emake DESTDIR="${D}" install
+
+	# link man pages by hand, bug #829159
+	dosym xxhsum.1 /usr/share/man/man1/xxh32sum.1
+	dosym xxhsum.1 /usr/share/man/man1/xxh64sum.1
+	dosym xxhsum.1 /usr/share/man/man1/xxh128sum.1
+
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/libxxhash.a || die
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /dev-libs
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)