gentoo (valentine's day) resync : 14.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
commit: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree: c44943ee0563a3fa957716de909fed683117fcb9 /dev-libs
parent: 69051588e2f955485fe5d45d45e616bc60a2de57 (diff)
149 files changed, 1170 insertions, 604 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0821d54f10a1..ef809724c3b2 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index c9c63595fc70..cef60168d278 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -8,6 +8,6 @@ AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 EBUILD boost-1.74.0-r1.ebuild 11202 BLAKE2B afbda2cca3942411d3edb50bd1c6786e413d0cce0debf6301f5ac765cbb40ad5d3a2ff471635b17212287f6b3d969dcc6c72f517863c9e0f42ce23a84fbd971b SHA512 7d6f48fb0a2179c06a147ce0d0eb18917f9250ef12882fb7430b48f5e8222972da41732ff50e15ea9d2843741b3b6ae47da8bedcf3369e5fee5780da2d25d4fd
-EBUILD boost-1.74.0-r2.ebuild 11250 BLAKE2B f0e87bd7f12343942c351d66ae321420de170432bda62e6c113c8df72e5887a7f26964db1f278fe2d1c53d6f96b551d4f6b5fb86a6f50b937200346b6b0c36ef SHA512 268b52b1049691155974d28fced093ce5a8d8bda558eae108b4c24af0aecd078c82b9286c3afe0b84ddff72f1e409cd86c88ca18e70d11da11c7bdb4ead1f56a
+EBUILD boost-1.74.0-r2.ebuild 11248 BLAKE2B d8d0e8792d13c8885d484201ee0255dbb0512f91a8c576f554e6ec60907ccabff2cf1c9941b45ef85701d3203525ac56dd9e74122920df9067e08119c75d5a74 SHA512 e9975bac036cede871bb60dece316fc4c48e6516084a4b4982b33a3a342f7c7c0deeeae6c5dbccaaaae8309b65f2425272475d93a666aa799938249174ffb8f0
 EBUILD boost-1.75.0.ebuild 11100 BLAKE2B 95d3e30860c81855ee702516fd09384adf771aa313f937fe4266843fd1881a7dc37fc4ad83e57ef7588a17ae5afd4d654a5441c43f8114eb2a697a71ab505e56 SHA512 8ed1eef22c42c6f0f1db6b79a2ee6169fa37843cfa05ffd20b715c01f932e972c53f7f959331510ba377ddf3d4479cdc0351209088187eb820d32eff8bf8e1a4
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.74.0-r2.ebuild b/dev-libs/boost/boost-1.74.0-r2.ebuild
index b109fb2b5f8d..fd1743778977 100644
--- a/dev-libs/boost/boost-1.74.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.74.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-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 ~x86-solaris ~x86-winnt"
+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 ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/clipper/Manifest b/dev-libs/clipper/Manifest
index 7fdf235e1a48..4375c267042d 100644
--- a/dev-libs/clipper/Manifest
+++ b/dev-libs/clipper/Manifest
@@ -1,3 +1,3 @@
 DIST clipper-6.4.2.zip 2535706 BLAKE2B 755dcfd759888bda7114af784d9e684f36ce8f6e43dcadf07f5797e3723d392aab2ea9b80cb212b7eb3177bfb306ca20a797546cb2c382132887e62fa0dffd93 SHA512 ffc88818c44a38aa278d5010db6cfd505796f39664919f1e48c7fa9267563f62135868993e88f7246dcd688241d1172878e4a008a390648acb99738452e3e5dd
 EBUILD clipper-6.4.2.ebuild 628 BLAKE2B 81cfa0859a48748f8787120ed00633d9367f1b28c128b6f1f9bb68ad84ad92886933f044b6fa3e2a792ac08efb471ac87a63e459ce79ce3032cca0d2e9e3e519 SHA512 97339d7f81f0a44ae3c3d83072a0cffcd3f7b0d238aff1e58b89a4f881c28a4bc31297d770b38171d5b8b80b04156c54bdd0a9e6cda23ca395f659089676e516
-MISC metadata.xml 631 BLAKE2B 2f873cd0220e6fcb0404b0ceeefafa2acf4418bc23a29e2eb249341a4c3b4698d77efdd30deede7a4427fc228213d67c034e43237c60e91679a7c05be5b664a9 SHA512 06e5eb63edca0e93a95de200775f51919583dea253fa4eb59eca5bc0c4a5a96c2eab59b746f43002c71ae992ceafa99ef84fe1f02267bdac40853f2f0c4e1081
+MISC metadata.xml 797 BLAKE2B a197edd2a680f68e3b262dffe94d623bb265b7ee92f0f54975450bb02151cd99ba1d3c5c5f7418ef512f3bad72b7ed096ca96a717f1c71a9e45694dea4ae3283 SHA512 05fff2f5ce966c65bd102a8fb4f04cfc2cd55c806f5c29e70bd59aba32053b8ffd1a6a4f40871343f941842b848a87faf8865c34da9f883ce306db886b1ef45b
diff --git a/dev-libs/clipper/metadata.xml b/dev-libs/clipper/metadata.xml
index ca62f48d80f9..bd82ab49d3ca 100644
--- a/dev-libs/clipper/metadata.xml
+++ b/dev-libs/clipper/metadata.xml
@@ -10,6 +10,8 @@
         and line &amp; polygon offsetting. The library is based on Vatti's clipping algorithm.
     </longdescription>
     <upstream>
+        <bugs-to>https://sourceforge.net/p/polyclipping/bugs/</bugs-to>
+        <doc>http://www.angusj.com/delphi/clipper/documentation/Docs/Overview/_Body.htm</doc>
         <remote-id type="sourceforge">polyclipping</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 3c0fb443618c..c4966cb165a4 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,6 +1,7 @@
 AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540b7c7d8c88c4f671db41c3b9b22ab8d537b9ddeb6cee899daa58b2173e5486ee763ba6f163ecfa3a20018a5117a94 SHA512 d9f23cf713e76d986d50fce895ba9ef2980b3ad81460b81217f9fa5af2a8840ab9e9e72c1d8d9635eaeceaa45f1add9e8dad36fd4159923b659f4fce09ef502e
+AUX crypto++-8.2.0-musl-ldconfig.patch 1012 BLAKE2B 3c076365b7a6458c8348aa84c66df3d84c73829f49e36f3dffa9ba75be064235d9128721798967a7baff1e1f283f7789587d31f299275501039ba9e78ec4ccd0 SHA512 61f342e134cf696a1d064b9c27cbece4cccbbaa6a6ac55bd0bdff9e13669ce2e19b9f31ba0307410822bcf2c016397dbe81f79815a23f3f1cff2a3aa45d8622c
 DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
 DIST cryptopp840.zip 9124180 BLAKE2B de57ece8644aef68e40527e2dfe1892f924f1939617ce11d8d27253f15f2dd11cba6e594dd32f75ce799392c12ef22472fcb2f3e44b9c66bb2ae093d4c7e781e SHA512 4c32b6a9ce8a6925286185f65f7413fa1a430471f09624219656b1d088674c56f95fcc3b64f611632f12cb56dfecdcd41c9d1468942b8c391425a548245dde09
-EBUILD crypto++-8.2.0-r2.ebuild 1728 BLAKE2B 16a66423eacd0ef476c55b2ff1ac59d074a7fafdce464d7ad5b8d04769b2dde7f098f27b7ab9986ba686f29b168f1d44213bb45f4fddf6223a095f24525a4378 SHA512 6e37f760a975c95251c5919fb30f9a6311a0f5191c9ceb8984ebf7d7283558010fbb60af5f57bba5b73f25197eff43475c47dd0eb8807e97a04f87bebc6b5308
-EBUILD crypto++-8.4.0.ebuild 1136 BLAKE2B c702de85bd70f44ea48a1bf8758e754db58c9a9a0984001ceff212c1d1acf6a3a8c5b48765642e5472e829116f2bf21da106dc51a287bc7a634cfb1366a08138 SHA512 9de2d0ed2bfb4a313f95250ebb2be6322789ef37b9449f52b1a54d77046192b37e152a0d6a91fc5fbb406b1f182f89736f7af3d711438cb1b07383abe6909eb2
+EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
+EBUILD crypto++-8.4.0.ebuild 1196 BLAKE2B 40ef68935a522fb3ad24f636f88aa1e174ca55c7c87d939d9623db6a86d54e34ff6f016fcb133bfad8429503901a9add537ddd4b35551c096339947a0b02e714 SHA512 7dc7c6e3f14c2bf032cff6ec2a7129934263c917b21094d683c55addebafe46ef8a4daa51e699d5d75ccfe6a7db46ff478dc5380c302bddb9ecbd5909ac618e8
 MISC metadata.xml 505 BLAKE2B 8c1bfd20c9717c7b410af1d0dab008327049437c0c3a046bd3d3d79cac08cac11fe39c29eb933ce5dce3b3a7b57c017367d486b0c1ed70c78496b61ae0ebf981 SHA512 1a4c274988ad19a49919d882eb403c8bb75ebef7ebdc6350e6d705ab6abe672bb6ee32e8be71dbc52c3b71cdd84aee6b7b44e0a42b571de2480b7b78fc871253
diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
index 1ffe175e83b9..a52ee90857ea 100644
--- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0-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
@@ -20,6 +20,7 @@ S="${WORKDIR}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
 )
 
 config_add() {
diff --git a/dev-libs/crypto++/crypto++-8.4.0.ebuild b/dev-libs/crypto++/crypto++-8.4.0.ebuild
index c28c2e43f1c1..ed056d9020c1 100644
--- a/dev-libs/crypto++/crypto++-8.4.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.4.0.ebuild
@@ -17,6 +17,10 @@ IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
+)
+
 config_uncomment() {
 	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
 }
diff --git a/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch b/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch
new file mode 100644
index 000000000000..2ae8d287e12e
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch
@@ -0,0 +1,24 @@
+https://github.com/void-ppc/void-packages/blob/master/srcpkgs/crypto++/patches/musl-soname-links.patch
+https://bugs.gentoo.org/762997
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -1256,7 +1256,7 @@
+ 	$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ 	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+-	$(LDCONF) $(DESTDIR)$(LIBDIR)
++	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
+--- a/GNUmakefile-cross
++++ b/GNUmakefile-cross
+@@ -732,7 +732,7 @@
+ 	$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ 	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+-	$(LDCONF) $(DESTDIR)$(LIBDIR)
++	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index b50635233b26..43430b8b80cc 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -2,5 +2,5 @@ AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 BLAKE2B 2cc43e4d23c14646adfffae77bc1168b69
 AUX dbus-c++-gcc7.patch 891 BLAKE2B e3f1c902b52cbec776849c86d2d4c7a13acbc907355c380cad7eabdfe670d9058a1ddd3687af9bcbbd4d815affea21728d8296f5a87122bc6b5fc99396ea0428 SHA512 b8c67af11620c2414d482cb3d77784f7c9831e64e0bc9cb9b946e13b0ad13135f06cfb894667fb9b184e6fc7e750df0769a2d4c09df4f430c2189c2c3804fbae
 DIST libdbus-c++-0.9.0.tar.gz 466362 BLAKE2B 401e266286fef383754c945f3adcf8e68a1169e55d33614f1e11227c324fe1219db7043674b5894d548f827d0b673ab4f012babbb4a395c212f6e17ef6d0e281 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
 EBUILD dbus-c++-0.9.0-r3.ebuild 1716 BLAKE2B af521bfc1a4162a3b34405815d3ba69fc625ceb4af960812f8a21b84f1c06cd36c4775028e32608a0e6555e105b6d989778701a7b59c6b2e3051cbfa71ba5187 SHA512 c090408d04caf9bedcbd71f392a88552f63621b727e01be8b26edd0adb73854479672fb1f93420b4b9b676aa67477d476bb98ee6326fd15745e695854cf073f2
-EBUILD dbus-c++-0.9.0-r4.ebuild 1614 BLAKE2B bad2fd190bd8a737ad0d36fea9ced4be3ace562903d58392a4fc6f4504afd8c95dd5601ffdcb0c820a82ae4c46a464c2f72f1aa2f2336b375faf37005f3f35c3 SHA512 3def5a9297ba1ad8f5772054fac38fed1080ad5be741f3995cef68b862e9fcf5a752b5db95e5b0f9963c2084595e9dcfb31a4d16eb5cb6c254daef9850d842af
+EBUILD dbus-c++-0.9.0-r4.ebuild 1613 BLAKE2B aa91bed053176d5a2812d7404fcce52118e03ceac25ec65b79a5d52f3b054a01e9eda212de6ed933cd0d560b5f2713580213f37dd686c4a4a9f74da0324abb81 SHA512 c8346b94cf2fd4cba79194a662b4a84579fc4c350c5b4f857ef8d173927c3788af11be4f4455608e1fbc26bfc73704cc50b0dbc5a4b7a862c3bb48b06b4733ea
 MISC metadata.xml 364 BLAKE2B 12695ecb75cc83a5aff33d9d6a0cb001b3d37d8d567806d1d76c79246e94f0796ca65a19799e18c06ef4f22fa19cb434521f1f7c02b0234ac5a7f8fddd2f1edc SHA512 9b4bcacc042091d3d5c058f2cd98d48ba3fea02b4687d137d95dd6219808dcdaf964793a6d6761c29a52eb31e55afa17bb45717d85c8904312a66f6c5ce03d9e
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
index 0c861a1221bb..ea5c32b3c3d2 100644
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc ecore glib test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index e6b45a1bef20..a19bedac0f32 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -3,8 +3,11 @@ AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f
 AUX elfutils-0.179-CC-in-tests.patch 1506 BLAKE2B d2eb6acae1af4d4f370e8653ea65a8ae834bfc531c8cf77d3571e940b29ce08be45e93ff565b69eb43a913ace3e6537bba3358ae32ffa81d727d5b94f9ab371d SHA512 bf1a91219006813a5b8d63cc8735b0956187c097cbdae015a984a6c9fe11343d45315a8df779aad37b7c71c403f13351ebd9a08de06243437cffd8903c5aa7a7
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.181-CC-in-tests-p2.patch 1390 BLAKE2B 1e790582925769ddf2346a6b3da3fadf6eda102e109b4e70ade0893ffe33a589748e0fce9f5256d8c121c790986e46ea9bbfee467c7324c466db04dabd88b7f0 SHA512 dac276c66eba5332f952791d5021b9d61d3d5c14e073db4f559a5cf496de8337915aceaec8906b0f7734739e4d5d56714c1ca9288809c80f0f5e71e6218019cd
+AUX elfutils-0.183-CC-quote.patch 1795 BLAKE2B f6147afec19a45538517190f3feb4c483bda60643b7c14df66c9efa632130785865a1b7d5aefa6f29a51e2998e309333c9bc0a62a4c6bc050d9f79ddd0df7be6 SHA512 510bb7e3448318875586c33e586c16923bcaf0673f40f282f2e0ac8958ab28f070c6501e4ab4bab08209ad17ee3f861c80e1dd3354e844f78b6610a6d05eb3e7
 DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
 DIST elfutils-0.182.tar.bz2 9096742 BLAKE2B 59efd76c921a90a5ac18a62a00845080b574f167ae633d32b14acce554523736d0ccfdf539ba61e8ec1511b3294b486e0fa512887582a2e5cc34e71954e87e73 SHA512 8ab0735bbe11b4383169341bf674ace360038b6ae5239f1d5a991c46260cd4bce545e078735b7de3b8fab132bb5da41f60689ff1b1d7ebccfada117a954a2c81
+DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
 EBUILD elfutils-0.181.ebuild 2457 BLAKE2B a6284d30d68fcd9d7ada06c499fea705cf4407441a5d7d971b77a9303986379a58ad70054915e54694e97480824ac3bb800fd06206cf1ec40727cf9c0660727b SHA512 517519049ab656b6d86e3ef5188dbbbe04a9c19c6e374620df5c60d28967c4158d0f70d2b80d9bce9a4c0eed3c3e2fa43344f14b30bf63b43eeb3bc9218697d9
 EBUILD elfutils-0.182.ebuild 2545 BLAKE2B 89299bc12196b2850a01426ce17afbf10066a2332ff0aefe2a91092e48f16e99b3ffb94757ad3cdda78276956ed34a180525a3b4c6916911268b2e653febadbd SHA512 c58bd0bbb091f7dcf885255269939ac28422fac08446f8409878e2cfe895e5895bb1efdbf7ce797e92e0575ebcc0968537d7f9437095570adeaedf00ce2d4f5a
+EBUILD elfutils-0.183.ebuild 2433 BLAKE2B d71fee0f93c01e145f2b2b8fbb5a50f04f895184b168708d650918c6875fd89ea201d7592b0d4736187f504255f7dbe686b70c24659e070c7807427491586bb4 SHA512 a177eb63cdb5605316742594e01d71619ec46baddab48621abb7469495318a8d29582a6cd704eba85d39f769bd37e0240dc008be7a931c826fec5767de0446ae
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.183.ebuild b/dev-libs/elfutils/elfutils-0.183.ebuild
new file mode 100644
index 000000000000..d12889034536
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.183.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+	!dev-libs/libelf
+"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+BDEPEND="nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4
+"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
+	"${FILESDIR}"/${PN}-0.177-disable-large.patch
+	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.183-CC-quote.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+
+	# Symbol aliases are implemented as asm statements.
+	# Will require porting: https://gcc.gnu.org/PR48200
+	filter-flags '-flto*'
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		$(use_enable valgrind) \
+		--disable-debuginfod \
+		--disable-libdebuginfod \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma) \
+		$(use_with zstd)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/elfutils/files/elfutils-0.183-CC-quote.patch b/dev-libs/elfutils/files/elfutils-0.183-CC-quote.patch
new file mode 100644
index 000000000000..8dc59bec262a
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.183-CC-quote.patch
@@ -0,0 +1,40 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -528,7 +528,7 @@ installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir); \
+ 			      export LC_ALL; export LANG; export VALGRIND_CMD; \
+ 			      unset DEBUGINFOD_URLS; \
+ 			      NM=$(NM); export NM; \
+-			      CC=$(CC); export CC;
++			      CC="$(CC)"; export CC;
+ installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
+ 			 installed $(tests_rpath) \
+ 			 '$(program_transform_name)'
+@@ -540,7 +540,7 @@ TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \
+ 		    export LC_ALL; export LANG; export VALGRIND_CMD; \
+ 		    unset DEBUGINFOD_URLS; \
+ 		    NM=$(NM); export NM; \
+-		    CC=$(CC); export CC;
++		    CC="$(CC)"; export CC;
+ LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
+ 	       $(abs_top_builddir)/libdw:$(abs_top_builddir)/backends:$(abs_top_builddir)/libelf:$(abs_top_builddir)/libasm:$(abs_top_builddir)/debuginfod
+ 
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -1568,7 +1568,7 @@ installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir); \
+ 			      export LC_ALL; export LANG; export VALGRIND_CMD; \
+ 			      unset DEBUGINFOD_URLS; \
+ 			      NM=$(NM); export NM; \
+-			      CC=$(CC); export CC;
++			      CC="$(CC)"; export CC;
+ 
+ installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
+ 			 installed $(tests_rpath) \
+@@ -1582,7 +1582,7 @@ TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \
+ 		    export LC_ALL; export LANG; export VALGRIND_CMD; \
+ 		    unset DEBUGINFOD_URLS; \
+ 		    NM=$(NM); export NM; \
+-		    CC=$(CC); export CC;
++		    CC="$(CC)"; export CC;
+ 
+ LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
+ 	       $(abs_top_builddir)/libdw:$(abs_top_builddir)/backends:$(abs_top_builddir)/libelf:$(abs_top_builddir)/libasm:$(abs_top_builddir)/debuginfod
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 8301bb9d56ac..d28b862ed3e6 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -3,6 +3,6 @@ AUX ell-0.35-add-rawmemchr-to-missing-h.patch 1195 BLAKE2B 2ab70a003b79f10f755ef
 DIST ell-0.35.tar.xz 506400 BLAKE2B 694df293ce5fd31581cbdd9c2f6f3806a07a23ffb76cf04d6c13f1eebc8af5228ab030f3f1f6d68e1f234c4f1c55a6a1c41e93c41957c19ffc57255e86a78b26 SHA512 a61fc6e8b16627920a24a4bc271549863042ba27489039311009b7e16fe04bb88debcdcd239603cb471b78674a57851ee5ab8ee16229ebdf77850e0945410179
 DIST ell-0.36.tar.xz 515888 BLAKE2B 094ccd94a73a0c9f4ffbf72f65137e4328c868f2bbf7cb0226502d2efdec7e7618dca0e73547d7a9d4cf9e0d01222f067ed5bfa053dbf38402a625a0044187fe SHA512 2b21220171e3be36e7f2779d78ebd1cb783c52813408d1cdd9ff742e30b426830f26b44784f2c96cbcd5f0cefc9152693795a16e6861087c45ef7539a86b944c
 EBUILD ell-0.35.ebuild 1482 BLAKE2B f490d92fb666ec44e189178e659336df949c25c55f99ae7b370bcc1af48772a4d1bf24c0a9beacaf6a0140ce2cdf9b39448e44f8a294a0a570bcd12ea73b623a SHA512 2d859cc5e33d61c44c4dfd4f0be3820d80840a12ee408d49a228deb379256b2500f58e04625f08c58773b758f94139fbe7e5e7c65ecf2c1833b62a7d67be9ef3
-EBUILD ell-0.36.ebuild 1257 BLAKE2B 30e7c78fdbca48a13abdc36bd847bad0d5b5d937347336bc4eb90782e8134d7b1a618e73cd9d85598e8ed2f649f933256ee6bccf550407563d7d1ec923ed923b SHA512 6e42aa85804fe81fd3fc4960dabb84305f0eab4462ec57583581eda76f2713c390d34b57e66aeef170a65915041ff5737d3c914bdbaa14d5570371dfcf1392c1
+EBUILD ell-0.36.ebuild 1255 BLAKE2B 81943d181741d3dd8e4bba50802057562b6b028d9ca08e0a004600fc25b97912ca1e8a4b75ecfa67e76e7d8b33de01b0a61297a0248874016b4e7010ee50c9aa SHA512 00b510711c700b90f79b13cfa363a3f226dc17f7b7a84cc81ad31fa76367e5bb39a101c5cc9112c7c5652595177ef16078429e6d8afb0c03e77ae8fae0f5cc67
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.36.ebuild b/dev-libs/ell/ell-0.36.ebuild
index 752fd7b7e630..a2fe3280af5f 100644
--- a/dev-libs/ell/ell-0.36.ebuild
+++ b/dev-libs/ell/ell-0.36.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index e6e3ab154839..5a854457d194 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,3 +1,5 @@
 DIST granite-5.2.5.tar.gz 392987 BLAKE2B 507c3b810b750257a66195b45842a7664eb544f86a8606124d30d277c03680296f1ace7a9233d6e094ad5ce3357564e13b61d946f8ed926ccf22a5d9b5e98648 SHA512 64a08293bc4b33d77206c7070b4e2002dd8e2da8a358e43074b681a9228790dcb342d3a705cfc0309a7e1e7f498a2a656e972c2fee085ba99fb5214e33758fc3
-EBUILD granite-5.2.5-r1.ebuild 1867 BLAKE2B 3731912ee305d02bf85b53b83f2d45a342494ec21ee668a774cf1426f51ed41e55fdc4d66e38670bb38b64c7945be7d108946a29abd6d3e168e0afff05eced7a SHA512 ff7953d1d51b4317e8043d5afbec2931cb097d36dd71b39cb516f8dff16910d90a9fdc499b5d09edb104e52158f5cbf3b4ac73d79486b84f169f992159b23647
-MISC metadata.xml 479 BLAKE2B 39d2fbbb6b128236ce6565ac9e765928351c4b5f953a96b293a61a3f0deb67ef8a05066b5e0ca0547d616e303c721815c405ca185318b1cf4fe59df31540c170 SHA512 394f3a02381f849c82e112c064c045d7afc2c8ac62e2788c049332447b27b094da1301eb649f562850c04ba02a4d7bddfe49569e5623da8bd714897d770b8dc1
+DIST granite-5.5.0.tar.gz 421478 BLAKE2B 9b6e956fcacf5dba722dd999ed3de527a99bd305a2059bdc39fe00d767f0f855e8f3a4d0854fd441203bb5dfbb250669356f85b64e067ddc08e3d6dfc3fb389d SHA512 981ff9aa42146153d8450989513dd6b63cfb6cf2e52cf3e1d2d6380373b30754d9b357418810cfd14a53689a050f08337ca766b5b8496a4063106f78b377f139
+EBUILD granite-5.2.5-r1.ebuild 1860 BLAKE2B 2d1137832f99c220ce6893bcbc7af6ca471551bd35d9890837aab0f4d5938c7d6f418a47f869d8f729f4145cbdd099aa9796e3de96181e76ecda8f748fc2ef7c SHA512 711548b6e8a56962667195b4f67a55acd125fbcf0751a9e4d08c647ec978db88f50cf1be60d3a064586f3ed30955a5055b7dafb16b439ff19ef6e26eac028de6
+EBUILD granite-5.5.0.ebuild 1322 BLAKE2B 9bf5cce71d79ab7779091cc5c077c32541011c257396e7d39677b572a89ee84ef7d99835e5100d09845fdbff21fbcad56634b50de2f70c998e5b32e4141b1824 SHA512 3f3417d6e83a271b801393490178f7f5586f77a28e114a22646e5f53bd3cadcebf186834b7811244406c0dad1c513ed2f39ac5c8ddf39c7b72942ce202bc47d4
+MISC metadata.xml 748 BLAKE2B 7f6eeeac0667efbdc6bf98c22207688342ec8725865e85a1990ff67d60e5c28e8a9ff88f628ce1b8476362b24a8220ffc585f3107dbfa53241280e2f14b8c511 SHA512 5cf1e483842eea74f495b72e3887c0fc8a64abe163c951b15b130a660de3cd4bdb41a5dc981a6d24b5ce77fd5ae3d567bf6c6c6c51c0275bb12f9a7991f5fb61
diff --git a/dev-libs/granite/granite-5.2.5-r1.ebuild b/dev-libs/granite/granite-5.2.5-r1.ebuild
index dc1cb86a0666..56f8f0eaaf6f 100644
--- a/dev-libs/granite/granite-5.2.5-r1.ebuild
+++ b/dev-libs/granite/granite-5.2.5-r1.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
@@ -15,21 +15,21 @@ SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="doc +introspection test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	$(vala_depend)
 	virtual/pkgconfig
 	doc? (
-		dev-lang/vala[valadoc]
+		>=dev-lang/vala-0.40.20[valadoc]
 		dev-util/gtk-doc
 	)
 "
 DEPEND="
 	>=dev-libs/glib-2.50:2
-	dev-libs/libgee:0.8[introspection=]
-	>=x11-libs/gtk+-3.22:3[introspection=]
+	dev-libs/libgee:0.8[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/granite/granite-5.5.0.ebuild b/dev-libs/granite/granite-5.5.0.ebuild
new file mode 100644
index 000000000000..985b8383dd0c
--- /dev/null
+++ b/dev-libs/granite/granite-5.5.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION=0.40
+BUILD_DIR="${WORKDIR}/${P}-build"
+
+inherit meson vala xdg
+
+DESCRIPTION="Elementary OS library that extends GTK+"
+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"
+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
+	>=x11-libs/gtk+-3.22:3[introspection]
+	dev-libs/libgee:0.8[introspection]
+"
+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() {
+	local emesonargs=(
+		$(meson_use doc documentation)
+	)
+	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/granite/metadata.xml b/dev-libs/granite/metadata.xml
index 7ba599558211..eb3302b9001c 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Granite is a companion library for GTK+ and GLib. Among other things,
-		it provides complex widgets and convenience functions designed for
-		use in apps built for elementary OS.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">elementary/granite</remote-id>
-	</upstream>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <longdescription lang="en">
+        Granite is a companion library for GTK+ and GLib.
+        Among other things, it provides complex widgets and convenience
+        functions designed for use in apps built for elementary OS.
+    </longdescription>
+    <upstream>
+        <remote-id type="github">elementary/granite</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest
index 29a8d1d25032..c8e5b05e3d57 100644
--- a/dev-libs/hidapi/Manifest
+++ b/dev-libs/hidapi/Manifest
@@ -1,5 +1,5 @@
 AUX hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch 300 BLAKE2B f82fe6a6e2ebfda10eb9762bbff1586346ecf8945996599a3b58658c37799d85dc573f8be54bba483f95e27177db3f421d99ac713e7012130d2e2b92252ebd87 SHA512 5b29caa5f7a9b61fffb16226cff9709a5b142c6ac36017c567ab5933b21f06cb17c78a93fa19e8c92cb1443f1cbe97c3687002845965bea2b3ef39eeaef1f4a2
 DIST hidapi-0.8.0_rc1_p20140719.tgz 103079 BLAKE2B f40a4c17cb8c5eed41f4eea84fac46a879ec2057f28212aa43c8fd718ceea68d760785cb4f4e2ea3bcd2a4345b65d75d0d278b93697ec61963be9270684a15cb SHA512 204934a707da4e67b834823650b0cfd9be7b413972071129cc5aeeb93465834dde2f5ee23283c55d35b56e3aed8b7ad5fe947399839081f4d895fb65c8cd3e3d
-EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1846 BLAKE2B 114ceec61e90c1ada45c8eb9e5aec9194be98d8ed19306852a48b59812f3805f24cb92902c76dd84cbce338663488b2304aa932102d3b087749bbe6a30a0bcfc SHA512 2bad7544896966bc660d6f392ecfffc1c6f8a24ce883e53019ac69a7a12fc724f24efa70c1acd8712abac3d311a54b2619020f647541e284ed06eb68ed588c01
+EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1845 BLAKE2B 8739529dfb703312efc9d736a8ae895d4359d8e236960d315145a7195150ebd5945b3d048ef60f437abca65f221a9649fad1f98dee9303956521cb01af28df37 SHA512 e7687e1b52efec017253d1218f5a1f14701cedb9e9fab8c6ab3a272f11109045400a506955f672193ec5bae83264a3ef022c905e9d3c1b2e06045dee3d72a975
 EBUILD hidapi-0.8.0_rc1_p20140719.ebuild 1985 BLAKE2B 87615eda8dea3490a69324a0d07dea4fc79d0792ff132a6d10b5ee8387e46245b3fbb763eccdb8d8cfbbc6b4ec7c0bd16c411ef5a8afa0e60a9d64d390b00d63 SHA512 7e25765fb19ee59e2877c4155cd0495b82e3548e25b1c15ba8b3d2f58ad22711480c766b96f43e150268ed1fb5745c03184badcff35cfc0e96272767b3af8af5
 MISC metadata.xml 540 BLAKE2B 6396197ca946971d1e954233589189f5e91dd4dc4fd6182f5cdf24890a5601a5e32fa71e2f4b2a676d346cb8feb1232467fa569f9348a5b788f5ee4a6838d7dc SHA512 3e0185fa3a56d0bb18f1256fe9e5c74cb5cdaea91cd24054d12243512012fdead25ac69c84a82d282b070bd73be2a9a7e313e858c05e6c2fe49bd38cba4d28d1
diff --git a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
index 869fc66c0990..020ef1b48166 100644
--- a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
+++ b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc fox"
 
 RDEPEND="
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index d7aebbac85d9..9c6eddce81b6 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -5,4 +5,4 @@ DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b60
 DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa66281f26c28c3f80ab4593679122fd59430b2d5f04d20126b4459fc75af0a1fd67f1ee1db691d8db575debad2b61 SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
 EBUILD hiredis-0.14.1.ebuild 1891 BLAKE2B 6a726c09ee27e8fe8a1aa11ec7f3ddbfb107dcb6921173999025db849124f63f72943ded24d31a1d419cbc829bd17b07e82239fa8f191e18e353177d6d37855b SHA512 9f0049bf99a2968dbcb122d4ad67b65ce27e0993a47bf26d8928b40f01889de4d3c725ab92b32b1bbab697fddbc08f4563091585dcdd4d1c0f292a061195f43c
 EBUILD hiredis-1.0.0.ebuild 1908 BLAKE2B 6f415c7c8e2723722cfdd0a425bab7a311966cdc90a2370dd8b19cfea1214649db5bcf10e944c19a9c728f7e392412d8a6e2d192230b44fafbe6b0294eb764ea SHA512 3036ed40a03d1c77a3b082abad14ec7dc2e221832af1b8a221a2fdd251a205d221efa8ef15ecd758c4d8b86772cbbb0cb91222f51c592dd9d6601045c8158353
-MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
+MISC metadata.xml 403 BLAKE2B 77095f90219f95263b17fa5413af441651aa6a56e8bb4f5a4c763ffa7d0524f1ecf2c2fa0819f214fd519fc783071da31cff6d2c329b36befa9cbac64ccd9072 SHA512 08e5981022c6e6b88243dca594b48733707d12ebbeefd3f41d7818d2bd46c362dc0869aad5757b8909d292493f4732834bec1e34cc438e401d57ee871421192a
diff --git a/dev-libs/hiredis/metadata.xml b/dev-libs/hiredis/metadata.xml
index babc01fd3f4a..acda7373e628 100644
--- a/dev-libs/hiredis/metadata.xml
+++ b/dev-libs/hiredis/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
   <slots>
     <subslots>Reflect ABI of libhiredis.so.</subslots>
   </slots>
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index d464485e7251..7ae78c979fb9 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,6 +1,6 @@
-DIST inih-51.tar.gz 16258 BLAKE2B 91a5aee6e0ecadf949fbf0b58bd2596bcb985c76fc9000a671d65cb5325c51dbb8bd945ccd7721b72dafafd11c70a9c84ad910768d0fc479e5491db8b7aacbd8 SHA512 eb2f58979d93e51a09326e6c187828643887ac1a239d4b12205567c7d87a671c9c49ca99db376c031d366bc680e579c30dcea9f3eb130ec802597411b2cb3cf4
 DIST inih-52.tar.gz 16808 BLAKE2B 12d4078ad7b6a4013ea77239c486fb7b5e9165252d4a67ee57d60fc72a98f15ca537b610c7b22841cc660e46bb424aa5c9b7ed1cf2462600a2aa58d40447ba90 SHA512 14c0d0dbd78efc99bec8df12067107d130eef8b124e0616f7d83dc4e14530b57f0c8fcf0b8862d425b5a0b84d6c6a6bff7b3c852c9b2e2364ef56c8f64a1f339
-EBUILD inih-51.ebuild 733 BLAKE2B 35c324b1927627143e78e9f18e6121e5092541ac96ff10b17fe7717f546bce6ecbd8e0f0aea086a736543f44b2fcdcc3976b3f1364f8146c39fc279b1c0bc5da SHA512 a7f9767609347bd9618156e41815b13f88551e7531f4c6ba5df58caa362d2395aea12466dc19225e2e320dc893ef17d0b48e0dc7976d36a353a46bdffb616902
+DIST inih-53.tar.gz 16984 BLAKE2B 1242e6273c9dd9a11ea026a3495a487b2aa72d8e01f34304d8568c88897ae9c9bb425246f992dc16f4dc2210ec14c597d0ef595cec84ff98a5d6101ee5a643b9 SHA512 99bc40c294b521e9973184bfb30d60c129735991f33b387b3d023827a34672b0489eadf91e38895ea725168dbc7b27bb02c1975debe7573b4b209d0e947b2100
 EBUILD inih-52-r1.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
 EBUILD inih-52.ebuild 791 BLAKE2B 09983b3a0fecbc3bc76218f7852778282568682a355c2e9644205b8adb0efc6b4710e5611b08c674359ac828aaf8c7797788601f0eac5ac3b9b5854cc2f9a0c8 SHA512 6da75c3754efd2dcce6e7c24e13ed14880427d6291d2d01e35c15b4d67b1ffb2c2a9d390ed4b0c73e56b1593c1d31ca0ed91914543aa150b2bcc3eaacf8a8ef9
+EBUILD inih-53.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
 MISC metadata.xml 505 BLAKE2B 304fa736140ec6ca3461e31f5629e22857ece165c6f16dbe4632211f05d2d4a45c2c9b5f35e858e81ae0d11cbdc87b3fc4977b55c0032cc115b65df43466242f SHA512 09e559083c0457cc38eae5efe344d035fbbbc860ae1ba268462ff821a467712d599c3cf7292d44f9a9f0d99674b0a1d6650e199147403686e859ee20d8fcdba3
diff --git a/dev-libs/inih/inih-51.ebuild b/dev-libs/inih/inih-53.ebuild
index 3cbd85dd6604..288ada671b4b 100644
--- a/dev-libs/inih/inih-51.ebuild
+++ b/dev-libs/inih/inih-53.ebuild
@@ -1,31 +1,26 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit meson multilib-minimal ninja-utils
+inherit meson multilib-minimal
 
 DESCRIPTION="inih (INI not invented here) simple .INI file parser"
 HOMEPAGE="https://github.com/benhoyt/inih"
 
 SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 LICENSE="BSD"
 SLOT="0"
 
-DOCS=(
-	LICENSE.txt
-	README.md
-)
+IUSE="static-libs"
 
 S="${WORKDIR}/inih-r${PV}"
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Ddefault_library=shared
+		-Ddefault_library=$(usex static-libs both shared)
 		-Ddistro_install=true
 		-Dwith_INIReader=true
 	)
@@ -34,9 +29,17 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	eninja
+	meson_src_compile
 }
 
 multilib_src_install() {
-	DESTDIR="${D}" eninja install
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	local DOCS=(
+		LICENSE.txt
+		README.md
+	)
+	einstalldocs
 }
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index b7fad2efc949..4bd087b91cdc 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,6 +1,8 @@
 AUX intel-neo-20.37.17906-no_Werror.patch 324 BLAKE2B 60fa6150f50986a12daf7a55b49cc7be6c8a6c314de750937f806ee0f057140a0d41630352914e529e79adf30ccea41bf0f3bae3cec68378ad3897e3047c7202 SHA512 74843a8a6114dc79d92906f957dcb1b411007ba4c27ebe1b46121acfd9dae34b122e711cfc290ecced7f5c622ee7340c8294fc7ef45b88dfdc6ac807cbac1785
 DIST intel-neo-20.16.16582.tar.gz 3042531 BLAKE2B adfc0aee2a315e67ccb3e4fe39ab09b618930607d3de931d1367881642d8e542385589299f593d3ab1cd6e16de7a8fce7b55fa1b4259097e15da7e55034d344b SHA512 700bee3ccf72c2bc89f5c8a75591de9dafbfe0a6480e3216258842c6b68ce1b527569d5fe1327a0a80cfbf79dca1d956820f060b602feefa83fc9b47cb46d7d0
 DIST intel-neo-20.37.17906.tar.gz 3492080 BLAKE2B e133dde18c67e5b50dc65372faeaf78ee2512adf80f6869e9a99ff18aba5463b2c47e62cac3122eb899c644f5bbea6dd3205d348d071ea8854e3271b9e25fb34 SHA512 3db9b05dbfc05de8e5aad4eac631320642ff03444ff3eafe0f9cf72897e2dfb723563ad9f953a900a19511cc8affd3832d3f3fa966d9388714c326c71180e8f6
+DIST intel-neo-20.44.18297.tar.gz 3586089 BLAKE2B ddaa719db25bb9b57b76a47c438e7a3185a15ce0863665efa7dd205354684773dbc89a05c943a87987588dcc2220683b47e7209ff959b2a8ad596090ff253c15 SHA512 919aba7cde56304c84db7c7ba30c53fabcca72ceab362a2b406f5ecf124e1c024980c29689f19b173b76c903da1cb25a4f1e4b19ba9279bc6ca2ad1d100e046a
 EBUILD intel-neo-20.16.16582.ebuild 1196 BLAKE2B adf17e562863b87567606424df2cd99bc033f558233010185dc62d1d3d6e75c21ae59a46a2da5428512d930491128c64aa51a660e7b4fee22d343822dff7c6d6 SHA512 2957c918f1ff3a84b020b92192eb84177b4002006675499fd9f53a67dd921bce96d8f4c2cad60117aebdde0e2b985c767228c8f8fe3dd1c68c3d91cbfa51e574
 EBUILD intel-neo-20.37.17906.ebuild 1260 BLAKE2B e440657f16549c85761afa6737523733b0b88cb350c49728df98de3da0a6a3149bbc08a4e5191c28462e351872f05fdfff1046322678601139a5aaa70c07b09f SHA512 c78b0525b5a17dc7353620ea3164b6674c1601d0873794fc75c82b8cfb97cf4699dffc37e5bc70f017ab9dd5df51887231999468d34ab886638edc4fa2f863b2
+EBUILD intel-neo-20.44.18297.ebuild 1260 BLAKE2B a0bb152b9fd94a30ed9de552611b461e65e82321c9e7f29470f724b42edfa345bd11cbf13b0e7daeb1ae536b4fb3f7368c2eca30fa177c04f91f7fb24fffbcaf SHA512 3480f3bbe928354b9240cadcc244676f7d4814417eca30568787304b73b4df160f90bb3dabe23b2eb384e67081bf722ca832a70bad0d20e6e28faa8618dac64d
 MISC metadata.xml 1095 BLAKE2B 4669305d1799b9fde4b63f735593ad7e42d17b5ec65ef482a316c7347bdcd0c37b99700f4a29865352dc18e06ca8c38ddaeb650cc12793ecbca7ffbe6eec27cf SHA512 fe9a420c66ee8a86954f52d824a4f812667a5a84fc2fecdc286bd590413e0ac1ae55452dc736a4b315a0cbf15ac22f8a4b682226cac8b2377db9533bedb13fb2
diff --git a/dev-libs/intel-neo/intel-neo-20.44.18297.ebuild b/dev-libs/intel-neo/intel-neo-20.44.18297.ebuild
new file mode 100644
index 000000000000..0499936a2f01
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-20.44.18297.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for L0 and OpenCL, for Broadwell and beyond"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="l0 vaapi"
+
+BDEPEND="virtual/pkgconfig"
+COMMON=">=virtual/opencl-3
+	>=dev-util/intel-graphics-compiler-1.0.5353
+	>=media-libs/gmmlib-20.3.2
+	l0? ( >=dev-libs/level-zero-1.0.0 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)"
+DEPEND="${COMMON}
+	media-libs/mesa"	# for Khronos OpenGL headers
+RDEPEND="${COMMON}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.37.17906-no_Werror.patch
+)
+
+DOCS=(
+	README.md
+	FAQ.md
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
+		-DBUILD_WITH_L0=$(usex l0)
+		-DDISABLE_LIBVA=$(usex vaapi "no" "yes")
+		# 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/libarcus/Manifest b/dev-libs/libarcus/Manifest
index aef259903168..9be2e8e93a88 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,6 +1,4 @@
 AUX libarcus-4.8.0-deprecated-protobuf-calls.patch 1395 BLAKE2B 6488f7da07b78df1f18826a62f47cc2a7835ad66f7c5f999a4926caff9bffa8125b39f44cbb4e5849b3283c95898120c2cdc0947c9008869af91db08f0036e55 SHA512 f98cdd0d15d03752cd04466211cdaf2fb0ebb4f9a5aa887c4f9a1df5c32ced18559952f89c4549ea93376d95ec0b1bc51289ce87256804d2fc453686d48b55e5
-DIST libarcus-4.7.0.tar.gz 31944 BLAKE2B 93cd7e8dab674b1e145c0fd15bcc8901982e9c26f82fa5b6b9582568701b70edeb1a589e1e1c94f9e14100d08b12580e58aa1724917b88f9c099f12ca47e4e57 SHA512 5eb8e84ff8e87966fc3ff1d71ec69f8fece493e25e022f7f1ba7ef218e75b5be86cededc28faf57634b09617990f62247e6cd6f373f940cf145ee6d8e8635374
 DIST libarcus-4.8.0.tar.gz 31906 BLAKE2B 677fafa3875834c7602bc85b7246f50ed0dc49e886814c4562ce41a1a7baecfb4fb0bac42aada5339fe73cbd3fc5ac3b28076bf72a1e24591a947d747c6eb794 SHA512 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689
-EBUILD libarcus-4.7.0.ebuild 1294 BLAKE2B fbfa097a08c44fe916c0799c90ab03de76b680e3b504a1d40e0daf851966c09d8b3c818eb7f90c9929baaea0e4fa11b81c72520917f52b70087f02eefed9d74d SHA512 93fb333e31bc227332657ef90a96b2ced20b57e533af17e2f26d151858b98668fb9f8b5978d5dc7fec612b33802de58dd826703cd0b1d74adf9911dbcbfc2b06
 EBUILD libarcus-4.8.0.ebuild 1359 BLAKE2B 5f0b775d5bd0e4fef3371d0489cd7130554cb4995e08ffd299b57d64a13904790714c890614eeec2a62196e240ea38260c0d83818eaece3ff57886d247fe9e17 SHA512 8679d5641f0edeeb45cd218f277508ffdb86ad4b3de1c12dd98d0e02f27ad06ce6f58b9ea01887ad0cfaa2587ac46142f21adb119bea9c88e5dbc360439bf2fa
-MISC metadata.xml 1175 BLAKE2B 61f841d29c806ed268ad8012ec6207ad00e404d31ce17ab6a94a72a5b14bf4f7c4220ad95ba527f4004f04fdfce7fa6aa868297bae1842467c7e8bfd022977c8 SHA512 7d2add76530f8977dc69996c7e627e7ecb7f875b4d048b866f2a61c198b457a672bea2173a3bfdc32a68e6f455d484c3a884683a01d785c1fed3d2741d61ac49
+MISC metadata.xml 1241 BLAKE2B a66129e61057c7070716f15f8fab75dcc7d1e821bc0f213b3d8f9ab19e8bcaf74fcc07ec412fc290d0ee2776933e199c47fecc9c0c7dc57c204724e6fdacd41d SHA512 b141e6fdae8e4bee2d2ad3f54380948dfcaedbe1815590c9d3a247a31a3c34cd3f22382695dd15ccf9bfa05edab8441ca67d5bc598f6bec6d916ee1eb2e79ba5
diff --git a/dev-libs/libarcus/libarcus-4.7.0.ebuild b/dev-libs/libarcus/libarcus-4.7.0.ebuild
deleted file mode 100644
index fac98cb84b15..000000000000
--- a/dev-libs/libarcus/libarcus-4.7.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="examples +python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/protobuf:=
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Find SIP for current python version, not the latest installed
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
-		CMakeLists.txt cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libarcus/metadata.xml b/dev-libs/libarcus/metadata.xml
index 87e4648615f3..24c5cdbee943 100644
--- a/dev-libs/libarcus/metadata.xml
+++ b/dev-libs/libarcus/metadata.xml
@@ -30,6 +30,7 @@
 		<subslots>soname major version number</subslots>
 	</slots>
 	<upstream>
+		<bugs-to>https://github.com/Ultimaker/libArcus/issues</bugs-to>
 		<remote-id type="github">Ultimaker/libArcus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libbrahe/Manifest b/dev-libs/libbrahe/Manifest
index 625925f95b37..af6952f1e473 100644
--- a/dev-libs/libbrahe/Manifest
+++ b/dev-libs/libbrahe/Manifest
@@ -1,4 +1,4 @@
-AUX 1.1.0-missing_libs.patch 225 BLAKE2B 9c5e3e5bd5f6ea0c1c1c20d27e8d4fe5a6e3b7a0a6adc7cb3012a4da1a884cbfc95dc580553f7f37e1193fc5a68891b839fd45c5a2fafd461389517f74862ce2 SHA512 2810c4ac9197c3b1541edc1ae0c30dd2b273b008b394999d3a96cc241d64befc5c3caa41af89398ddb65552ad72033f8ed593977b88fe7e8eeae05e12bdd1f84
+AUX 1.1.0-missing_libs.patch 152 BLAKE2B c82e98a978de8f9446e14a87f0a6aa7eee20074720beb530903f8b30254e981d29197e405c6ace3a17873426a531d0d730c872a96dda27f5f0a7ee4fd24b5dd4 SHA512 a408e593193fac9601b781b85f585959b9aef9d0fa4c872291d5a141214be9a87b5f54b28521d99c3dee31054324389554776922770ac8477bbe35cc65cd6114
 DIST libbrahe-1.1.0.tar.gz 344264 BLAKE2B 84d32344ce9a8f8447b2963d88352a48ec286d1f9c7f39f9ac0da019198cb06f5cc9909eef891ae1e324bfc4a29eea9df4c9a6685f388098ece0888fbeeb4c70 SHA512 54f2d0c9c1c04429fab59d365d6a4144eed29a400edccd7ed9e5d19876565071ac76686da73e7f84c857057c8c52e1b85d2e257203724cbd9f1877d76024927f
-EBUILD libbrahe-1.1.0-r1.ebuild 516 BLAKE2B 20353544e201b08b066ee1c6bd6761f3ba4f8d5e108c03b66c941f14532302fb2a05c0d40702b21198a8c7081baada9a016e9f4f3f489c9f6d46770025ca171f SHA512 a5520700aa021e498795291cc2e4a991c874a8a939dc0b43d68925e58fcba366e349a596f651f1a4543e3d1969657a844deba7ebf046356313b9696dff616f4b
+EBUILD libbrahe-1.1.0-r1.ebuild 577 BLAKE2B 3c91faaf48b8866a8102b03bfe5d744a4547458e2340e71a1c0823ab82434f4e186213671110f023133d2092c901c22bf573227a2d1dc0d787c2ca1d4e33be26 SHA512 19b36950c80a25326c15be4e1e92f261f534eb880c7453be5c73f2abf7d0ef40db7628bd74390df1e7ccb3a74d3ff3e9a7e86d64b1803bf89056644d5107dc69
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libbrahe/files/1.1.0-missing_libs.patch b/dev-libs/libbrahe/files/1.1.0-missing_libs.patch
index 7466f917f9da..d9153a812ad7 100644
--- a/dev-libs/libbrahe/files/1.1.0-missing_libs.patch
+++ b/dev-libs/libbrahe/files/1.1.0-missing_libs.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.orig	2008-05-01 02:21:34.000000000 +0200
-+++ src/Makefile.am	2008-05-01 02:21:47.000000000 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -14,3 +14,4 @@
  
  AM_CFLAGS = -std=gnu99 -pedantic -Wall -Wno-format
diff --git a/dev-libs/libbrahe/libbrahe-1.1.0-r1.ebuild b/dev-libs/libbrahe/libbrahe-1.1.0-r1.ebuild
index 4d2e451c2a30..63f386c80ec3 100644
--- a/dev-libs/libbrahe/libbrahe-1.1.0-r1.ebuild
+++ b/dev-libs/libbrahe/libbrahe-1.1.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="A Heterogenous C Library of Numeric Functions"
 HOMEPAGE="http://www.coyotegulch.com/products/brahe/"
@@ -14,7 +13,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
-IUSE="static-libs"
-
 DOCS=( AUTHORS ChangeLog NEWS )
-PATCHES=( "${FILESDIR}/${PV}-missing_libs.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${PV}-missing_libs.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index d68d8ef008bd..057d2c5f042a 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,3 +1,3 @@
 DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
-EBUILD libcbor-0.8.0.ebuild 1362 BLAKE2B 75cb665f11a9a8185dadc4af3a04f5a191bc12af4e3284359ce0e99c22cc0a33a6a36731fc8a9b66fadd37308f71d83714677222234fe342a99472e8ba069724 SHA512 750c9ad35a639629a2fab80e73e03d074a0b70a0bec0ec44a5790e1a6a146fca16ff357a2f515601d60ab3026644e07bd44047dd1ca43db07267323518100be5
+EBUILD libcbor-0.8.0.ebuild 1410 BLAKE2B 3ad39f5bb83d22fee253e59a2b64e35a4bc1adc49a2032bcfd1527f2b1dd381bb0a7e5abc5c8318e329d5a8de35f7abb2bbc1717d6b632c80d15c1f2f7ed85f8 SHA512 f1caab5b2558387f561e8afb7aa22b21abcd6e97d756268f33c065e499aabe6e577849425541924ec2c43b50eb8f11b96ebcccb89376e7730a365b986eda6daa
 MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild
index 589fa21feab2..a59a570f5eb1 100644
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
 	doc? (
 		$(python_gen_any_dep '
 			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 			dev-python/breathe[${PYTHON_USEDEP}]
 		')
 	)
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index e9cdc1068689..df4f1b0b30d5 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -7,5 +7,5 @@ DIST libcdio-paranoia-10.2+2.0.1.tar.bz2 589075 BLAKE2B 9d2a2d288ccd13ca4ce38a89
 EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1874 BLAKE2B 2b751b7cb423b578e24ab7316f4f24486c8714417831a7e182b885d667d551a8fa997253703effd435a5ba7425deb8e71b545279d26e2294836488e9a6aa7541 SHA512 d1de0cd5c1fc3dfdd43cc2d3d7244f0f216543e947b499d23aa959b13394ddaa7f9db8d9e90948c4b1eb835677df57de9d4a0d0a0dc7cd3025bde76a53784c04
 EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2105 BLAKE2B fe43fe3ffcaee953b476907e8bc9bc4a16f4c2ec6016f2f792972bc40f5c582db904924bf025f9783e530bda0483c15cd1c587b1d940fba0cca4c11ac19f5fef SHA512 19d32ac3062983579041c4d60ca70c263236c95cab386646893889912fc28f1b67a040410971186ae452ade61683a9e2b272a3cc809196e595ed34ea7e85889d
 EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1863 BLAKE2B 4845a7f2cd91ec4c6ab8b4248ff89bc46b760cb6d325d7217098039efa312e10039c139c0e601fa513e9bed258bae775c4c436989b69cd73e007129f20fd19a8 SHA512 b618eb3dc8359160b6f055b65135666ad67fd194340b84c0253565d59e5c099aac3f6ef76a2c25d2527ab2ebdcd3e0eb8869bff5ba5aefb4d32323824b2f8883
-EBUILD libcdio-paranoia-2.0.1.ebuild 1863 BLAKE2B 62d277a00cbba2bd98179e23142a1223b31a98901374e1ac5ba922b8cb7f350791ab959c2482a118cd59ddd3dad1df088cd8e20d57441d3254fbc757007bccba SHA512 2a09e3a6b502fbea143572d44e20bfac9bac14f406f2b7b0e4c32112f4ccc00d4f27f4b1bd4ff7e8971fa8e9284413dabf21f9225daeb024bf67bf0ea8440dfa
+EBUILD libcdio-paranoia-2.0.1.ebuild 1861 BLAKE2B 0fe86632e1d39ac70f6edb6c760b1717bd732ab238d63e3b0bd6c3d2808ac6328bf4236f792783b6add0aa12761e5c731c9e8f601089fcd703acb31102baa5c2 SHA512 549465168cd729329f2845cced1d0e36e15410a398050efa7d8daf22bc30a247e6d0985576a490972a4d930373b202e0239ae12be04e5ba55691d38392f3a49c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
index 4f47f6882ad1..0664c3353804 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0/2" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 00058820b50e..31fad7c476af 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,5 +1,3 @@
-DIST libcharon-4.7.0.tar.gz 151221 BLAKE2B af9fe83e07303e1ff296b878c9745a329531a9957ad16a9b39b36e53f3f2275f850806b6d1a51638013c7148f3ee68b92489a67629a6026056a8c4ed3f2338b1 SHA512 690ce086bf8bba3eee2ce087d02ce00c23a7ac4079b0a2961c05cf75d461b0d5dee0c1f86ed769b50f1cd9ef83d8570a54f4fac628e0c19a5a593138292bc64c
 DIST libcharon-4.8.0.tar.gz 151223 BLAKE2B fe4d2901908367569b45c466d31ac6e290979a8bd39c84f9c3ceb3ed91e9d9f1a789703fa5006706e21d77bd46b3185571df3f6157c7722e3e35244d27e0231c SHA512 33d3e9aa4e356fbf1d41555cfe2a5470d8f02b1d4f59d83e1ba89236b5e4489a93bdf24fad6f9bd2b0f843c053c485a082f5ee57437862ac40522aa61280b19c
-EBUILD libcharon-4.7.0.ebuild 1780 BLAKE2B 4efeb4d02bda95edca92de8e2e5d844463a1af6a1cf2e4a8c53ad172af051c3ab9ead90865ae6eafd0aec50995d5505739b882785e04702ed0f1e0cd8e9ff19c SHA512 d431e8b45fa1d5da7756ad62ea326b1ba58fb35bf4d9566796bd6be66168c75c4e922684203b4becd5fe5ea2204d0fcae0590eafa545866222ed1ed0dbdcbbd7
 EBUILD libcharon-4.8.0.ebuild 1780 BLAKE2B 4efeb4d02bda95edca92de8e2e5d844463a1af6a1cf2e4a8c53ad172af051c3ab9ead90865ae6eafd0aec50995d5505739b882785e04702ed0f1e0cd8e9ff19c SHA512 d431e8b45fa1d5da7756ad62ea326b1ba58fb35bf4d9566796bd6be66168c75c4e922684203b4becd5fe5ea2204d0fcae0590eafa545866222ed1ed0dbdcbbd7
-MISC metadata.xml 1098 BLAKE2B 6167df47c3514dfd94d9e8d9046167ec1af4b02a224428671f3a3a70471f4fa81805ceb18c9ef85fa687e74c8229c2ee0d1601c9203c329b89644ad300611b30 SHA512 a41c8b8bf3904242479f66cae5875fe9991e8ad1b7cd706393570218c223985c15cce9701b4c4191a6b5b2d15d72a45e3743bfe4c6d985ee6861483ffa24b358
+MISC metadata.xml 1165 BLAKE2B 91dfa3edb9222a10c0f765509ab07eb3c0b67fc7d32a225b5658aca044e31833c1d1ce50c123633fcb6931425e5360039d82c1f02baed65778468674d3176e92 SHA512 66086298cea86cdd6e45b14c67f4723baaef3f6e61ea40e3266cf2ef2d66f48c8e55c4daa2e72dee18352cc4b992db5e20d70e296bdce10f99cbf26d36b39c4a
diff --git a/dev-libs/libcharon/libcharon-4.7.0.ebuild b/dev-libs/libcharon/libcharon-4.7.0.ebuild
deleted file mode 100644
index 9cacf998c084..000000000000
--- a/dev-libs/libcharon/libcharon-4.7.0.ebuild
+++ /dev/null
@@ -1,73 +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} )
-
-inherit cmake python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="+client +dbus test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="
-	${PYTHON_DEPS}
-	dbus? (
-		acct-group/ultimaker
-		acct-user/ultimaker
-		sys-apps/dbus
-	)"
-
-DEPEND="${PYTHON_DEPS}
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# use current python version, not the latest installed
-	# fix python install location
-	sed -i \
-		-e "s:find_package(Python3 3.4 REQUIRED:find_package(Python3 ${EPYTHON##python} EXACT REQUIRED:g" \
-		-e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}\.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" \
-		CMakeLists.txt || die
-
-	sed -i -e "s:/usr/lib/python3/dist-packages/Charon/Service/main.py:$(python_get_sitedir)/Charon/Service/main.py:g" service/charon.service || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_CLIENT=$(usex client ON OFF)
-		-DINSTALL_SERVICE=$(usex dbus ON OFF)
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	python_optimize "${D}/usr/$(get_libdir)"
-}
-
-pkg_postinst() {
-	if use dbus ; then
-		elog "To start the Charon File Metadata service at boot, add it to the default runlevel with:"
-		elog "    systemctl enable charon"
-	fi
-}
diff --git a/dev-libs/libcharon/metadata.xml b/dev-libs/libcharon/metadata.xml
index 8ac90e1ed2c0..12642d145e05 100644
--- a/dev-libs/libcharon/metadata.xml
+++ b/dev-libs/libcharon/metadata.xml
@@ -31,6 +31,7 @@
 		<flag name="client">Install the charon client library</flag>
 	</use>
 	<upstream>
+		<bugs-to>https://github.com/Ultimaker/libCharon/issues</bugs-to>
 		<remote-id type="github">Ultimaker/libCharon</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index fdc1752cfc18..df1431fc54da 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0-r1.ebuild 3878 BLAKE2B 7d380607efde9f649cd568d619ae201590df6dd6c1e7e1c06100bdb6f2c09050923ae2fa53c475e29dfb68f8d898dba1fc2ef65dd8965c5554b41f9bbb3aee72 SHA512 78bb1a095bcd774a72bf08e35be9c63228fadea7bcc0c27954dc2766610c55807a67081724c222234e523d0e5ee6dd1e639bb8258b90f31d59204f3df68316d8
+EBUILD libdbusmenu-16.04.0-r1.ebuild 3877 BLAKE2B 8aca06e1b0dc272fb6828e30b49034c08c4f9cad6d5fa5650ae98ec63ba2184a4e23ad7994641715a190cc2c3821a9346c7c5a274ab726eea2fda871d2b681ac SHA512 e983bcc5626f812e4888a6dcbd32118920e8313eb5c938a4ba2c26e394aa010d9676a0b12aff00ff2ce1750359508588c066b0822d5861c6ca43b91fbcbd2b3d
 MISC metadata.xml 361 BLAKE2B 93f09713c694acddbfa9011a7a8c688341336d641ac74e49e914e2e099865fa6f7755a645dcee37014f5251b1577b980cb2b62e06d17f3d74ef5f0c02b0e769c SHA512 65033c817aacc6bf81e47970baca8feb6dacfcc74ed788806f65dc49e48178419b300edac867688f1be36d2ffc9291366274832912fa61cee48c328ca8f55efd
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
index 2de4fb108df9..5b989cd3913a 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.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=6
@@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 60a4ca7fa544..cbd2b36b88af 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -2,5 +2,5 @@ AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
 EBUILD libdnet-1.14-r1.ebuild 1505 BLAKE2B c56665847b90b14919528c753e2cc87d311d3c378c32eb26c2389e59c5a4d883c00d03e1fdf9702195f1d50608fc85958309e56dd041c51e94588b20de91f861 SHA512 9d6e0f8c10d8b0cfd24b13462caa2e47fe49ec04b52f029d1de20939be26d0c5617b37fc65ad9c7566f2a6ed3c2cf9e58d78a5594b0793f5460f2110806b9188
-EBUILD libdnet-1.14-r2.ebuild 1555 BLAKE2B 74f15395298f5c33519f8a632439ba2225ccfafd7b482c6b6097fa45857560aa5d60a90e41d85d2d7b64f1197b965768dcca6bbf1e56893e26025e0af756d434 SHA512 31b20b182799acdeb281a6b48b5a78e601625e519049981e6822da0e57a908fcffa02ebe0e777f1fbacc1d833206994dc533b7e714d03c8f674f8fd2d2d5a609
+EBUILD libdnet-1.14-r2.ebuild 1552 BLAKE2B 08235991e92a0d66f72a857ff14da37675d54bea6920d482b9d7f372f6b1ac2467e68701869e9ee3b836d4fab657118ae2e93d58a6935f83232bad324c294f56 SHA512 718018738ff97196bd78c923b9034278c8fad1396f31395f3a514e348c5604205920c06c698e6bc802d20aa5aa2932214e8b5a975adf9752867b1d7172ab91c2
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14-r2.ebuild b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
index d523c10b8b64..1b5ff4c27888 100644
--- a/dev-libs/libdnet/libdnet-1.14-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86"
 IUSE="python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 83dc42dc0f00..793f1ec1c76b 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -5,5 +5,5 @@ DIST libebml-1.4.1.tar.xz 70096 BLAKE2B 9b4ae80bcc2184f018c25f1a644acdf9e79c5ebc
 EBUILD libebml-1.3.10.ebuild 601 BLAKE2B b86e87e70d8802cb2f3c7d1a5670f25f9f2d7167d8ba16b830300ea9e3979d7f0a1b6bf9c1e26055effa4b52f27e326168d885a47933f1a5e094c4ddb742e32c SHA512 5f777da9fe58cc72eb8e354a3d2d59cb7cab7cf411a85805cf368cafd0849ef5ea3a064ae13243670c5de8819f9185c94e6c3088acd15d589a2d2ece33e103ae
 EBUILD libebml-1.3.9.ebuild 594 BLAKE2B f6d165e999ba2127e529b26077f532c64d110d0fb481408f6be06733f573ce401f4e622d2fcd13fdda75343b84f5cde6cd962fa131f6b3bc73d930c9a0714395 SHA512 7a8f357385c3169cf83e4364f31067e6bbdd827303042412a792a921ff8be8fd8b758847202b47aaa0f611721301ebffc9eca8ad3c2bb80dd37ba9d8edc251dc
 EBUILD libebml-1.4.0.ebuild 594 BLAKE2B b83fcefa006b8d180ad9556ab51a4a3c623df1608dba85f70b4004ea6bf47b6372c724c27bace7c1aa72d71a5875dd25daa1eb61ea9afc672bac9f617173edca SHA512 74cfaa253181ad4bd3b261fcaeeca70512b0d7a23df344fe63ea92dfba6f78bf3acdbda15c3f4e704f8ac91f97b9881c850bd40c6912f402bc1b97b81aee6e9b
-EBUILD libebml-1.4.1.ebuild 597 BLAKE2B 0ca038cf074bdb4c6a6ebaf46a8632424bb571489cbb241e45feaf54b42d27ee8627d7595308e7b79e23b6b524e2b50d8cd9a353fb51c5b3074badeaadaa022b SHA512 4c755e05d1c9e6e8d4f1c3589f7e3d28f10b04c04e142da35cd8ea859c6788d91651763145c9ab5d951ed56f11bbfff53c7da2df918920eaf683d01ce12e42a5
+EBUILD libebml-1.4.1.ebuild 593 BLAKE2B 8382b7e46f03893a9dc8e391a135e273310ddbd72fe67fde73c5c39bcacd923de3f2ceea20bec16856f8d5c18be8cb1b3eb4fa27247508d19864cdd8353974e4 SHA512 312bbd96232c5d202e0d81e7d176cb59739646858b1884fab3cea467857937b76dcadd167e885ef364313e3ea479d9b122e021caaf5c544cbdc77554d95d0566
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.4.1.ebuild b/dev-libs/libebml/libebml-1.4.1.ebuild
index 78a7706a34dc..6bab6b4c17bd 100644
--- a/dev-libs/libebml/libebml-1.4.1.ebuild
+++ b/dev-libs/libebml/libebml-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 14b5f5ad4ac8..4d59a8fabcc2 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,6 @@
 DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f
+DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
 EBUILD libevdev-1.10.0.ebuild 1252 BLAKE2B 445b3ae22bb70fb6d4f4e9f36dcd1baec01d28b0b4c9c8f3efe26deb452767f6db4eaa1c2049acc0fe31b4a5c9228f7e2ee43cc6acc5a38f8053dd1255c35407 SHA512 2bbffed6d3693907dd99588b83a76db4c9b19c7c0eeb90976a4e4dc58d527097f540ba75a77c3f31e9e3cb0d144eb5cd2fab6e7db0b5e7225bb85a6cfc3d7894
-EBUILD libevdev-9999.ebuild 1253 BLAKE2B d5abb022d4bd0409b5bdf3b9614cdd30b8650796fbb3bb510505c65576f75b6be872333aed5e953cafa4856df83f2b2d09b078c2fb8c0f3bab9ea3b792019dfa SHA512 651eecb8b2840382cdc4bfbb3885bfd9b1d7ad0804b73fa8d659aac4f6a41276195a01bbac8c4f1a6ca7b7449df938f1b43ad2ce58cfec9f6d3141259f59f565
+EBUILD libevdev-1.11.0.ebuild 1260 BLAKE2B f06f9461a4381547ce56b71d46ea692c867307fb33277c60b61a6297746ccf78187bb78ffba6c7992b587386ce1cae9957d090c7df00964b1408a03a4babf38b SHA512 154a3ef875538cd961b97e2f5dbb29085b5cdc6204d7fcd65ddaefe7ad1464398040fa87c4fa5c33a825054f13e81d9953193b534b114311c5b73be622bbc2a8
+EBUILD libevdev-9999.ebuild 1260 BLAKE2B f06f9461a4381547ce56b71d46ea692c867307fb33277c60b61a6297746ccf78187bb78ffba6c7992b587386ce1cae9957d090c7df00964b1408a03a4babf38b SHA512 154a3ef875538cd961b97e2f5dbb29085b5cdc6204d7fcd65ddaefe7ad1464398040fa87c4fa5c33a825054f13e81d9953193b534b114311c5b73be622bbc2a8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
new file mode 100644
index 000000000000..11acafcb2294
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+
+DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index dbdaeebcd51e..11acafcb2294 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-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
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libevocosm/Manifest b/dev-libs/libevocosm/Manifest
index b16e299add05..2cbeb62c4216 100644
--- a/dev-libs/libevocosm/Manifest
+++ b/dev-libs/libevocosm/Manifest
@@ -1,4 +1,4 @@
 AUX libevocosm-3.3.1-gcc47.patch 402 BLAKE2B bf6e11eabc9229ff8fe0badb61b01089a46a34abda5d42912caff7e6d494e01a55ab4de06e646a5af73d118314f9b023feeeff00cfd644c4070f2fe4eb7313f5 SHA512 2d4b2f615e17fdbcd8dd481384172755bfc26d98f6b3807d866e33a96f676292c70487b1c3c35b67d7425eec8e86733baad62da51be696c457ee2100fc180bf8
 DIST libevocosm-3.3.1.tar.gz 414392 BLAKE2B 7952cb83a1d5affa4e9b267670cfc889373fbf5c461fdb7022fe1c4af01e2116266f298b4a6ccbfc8102e0bf38fb8411eb6b741e5d72ffefe97b15281a7e44e8 SHA512 ebb4200ac533bdb86051a8a33e5da08d677ae0aa8c2e65a9855e9465b76827c0a72f31e260ee34be62600cd22794a4e47c4471623de8d9fcb4749dcf0a37d946
-EBUILD libevocosm-3.3.1-r1.ebuild 919 BLAKE2B 6635912617107ec0b43fae192475ad89d6b0e8074792a47367638a7e1676292bde5dc7cf0407f9e4ef437d1186dd9d7a85d506c61f8ef430a4bd9938679ec18c SHA512 c232915948aa0e563354b8f36b073b3b6f8886f28d895ef2f766d89dc0a4464798429ae3f55fec1ebabc6c071be9978d58316e02673801aefe3cd984956ac5b2
+EBUILD libevocosm-3.3.1-r1.ebuild 906 BLAKE2B b43a17983998f831a434737a6dfc098555407a303862fae5afe104939740d63c64b0e080dabb20a0a3bf2ff2816ef511433bb98fdaf766cad43740b098ac6199 SHA512 a80ceddb1cec94a2b4a1d3da03f658c97403a04909554f99766852c10be49ff6b4e2d4b94c07fdc485ae410ecd81457b5dcaf3b19953bc48060a7618376ada73
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild b/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild
index 877fc757d405..310e22a38dbe 100644
--- a/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild
+++ b/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="A C++ framework for evolutionary computing"
 HOMEPAGE="http://www.coyotegulch.com/products/libevocosm/"
@@ -12,37 +10,40 @@ SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
 
-IUSE="doc static-libs"
-
+BDEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="dev-libs/libcoyotl
 	dev-libs/libbrahe"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc47.patch"
-	epatch_user
-}
+PATCHES=(
+	"${FILESDIR}/${P}-gcc47.patch"
+)
 
 src_configure() {
 	export ac_cv_prog_HAVE_DOXYGEN="false"
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_compile() {
 	emake
 
 	if use doc ; then
-		cd docs
+		cd docs || die
 		doxygen libevocosm.doxygen || die "generating docs failed"
 	fi
 }
 
 src_install() {
 	default
-	prune_libtool_files
-	use doc && dohtml docs/html/*
+
+	if use doc ; then
+		docinto html
+		dodoc docs/html/*
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index e1b1cc1671b4..a048612a2e62 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,6 +1,6 @@
 AUX libfido2-1.5.0-cmakelists.patch 1037 BLAKE2B f6e34d02dbedfda8f152a2f8081370ea5d8c23468a355329d2c44831c0a9b82a95cc914bb55e7963bda71aa65e4ce4b9849e0e1c42c397c39c9b6b67d80598b4 SHA512 c4b761174994b8db917c5a44940e4119d208e2f9625a6669c15c692ebc485e24439d549c45b271712d69a3c026dcd41005d39381dddd44b606d033b7c44d64b8
 DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2
 DIST libfido2-1.6.0.tar.gz 413904 BLAKE2B 59444cc9e32b5d9f2a0f9138fe4f3ad644865e1f7f24f50bbace262308aa7c10b58aa0e890a3493e8fd102468e26947f7fc0864b5d7a1e185e40ad730064db8e SHA512 c473732a2f7ef54156097d315e44457d89056446ab3112a7c7a6fd99d5c2c8ae0ca2451ff9cd45be6c32de1ab335d6dfdb2b0c56b40cae9eb41391d18d83be4a
-EBUILD libfido2-1.5.0-r1.ebuild 930 BLAKE2B cf13a87979df2b351e4ee731c6faca845c3ab3c579461bd559d69d352b8755b7a1c68cc775270adab7318e99bccde68284e485112662379745d60f1d1e4b9732 SHA512 c1b66d54635ab61e99fbbfa7c91299c89eb26deec4749fe51aae1c7cf851ce02f562db4c7ff6ab5c4cd222d517deac1e69bc1841f50bbf0b653d225bb2a1daff
+EBUILD libfido2-1.5.0-r1.ebuild 929 BLAKE2B 4e5c9850cdcfe89d1475d4c2dd6394a3b9d6d3f27b763f1895a3e7855c494a575d16f46f2b9345351ac6f915e2b5ae9da6c75c91977d462f41aac33cfaad7df7 SHA512 1124757841813f7137c274481d0b2ea8976744d7d232cf42ebcbae1c34c0e2d117bb94afcb2f24841f2c60af344bf0c94764eaf2a4f1df4069d2f06654c68d87
 EBUILD libfido2-1.6.0.ebuild 932 BLAKE2B 7c2c11e808bcaffd9904714fa967412917d05f21f73e37137408b45a4c59562737360e52500ee18d03f43342de145f278e052f2c7cf77dece213d88e353e2460 SHA512 9f65e6f5f4a8e7ccc441cab13142151c992733329ce73badf612e31e9c261cb72aac038a0cb7e1578f485eaaf87a00569f90d8e657996e087dfab90039b77b69
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
index e836ac168b5d..5fdacec0f103 100644
--- a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="libressl +static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index 9f4fa9913cf4..899906e7ede5 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -1,5 +1,7 @@
 AUX libgnt-2.14.0-optional_docs.patch 369 BLAKE2B 445d0c6a1632c3368f72777919ba2096aa1b16804dd141f87d8c7b8ac3350fc8354bc53423e3ca9a677a8de0c2f8710023561f4e230ce74793fc66ea899829f5 SHA512 83f1640729653bc9cee49f667f79e472727d4ba7c3d6fad3ebccc6fe412fe0a43b868582bbe2de8bcca611661cca8ba135330c1c919ea7622135ed7488b524be
 AUX libgnt-2.14.0-tinfo.patch 567 BLAKE2B 7d9b1c0b520a3f2c3d74d6659a503f554c5b7805f3e5f659bb6e0e58475f74633563d44f6667df64048bdb33437e176cf80a547b33e1939565938752e87325ac SHA512 56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416
 DIST libgnt-2.14.0.tar.xz 102444 BLAKE2B 303dc33e60571ba4b5b9cc8ce477807b9b2ed6b4d1ed14e40c43e146a6d3d156741597befdf3e6c0c6816e9d43955f57f9e1b61e3f1f2d2fc451bf53f7236022 SHA512 0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38
+DIST libgnt-2.14.1.tar.xz 106564 BLAKE2B 19eddef51b44fa82982c705415fee43bf7495bc4692a7371fea782bcc21acdb932f15e1e8de6af962a529eea59f54c0b116d96b87ed3616201e6370760fac5b8 SHA512 434fff31a0946dabeaadbabaf96b4a7cf7f2a7da6d7794b7cf8a75f3f959388d89b32ce5921a20d5d6532ac2fd851ec2f6c18cc7cbc5a0ae97a00ff1ee3f74c3
 EBUILD libgnt-2.14.0.ebuild 772 BLAKE2B a116663fc807313145fd230ea8ac48929d3ba4b51d637a8b04df095125dec039860957f40c9c20c9b434a38165d318007941b0d57dabc2bc14c2f5d274692b2d SHA512 50da75b92165b5fa72284f7757dc676376b35ab1ad3b4f878809d8375ee16f01c3f3043c39571dc591e52de35c103514ebcde35f01025c22a20ec58cce5ae098
+EBUILD libgnt-2.14.1.ebuild 779 BLAKE2B 1bb147612f6aa0a8bf813c5d11f18a3b143fb69a6fc457ddd8ebc06f877312ad02c6c9be503acc4a667c8e742e481fb449fe66c94fdf42422d345555254d4d3e SHA512 77e5cc120fe12eeb1c1b083cb979db55e0c129696c3d853fb6622edf45a7d653249f376b48056b5dd8953dc92ad6d899052bf6d4f7690e8701d4062604aad475
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/libgnt/libgnt-2.14.1.ebuild b/dev-libs/libgnt/libgnt-2.14.1.ebuild
new file mode 100644
index 000000000000..17681c49a78e
--- /dev/null
+++ b/dev-libs/libgnt/libgnt-2.14.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 meson
+
+DESCRIPTION="Pidgin's GLib Ncurses Toolkit"
+HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt"
+SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	!<net-im/pidgin-2.14.0
+	dev-libs/glib:2
+	dev-libs/libxml2
+	sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.14.0-optional_docs.patch"
+	"${FILESDIR}/${PN}-2.14.0-tinfo.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index eb812727dad3..701a6651d15c 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -4,5 +4,5 @@ AUX libical-3.0.8-icu-68.patch 1630 BLAKE2B 9622dac19255518e5a4d1876d6c27613f0d7
 DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
 DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
 EBUILD libical-3.0.8.ebuild 2329 BLAKE2B 072647dac4c4201e08c647feda8eff2a57810055beae2074c3d05bd249d708d1b64609304955fa270991c154bfdd9a141aca47e00b49c74f2f4d8ebe149900d9 SHA512 6bd7a557255734399a525bb9b0f47c834fd711ec2f27368d5e6c6374dfdf13ac5804caa8656f74c1283bc07cc5a6e9a4291d78ce36ffc3f64393dce9c1d52d9a
-EBUILD libical-3.0.9.ebuild 2265 BLAKE2B 0042ba8853fa0736c8d4db5badd0a8c7e5d8b7b4d91ab2f7368541a95368241cf3b1fc1a600e7989eebd490d091017f52add482bfe15b7b7a042f859c0fdfb81 SHA512 f9d7306fc2c907e7e50be4dc38a4f1a99ff32e8829f909daf3e68752254de41cbbd6fd57afb0d9c2393893a8093bd734febaea7b4832be81e310ee96940c663d
+EBUILD libical-3.0.9.ebuild 2264 BLAKE2B a33d4bef7c3f18830a72d7510fda246845c637977f2d4ba81468587dcad224919cf0884c4ae12c022ffdf2b2856989f2ea40743a5568ab710161f6bbd11a3860 SHA512 da281b2a85b3d77d1abb412bf78d593d18605962843046b4c3131dbdd8a756738bb81fa525c023a0b9e188c49268078f9a79b0153e23faad90556ceb41d2457e
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.9.ebuild b/dev-libs/libical/libical-3.0.9.ebuild
index 9ab9acb8a1be..a8a86663276b 100644
--- a/dev-libs/libical/libical-3.0.9.ebuild
+++ b/dev-libs/libical/libical-3.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="berkdb doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 5dceffacc580..0acedaf488ca 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,9 +1,9 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
 AUX libjcat-0.1.3-optional_vala.patch 944 BLAKE2B 4a764d59a429f7d0d78e5cffa6f63d6cc88db92a41a46a5e3ed47fde2b358209aa4e61302d071e4e15366232992961c0837eb708f840f36c8468aee48f3fc3a2 SHA512 0b9879099933b4f5eb31af48994597a17e5e0331c55df7711271a4e65e375a85c7301801038d62ff3c7704ae4e4a0baa01ff160d92fd7522c2d81b050154dea0
-DIST libjcat-0.1.3.tar.gz 63765 BLAKE2B a9847fe2a93f49773ba6451036d7908b8b615a6334557a68c94db3c402e1f502e2915bb1abc9f58c495fe1453cb5653cae9b548d2f9d7b39dcd5d7824e965bc2 SHA512 f021e10d740ac6d0f0c73cefc9deacdbc74882a5e340b249c28427ece4917358940413914ce19c5aac96c86d8056349ff2ee633c2a9541f4382f109d9e0d9e69
 DIST libjcat-0.1.4.tar.gz 63900 BLAKE2B 509a9916aa77193835e5a29a152acb0eb1cee24b6aae3e256dee42c1fd598b9c181009cdea4c276cc0d8c8cb56d22b9073f44dd11b7fab59d29df3633af6d042 SHA512 d58860410ce6e9d35a1eefcd0c6fcd956db42a12a3e8f856e19e3abe8bd6ae304ab7a60e2c1ee28f3848f2fee3b406dd900d7c1024eca5602797711528d3f7e3
 DIST libjcat-0.1.5.tar.gz 64244 BLAKE2B fce5324981b757c7d5f9196790984a0d02e4dad3a0f75bf7262dcadc82838137537865395d75cdb6c59dade45babe0143243202bc01e41a9af5696ef79a44ec4 SHA512 ad4fb27582d24d3a7f62c8fd39c6a45d77e4e8cb005b73fe2f0cf4d697b555ca3e503c5edb05694526609d8baf7e9c21dad1465c78c8e3ee125df6a1bb79835a
-EBUILD libjcat-0.1.3.ebuild 1401 BLAKE2B b6164493ba90d1f2ac7adf63674766541b91c46de487cf121590c04a94b895fc99ffb29560c43a31f7cddc6db7eda0aceea4dcefa23aceebe96562fe773e1de2 SHA512 ef365215ea784245486ad7d0e23299d8bb8c6c2bee212487f8786aab3393bdf76c012c22e55caaf23bdc0cf49e26d832414255fd3eec4d0aaeeb2525204deb10
+DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d
 EBUILD libjcat-0.1.4.ebuild 1502 BLAKE2B 8818aae450ccb38e1bd1dc0d43fc6932a0fd3713dcdf1aac649980dd1958c8aa7a1103642a672cbac0e9cf29153ce12fc67961764704c9bc3d16c642d6a9024c SHA512 f4257592f032bb21b7213a98a14ebddde72d3dd09a25147fdbe9980cb6d890d6833fac0f47d5b683493de910f5db2347cda7abf1f32f6d2ab55f2467e08d6e95
-EBUILD libjcat-0.1.5.ebuild 1448 BLAKE2B 8ef5e0b4182290748af282e03cbda8473d0fefd60e01ad38a00e2c010bbe0dfa359b57fdc48d8f5414266f306b001672c0acf66dc1f2489d3e745ec74c1c45f3 SHA512 fd6c4594d5adb9fda3bf63a2231dd9591e83db4915f2934250952b784aa1f93ea923c53ab3b60b2d565af1fc64b12d4445df17f7e0bdd1315e8afa7b0d044906
+EBUILD libjcat-0.1.5.ebuild 1447 BLAKE2B 1d6aff273853d5e0230d7bfe2ecbae6995347b4fb42dcead92e6283729950fe56d0ff3efb553cc8549b83794cc4da6a079f6e6d7267645b1eae38422350abd24 SHA512 b4ac09789f0113d3f8d6fb09656f8d16778eaaa252053c77a3813c07aca6a2f27261aac6e933d73f084d8f0a203c4d7d29f1909f67ac90f98c507f07e2d30b50
+EBUILD libjcat-0.1.6.ebuild 1448 BLAKE2B 8ef5e0b4182290748af282e03cbda8473d0fefd60e01ad38a00e2c010bbe0dfa359b57fdc48d8f5414266f306b001672c0acf66dc1f2489d3e745ec74c1c45f3 SHA512 fd6c4594d5adb9fda3bf63a2231dd9591e83db4915f2934250952b784aa1f93ea923c53ab3b60b2d565af1fc64b12d4445df17f7e0bdd1315e8afa7b0d044906
 MISC metadata.xml 993 BLAKE2B 3f186f6514cbea4951c5e2b4c26a305d615cfa52237ba5e21495c7843a82fd551557e53592e7aacbc568b8bd09832fef0054e4f095fdeb07194e9dc8258bbee3 SHA512 fa07148261c97c53718c489a0cd70d60eea42fccc1723a88d9a35b06c7a91b92e2e0d66bed11f719f160f749ea4a0cbb3eab89c6dc68eda5ff75386d4958e3bc
diff --git a/dev-libs/libjcat/libjcat-0.1.5.ebuild b/dev-libs/libjcat/libjcat-0.1.5.ebuild
index ef894f74d4c7..143d6be4ab90 100644
--- a/dev-libs/libjcat/libjcat-0.1.5.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libjcat/libjcat-0.1.3.ebuild b/dev-libs/libjcat/libjcat-0.1.6.ebuild
index 096d2787bdd6..ef894f74d4c7 100644
--- a/dev-libs/libjcat/libjcat-0.1.3.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 
 inherit meson python-any-r1 vala xdg-utils
@@ -14,8 +14,8 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/json-glib:=
@@ -25,7 +25,7 @@ RDEPEND="dev-libs/glib:2
 	)
 	introspection? ( dev-libs/gobject-introspection:= )
 	pkcs7? ( net-libs/gnutls )
-	dev-lang/vala:="
+	vala? ( dev-lang/vala:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep '
@@ -47,8 +47,7 @@ python_check_deps() {
 
 src_prepare() {
 	xdg_environment_reset
-# TODO: make vala optional
-	vala_src_prepare
+	use vala && vala_src_prepare
 	default
 }
 
@@ -60,6 +59,7 @@ src_configure() {
 		$(meson_use man)
 		$(meson_use pkcs7)
 		$(meson_use test tests)
+		$(meson_use vala vapi)
 	)
 	meson_src_configure
 }
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 695462c3fecb..6ed05254c73b 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,5 +1,5 @@
 DIST liblinear-241.tar.gz 559122 BLAKE2B 793ef45fc652d6f35908465e754e0aed6568125e74e68ca72466c4d71cc0e30746a999e978521c09a3ada079698f59f2bf65a430679538b7bebc133a258f2588 SHA512 a9ca47b051e28046829a3f355a552b2f5b270dd706170e1d21db1509ef09eca55e2d8ff29695d9e8192baad8bcf50aa76e75a3683948c726f2c9b915a3e4bf27
 DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904
 EBUILD liblinear-241.ebuild 1460 BLAKE2B 7c405bf7eabc8cb614c40ae4c63169536fe132e3c1ac91955b967b96579cebbb73efdf6ae1c8ebf2bb18356a583b90e3ea47c519c400d9a1a01c98f05c383165 SHA512 a99d207552413aeb873083b98e95c5c6b758a17b7565ccab03b67db429c27c66948f19ca61cbf8cb02fc99ffc49264ed7ba77b73408ad3da13a6dd62a41d5dcd
-EBUILD liblinear-242.ebuild 1453 BLAKE2B 49a73b7c4c23ffeb83ee3968fd448cb640f712b95ca8120614966c09a3e1c4546262e7327cd2f9731dff599689ac8f995af64dac18d4d1f3306de5f4d981bdc0 SHA512 5de5eee2c376ec4fcf47c30299750c43927c16993b4a8207d641109bff7f5f4dae139d23aa86e460c4b25f34176d87207d0dca95a9a54a8d34d82d843e5bd29c
+EBUILD liblinear-242.ebuild 1451 BLAKE2B 94fb3625cd49cd5fd35c114bd47a57ecd80d676caf82cc74367798368dd52f77a8cdbe94f9c40899ed7192bbb96fb799ad78f9590ec683b7b36d37db8e1b847d SHA512 7424b77a748ff2162ba25984694b5e1734e14f91bbcf264f76ca0e0cfc25a40495cf76d29cb3b511a85ae849f75d85319621076de2a7e34ad3e34e4610df7382
 MISC metadata.xml 320 BLAKE2B a4ab81f29b93f305fc5a005917955d67596886df3a9ee7708734714ca0c052297d4bf18b68cbe6de7f42a1e0f4f6052a1b0a93390c17bbe554bc3f536db5b251 SHA512 34ae964cd916b9a3cf711def8a12c20c4fb7642d569d07d019abc12804f013c90081da4d5b1802a0cd8fccec98c5929554766ac575d992a9fdce8d574f2d311e
diff --git a/dev-libs/liblinear/liblinear-242.ebuild b/dev-libs/liblinear/liblinear-242.ebuild
index 80b0f0a03786..3ed96b71e97f 100644
--- a/dev-libs/liblinear/liblinear-242.ebuild
+++ b/dev-libs/liblinear/liblinear-242.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 70b82a0e4c4b..85b56c87fa6c 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,5 +1,5 @@
 DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792
 DIST libmanette-0.2.5.tar.xz 38192 BLAKE2B 0eed86ac8ae5d45be8b80d14aee29f199eff23f879fda99494fa163e03eb265d95146392038cf4657f4256274d65b2a842413a87fa93ec4a5f192da64054a661 SHA512 f72b908c0282aee74a86ce27650d1b6220424e76a830645758a5677b4af6208fbf1c0354cf602c76e097735168cfa3d6bc16727ebb73a14dd650708a0a0deec0
-EBUILD libmanette-0.2.4.ebuild 850 BLAKE2B 5d8418fffc9aa73c67988757a097ea7b796e067fd81257f4b9b2ff958343978fb5dd99859705886189e3c91ce21ba1cdb7556c9f74229751266bd7dd2a3af2b1 SHA512 acaf2a0cdea40bdc4f78f2f83cf5352b7a0eae0e8f7fc0d2ffbf8b8a4d39e18f35cdc910f06a24a806f562f9b977465f8dabc665c13c8942cae5de81678ea7c7
+EBUILD libmanette-0.2.4.ebuild 849 BLAKE2B f42331170f56c44740a778eea32b77405e29ae79a6dbee0f29446fc22cab8f800337764fe53eb814e4b70b086c5c28552530c3b3e51c60446911ab744699496e SHA512 57be95d03221affd6f6a25810ad8822cdde075a22d15e3d2c39aa9300a4480d8c579db4f17daa26349153b4d60ba8d650746fd376f097322666ce31a20e537af
 EBUILD libmanette-0.2.5.ebuild 853 BLAKE2B 41f584636080ac56d20dc2c9780f0cf6a00686b45d6d2dde2c309cf7e27c0764a0c431e46c0faf3d7ef538e3bd2f2fd08dd1241b2100f0ae4940f79fbee33e0e SHA512 103ac11b72f7a137ffa76e02101f15b17e5a9ae133cee53bf6ea524f43fa8aac0bb08c2c1b37b97b82968d5b324a2aa7fa1928abad6999f4e9192475c0127fa8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.4.ebuild b/dev-libs/libmanette/libmanette-0.2.4.ebuild
index 4b17eeabac40..5dd153d6043b 100644
--- a/dev-libs/libmanette/libmanette-0.2.4.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.4.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="+introspection +udev +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index b7a1f13b7eff..729bc379e7fe 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,6 +1,6 @@
 DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e
 DIST libmaxminddb-1.5.0.tar.gz 603923 BLAKE2B 07c18f759a2d437d95be513d6dc3aaddd5dcd6f7201fdd7eba0f035c5a3221344f1e5e44253c0efdc2690cfffc5cecdaa9befed8d69f6f0ebd33588b3805443d SHA512 68c769f247156869b84a8ad0f9deec3cb79d39c0a6b8f1458461c223b9cf9967dd9d697ff4e92ac28216ef9e9f5a94908e03f76a5f70ab17636b163c17d2d432
 EBUILD libmaxminddb-1.4.3.ebuild 627 BLAKE2B ec59a52f9ddffb0faa9ab6a33416905cfa1f13dbbfaf62fb870c248e671772bdc07bf3b93c3236f582d29224782b03a8c75b951af17af9960dc344ab583d6469 SHA512 c41b3a52fef686e2652538711f40f05467239df7915ed2cdc5aba6968891764ce3b41a82b03452077e99c4ad0a746dbc3bc5e956f0a6846f5af0752ed9ef1c5a
-EBUILD libmaxminddb-1.5.0-r1.ebuild 679 BLAKE2B 3d627631a4d6fde81616d109a04844c5bb97aaa222b383d559d322a499056765f838325fbf90c88fa54e70e7b3a09811a82f622307ea5b8f248c2348ddc2a1dd SHA512 86d36b6b1b158d4141fd121998a5fa6c0eb58f4fed2734690c99b753d8634263f55d8dcbb8c4838aa76fbee81453d9ee62cd1eb7603be6380daddab1e0c6fa3d
+EBUILD libmaxminddb-1.5.0-r1.ebuild 674 BLAKE2B c9f196cddee44cbaf1c34a4f31b330518554ee4cf22f6a6b20cc13225d85ceaeeb101e50517ffc8e4f8e64547624cf120a8964412969dd6632e650101335dc7e SHA512 40543176882b4925b22b8e1839d06a6fbb16691f1f2eab4cbb31b859f15dc2e6805833bbeb1655c14ed23e18569890e57bd3cabbe06747d640bb6b22fd73a2fc
 EBUILD libmaxminddb-9999.ebuild 622 BLAKE2B dcaca8ba54d66b52229e8ab3b0d64c92a4a4be70e6b130cdae77ad131f6b60a056336e64b5d494542d4c8003c32a2381549d8688640bee9c89d142d70955cf64 SHA512 311ebe39f56c5a159504636d91d791f7058ebc263ea879843eeea648e562b5e8aa55b2d42721a37e4b550d49cf41fa99bce4361054ed58df481f1bf01505bd56
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild
index 45742bc23d7b..16bdf7f8d898 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index c29f2bc864f2..d45b4b988fb4 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -3,7 +3,7 @@ AUX libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch 531 BLAKE2B 13627cf24
 DIST libmowgli-1.0.0.tar.bz2 105929 BLAKE2B f22af94e1d5693e92544e9c177f56caf7fcbbf3f46a254e1e6982ba0e6f41443bcf70d1b944cd68e7eea7a0247dd478777afcebb5db80742312149f52dd86bc4 SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
 EBUILD libmowgli-1.0.0-r1.ebuild 472 BLAKE2B 9d9c086a3f8f07ca535287baeda38018d0928c14f0601835d47f62274cb377960f67979ab6bbcad90301b212ef4e399f82f169a41aecf87c34790e3a3b6254ce SHA512 9f4b5f170de65914e4f404130b91f940139b608d67c243a180a588264e50173a1e76fe834e29bdcaaa52c6d98c8f35a2ca1ce892ca9263d77eb4478d9fe20653
-EBUILD libmowgli-2.1.3-r2.ebuild 1103 BLAKE2B 40135f0e71c7a079458684150874b659429c8bbd65df027e8ad628382cdda17be3e472f7e0f43c2e7990c53e0c17f35148e5eb915a02d3c5cba1778fbe1ed6a3 SHA512 6e5f2e64ce8b6367e65f8bcad1a818ad0b326abb8add0cd05571ca12a0b5c8d9ce87f5fad7d2bfa61756f51cd0d01896613ef2a6adcacc0f5a6b87eefdc7ace1
+EBUILD libmowgli-2.1.3-r2.ebuild 1099 BLAKE2B 3073de9b0fffb0f032f6972a4c3eb799a2fe0257061da3b8abbceb6055af479fb335ef47cf4efcdc5bb3802f37861ff74630bb72ba132f61499c76fbadd52dca SHA512 b715e49d7ea5cf66b2b865b5cc8ab3dd4075ef7e8b4ccc8a522eccc48c7924ab3f6a0a42eec52be12557383df01d001f1f14bc75e222f7d0057bddfc5a3a3638
 EBUILD libmowgli-2.1.3.ebuild 758 BLAKE2B 48cead860bb0f3e97ee089a2780878fd1ea8e5b8b06ed9c8ff69f5bc8d63dce275b35b51ad1b6442eaebeca6d166779640d910dda5e91866f3308f80d9dff826 SHA512 7e4d4af5c0cfc8d25b602ce8fe6fa8b29747cfd451f7b39df13b2c458a22743dd7311141da14f0729077786731be7816324480094a34a0d87a1d1728b95a7ef1
 EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
index a23b5b00bb96..5bd42913be3b 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="libressl ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-libs/libnest2d/Manifest b/dev-libs/libnest2d/Manifest
index 765bb379e432..06819ec8ac8c 100644
--- a/dev-libs/libnest2d/Manifest
+++ b/dev-libs/libnest2d/Manifest
@@ -1,4 +1,4 @@
 AUX libnest2d-0.4-add-disallowed-areas.patch 4671 BLAKE2B 1b57d9a00f9ad5df3d0396d039bcf64570dedb0da939ad60a6eeca199de280a413fa80c4fb6edf976b920634243ce1f8da6a7c00cf08930a6309c4955f48f7e4 SHA512 1915a937b91c1e3d06d4a0b5914d706f84da171cfd2ebf161b0017e67a5a28bbefd80d7a290348735b4143e4b67f421c5d611831af1b89b76371327d74d11508
 DIST libnest2d-0.4.tar.gz 365065 BLAKE2B 74a4aef18be22d24e4e73288dd3e330b2f5baa3b2c705683c22767dfb0394a7b332bad957321f57ec7eaaf4740cff9ca1ed86f9d552be65df1b2af76ceba61e9 SHA512 fadce18986b844eed13a581f84055df909a17407a0980deb6c7c24248a969a537a8840650bcfc673e61973810ce9a008acb599e3b8e00c9bff6b566ca41cd62c
 EBUILD libnest2d-0.4.ebuild 886 BLAKE2B 4fa60f8279f4bdbe3291ac835035a7ea577378907cc69db305393bd04515dd935a08cbe6978ab97c184baf63e1355027e1d26a45003687e22c92cefc194a7729 SHA512 6a6687807a9382fb2bfbb59c3535f78615167104f19251514bd008332cb556181b6cfead8cfc91a5dd28fab09f51c8c391ffed3be640a36208267c5be91b39d5
-MISC metadata.xml 1265 BLAKE2B fa154d4341887bd9da78aa8fcf10935187d6cd8570f27ca68a241322b8dffe56c8860638cc2c045d74646f3a22f49dd87b4c2620f2885b839c9fcb99c9a5aaa6 SHA512 0cf2a7b8a132a5b3510ceeb6dd7474c34e2e05a0de5a29157c73e533140194be91108450539f790124f716d3a8cebf320d0eada3cbabc2f7f8eb0f763d590184
+MISC metadata.xml 1336 BLAKE2B f0ec248a2a93ed26c928e087e0674b2ea6e8511761f5944bd4683db7e33c3db194053bd94d638b2157b32834037f1919095c549dc608c7819b2e9ad137bbb57d SHA512 f334cec00c1dac77b4d27b1fa7260c16e2f1bc5e510ff2a0fbcec72c8670f9a5768b50be533656083abbca8ff5c6367694b1b1e343ea6725f7fd8625b8a3012e
diff --git a/dev-libs/libnest2d/metadata.xml b/dev-libs/libnest2d/metadata.xml
index a80bd99b8c28..6690b27e3325 100644
--- a/dev-libs/libnest2d/metadata.xml
+++ b/dev-libs/libnest2d/metadata.xml
@@ -18,6 +18,7 @@
 		as well.
 	</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/tamasmeszaros/libnest2d/issues</bugs-to>
 		<remote-id type="github">tamasmeszaros/libnest2d</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index 8bcd3ed13ac8..06585f19034a 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -2,5 +2,5 @@ AUX liboil-0.3.17-amd64-cpuid.patch 1040 BLAKE2B 4cf2a34250d08175c7bf466b93fea90
 AUX liboil-0.3.17-x32.patch 7762 BLAKE2B f3402d64fa9ef13e488aa07d7565782b38e585e7ab73e8c6d4c33882ba138734c1369b87ec549850f9cd9b9d2a85cfd0e3972eb038863c1b632fc5ad2c34a9fa SHA512 83201a8a03a3785f228d9bff916928d80fdbf8abeaa27f715956c09b2a2eaffcffcda97e680abbb7b29b3f207531ee935489c1f226796a34968284751ffbd8d5
 DIST liboil-0.3.17.tar.gz 912563 BLAKE2B c7ad7cc4db422fd2a3fd2be01b81a8a2f4c9acbc7407955e30b8ca6d39b79a235f383b4897e01a51a9ed47f4476e321a0bd6522951a125acc2da85f38ea40770 SHA512 26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145
 EBUILD liboil-0.3.17-r2.ebuild 1604 BLAKE2B 7413e1821afbee9e6f7e671d3841a5261804c493a1e9fbf30e889c09a9581eb962e2e97669095fcd19c04b2ec81286010e213ba5cc94d0a65fec19374757494c SHA512 20004b9e395a5a2f6cf7935affd1e020531c45a7831c6581818b94d45f01dea83be3ba412591c2d4a470a8b9d28d47e904a2e2ad33081e2cc6fa3e05189979df
-EBUILD liboil-0.3.17-r3.ebuild 1750 BLAKE2B 4ff81a92402b0d69842acc75db50bc1e395d7808e766126918bdc03184b5d707433b660fe5382c92b23ecc12a5303673354059c262a9bf82b1bd99a396fc0fe5 SHA512 faffdffc48469805acb7f887e5a22a07e541e11444dfc4208dea22f557d0a0ef01e67b12df14b13df64631778519999e9fc79d30cfc7e4a9a028695549a9e6ed
+EBUILD liboil-0.3.17-r3.ebuild 1749 BLAKE2B c752870927d8ef64a8843b9cc69cfb2600b390d3e372cc86c78ebb2a4ba7c9045e59731ebb98b9a2540f55c8b9dbf6a467b25a1693062a8097c53e439bfde01a SHA512 6fc93f64590b737a0ad0dfd085007d126e6d4bb09520629e9aaf18d3d2b4c39cd673b3daa9a10b4da964b19d7396cafc73a4510156a36821d0c1e1fd0188a4d8
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/dev-libs/liboil/liboil-0.3.17-r3.ebuild b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
index b0545a3d753a..d31a433f0e08 100644
--- a/dev-libs/liboil/liboil-0.3.17-r3.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index c11a91634acb..655525492dca 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,5 +1,5 @@
 DIST libpipeline-1.5.2.tar.gz 994071 BLAKE2B 997c13bdf632f2be161576e1b21d1be26ea29dc770ab74e4b105f21c926b8ae5e07a605b72ec56f55a55db3a3c1d487cfe64d571363e040612ea52b445f0bc3e SHA512 721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53
 DIST libpipeline-1.5.3.tar.gz 994663 BLAKE2B 57365ac07d1b61462eaea3be0ae1136f8511ea54484b1fcbe734796da760ced062a43cfb13b69eb24b521448253e603c248c59306f3fb3d871641a17530dcf82 SHA512 db0796bffbcdd8e875902385c7cdc140e3e0e045b3d0eba1017e55b4c66027c20cc2cd0fccaf52f59fa941d0925134011317b9c27986765a1ec2a73132ebaec6
 EBUILD libpipeline-1.5.2.ebuild 659 BLAKE2B c3b670d2bef99463ca028d1f175bfae4c3bc9772a6803dd5e5c0fa899f19cd68bdf86ec55b4834b2452ea3c0ad4aafef308e85ab64f6c855722c01beffd4800d SHA512 2bd28b0d1fa62c1cc5b2c988c6e534d6991409bb71a5e67c269d3ef512c64799296c5c8e0193d3584693f76006e83518350f1393b9a0216dbe59c2ace10a219e
-EBUILD libpipeline-1.5.3.ebuild 659 BLAKE2B c3b670d2bef99463ca028d1f175bfae4c3bc9772a6803dd5e5c0fa899f19cd68bdf86ec55b4834b2452ea3c0ad4aafef308e85ab64f6c855722c01beffd4800d SHA512 2bd28b0d1fa62c1cc5b2c988c6e534d6991409bb71a5e67c269d3ef512c64799296c5c8e0193d3584693f76006e83518350f1393b9a0216dbe59c2ace10a219e
+EBUILD libpipeline-1.5.3.ebuild 717 BLAKE2B a3fd2fd9c4eb7db96b3379ef7504bccdf15bb514c65222356d91f904ce4580156a032200c6c7b1b83a92d7163e329aa8a3976a28165e0567d53730079d98c8e2 SHA512 e7b69b8bfbf0cac2e0ba143f976de6e27a091e95a684e1d310237198d0e0897b5c3e6e3fac55e622bebe3fcd177c35004fb841f42cff3f25665b38a07b0ac059
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
index a892d88117a0..8c19f8a1b990 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.3.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"
+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="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 3413041b5d92..dad91f99a824 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,6 +1,4 @@
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
-DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d
 DIST libsavitar-4.8.0.tar.gz 99030 BLAKE2B a1c1e252aa942114a1d7112d2e661b5e63403502642826c6b92c408c8eabd3d9fb12b44dc286f9a0dce3d42f473adae2441d357f237c903c8a0df936c41f9f37 SHA512 65d31986b120c9e717b10d0bac420f2582d9f1b44051d88f89475408d1f7997e144001c61f180eac554de33f1f8c1ec9555a6c23bdd797315624f57030f7ec8c
-EBUILD libsavitar-4.7.0.ebuild 1753 BLAKE2B 693cea9194c410e2868e2f109d0cd31ab56c8140469be0fde64c6206847704ecddeb6097aacc37f5a1b5e067eefc69e0120f13fec2216364cd922d7ca616756c SHA512 bb7fd8bd856d2bea79be263a2ba827a47076342ae4b965f7cbbdfba4ed6308b820798cb503d914452984075203da5a1380e736aa68e25f0d962156631bfd009f
 EBUILD libsavitar-4.8.0.ebuild 1753 BLAKE2B 693cea9194c410e2868e2f109d0cd31ab56c8140469be0fde64c6206847704ecddeb6097aacc37f5a1b5e067eefc69e0120f13fec2216364cd922d7ca616756c SHA512 bb7fd8bd856d2bea79be263a2ba827a47076342ae4b965f7cbbdfba4ed6308b820798cb503d914452984075203da5a1380e736aa68e25f0d962156631bfd009f
-MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
+MISC metadata.xml 930 BLAKE2B 281ccb868f40b79f50d43d4130b9fda9bfc17584d72d93c611dd6d6fc4958575a758fff7ee93e97c4a13ffff7bc6d274de95ee39dbfae4968101af10fcd024e8 SHA512 37071aff5de670fbc7353a103bccbcda393c0001686eec2662daa71d7b27d2eb77a73648a0d77fe1ae426067e4042d9fca20bf11ecb4a690a0caaf9114b048fd
diff --git a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild
deleted file mode 100644
index e1b8a3b218f1..000000000000
--- a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit cmake python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="+python static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-cpp/tbb
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-BUILD_DIR="${S}/build"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-use-system-pugixml.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# remove bundled pugixml
-	rm -r "${S}"/pugixml || die
-
-	find "${S}"/src -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
-		-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
-
-	if use test; then
-		find "${S}"/tests -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
-			-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
-	fi
-
-	# find SIP for current python version, not the latest installed
-	sed -i -e "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
-		CMakeLists.txt cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-		-DBUILD_TESTS=$(usex test ON OFF)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test
-}
diff --git a/dev-libs/libsavitar/metadata.xml b/dev-libs/libsavitar/metadata.xml
index 3ed5b1ace790..ad6f0be797d4 100644
--- a/dev-libs/libsavitar/metadata.xml
+++ b/dev-libs/libsavitar/metadata.xml
@@ -25,6 +25,7 @@
 		<subslots>soname major version number</subslots>
 	</slots>
 	<upstream>
+		<bugs-to>https://github.com/Ultimaker/libSavitar/issues</bugs-to>
 		<remote-id type="github">Ultimaker/libSavitar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index 52a0e09eb4bd..516aa016311b 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,3 +1,5 @@
 DIST libsecp256k1-v0.1_pre20190401.tgz 166663 BLAKE2B 68c9fc3fda6af56452f32edeae5dcb5a92f68bc3fb39a397c532951c6392347df14ea0347bbe05cab43158512e0d9f5ea87bd8f69bece1b04440860ebb8065ee SHA512 8c4945e93cb5ff241482ba4426b25162a7ae3b26860edc10c91d06b1c396887202ad971f4d38e035828352531b87fc29087a12b675e43da44f23c9ea3b6c0cc8
+DIST libsecp256k1-v0.1_pre20201028.tgz 200051 BLAKE2B 90d636049b411e02703feb2661006900a55f952f60e76e2b7147a5afe8e391a06a80d6ae1489b1e7f2382176c7ea831526465a85bca09156dc6d37b417fcb33b SHA512 54a0fa21b64dd6836e4227de51f3539afe06e0e2f352683397d6adb5dd0508af443d2e25f91e90e1ae366b261965fe7d438292314705baee799cf37421644958
 EBUILD libsecp256k1-0.1_pre20190401.ebuild 1577 BLAKE2B f1472ea251a7f43a7c6a96aabcfcf34481d55b1f43afaca01293326c1d19cb0debf9d9a258250b6f045060d4827ada3b6f0644f2029e1d37ef7349833136dbc1 SHA512 ac2c63c0db252ca605ce4d2f99de32a66ffd24d6658eb23692d5380f02507e754b2135c5de562dcc98c689c32eea8edb85b6976ab3cb5c9814088f3e9cf5e8ac
-MISC metadata.xml 881 BLAKE2B 77c78b7dd03d160442456bc92efa22e57fbc71178eabd4c42ec419c164b78ed6001100d6d5f7c2214623ff35c07f6fb853a595e403151d1b085279af1c1ccd77 SHA512 a05019f1bc8e838278aa92bbcc9a07a230a0b32ec2af64b8f3383bfa1eb611ff6d6fb4b99ae704a6a6364a8f208fd6edaba31b4edefe39602af994593cdb8633
+EBUILD libsecp256k1-0.1_pre20201028.ebuild 1913 BLAKE2B 6fcca920c51a4cae6f483508575827cff4b00159610f3966d37ce1f7a87535e0e59ac22fe5a5172b49cb3597179fa3019f2a40136a48ef5dc76f358c54ca6c2f SHA512 e36565cc8b4c11c67ce2e10c77f7e486b41275828926e731d4b150aa0385c252a79121241bb2564ccce5d3adccc33dea6c8a580bda27d14209fd1d34d1d4dc26
+MISC metadata.xml 1338 BLAKE2B 684e4e3cf51fe3d273469c6f7ad5512846cca80c078de240e3a4d7183a87d355343bfe5517c1e3146651fe5d0eddc32c160f7dfa75b65caf42fc871f893b9afa SHA512 0465d73f9c61536ff3f3dae7e225c1a82080feffae05659e13edbb78fbd2615cbd2b91543c650cb8c24ed04a95138ffce1b2536725b1b093c50d15c50f54b2ca
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild
new file mode 100644
index 000000000000..12f1a6b089ae
--- /dev/null
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MyPN=secp256k1
+DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
+HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
+COMMITHASH="3967d96bf184519eb98b766af665b4d4b072563e"
+SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm ecdh +experimental +extrakeys gmp lowmem precompute-ecmult +schnorr +recovery test test-openssl valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	asm? ( || ( amd64 arm ) arm? ( experimental ) )
+	extrakeys? ( experimental )
+	?? ( lowmem precompute-ecmult )
+	schnorr? ( experimental extrakeys )
+	test-openssl? ( test )
+"
+RDEPEND="
+	gmp? ( dev-libs/gmp:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test-openssl? ( dev-libs/openssl:0 )
+	valgrind? ( dev-util/valgrind )
+"
+
+S="${WORKDIR}/${MyPN}-${COMMITHASH}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local asm_opt
+	if use asm; then
+		if use arm; then
+			asm_opt=arm
+		else
+			asm_opt=auto
+		fi
+	else
+		asm_opt=no
+	fi
+	econf \
+		--disable-benchmark \
+		$(use_enable experimental) \
+		$(use_enable test tests) \
+		$(use_enable test exhaustive-tests) \
+		$(use_enable test-openssl openssl-tests) \
+		$(use_enable ecdh module-ecdh) \
+		$(use_enable extrakeys module-extrakeys) \
+		--with-asm=${asm_opt} \
+		--with-bignum=$(usex gmp gmp no) \
+		$(use_enable recovery module-recovery) \
+		$(use_enable schnorr module-schnorrsig) \
+		$(usex lowmem '--with-ecmult-window=2 --with-ecmult-gen-precision=2' '') \
+		$(usex precompute-ecmult '--with-ecmult-window=24 --with-ecmult-gen-precision=8' '') \
+		$(use_with valgrind) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index c5a0de90e4c1..04c706ec1caa 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -14,8 +14,13 @@
     <flag name="ecdh">Enable ECDH shared secret computation</flag>
     <flag name="endomorphism">Enable endomorphism</flag>
     <flag name="experimental">Allow experimental USE flags</flag>
+    <flag name="extrakeys">Enable extrakeys module</flag>
+    <flag name="lowmem">Reduce runtime memory usage at the expense of performance (ecmult window size 2, gen precision 2)</flag>
+    <flag name="precompute-ecmult">Use over 512 MB memory at runtime for better performance (ecmult window size 24, gen precision 8)</flag>
     <flag name="recovery">Enable ECDSA pubkey recovery module</flag>
+    <flag name="schnorr">Enable Schnorr signature module</flag>
     <flag name="test-openssl">Enable OpenSSL comparison tests</flag>
+    <flag name="valgrind">Compile in valgrind memory hints</flag>
   </use>
   <upstream>
     <remote-id type="github">bitcoin/secp256k1</remote-id>
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 20b30fad3091..2c313bad2c3b 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -1,7 +1,6 @@
 AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a538a7a2d9c04e777aa49bdff15db9439f4cf835a42f2c7cafe6d560ca4c957a0d57cdb00b3b3f68432ff8528ede15927874a62c6b64e027 SHA512 9bf6ff64bff1dd8550b97bbcabb7ccae24bae7af200dde7c296a237c4c149cb78e42bc7fcad3c76554ceb550ab39ce65134b53ad1e521dc6229f0141ab047cdf
-DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
-EBUILD libsigsegv-2.11.ebuild 771 BLAKE2B b359ecb14b832686c172c4960147f186f37dc7ea7e13a84deaa83824ab3b4272d6c27de2eb7ab33237bbb9ddc6c3b210e0d820214b08a13a23d67daf12adb226 SHA512 5b0616c79e5347cb373037ee37b26d4893fd6bf8bbc4e3dc6984130ab02a2511bcb60fd5961b5da9b6cf30d32b4756895168acebf2ca2641096a3294430cc866
+DIST libsigsegv-2.13.tar.gz 460736 BLAKE2B 2202ef92e96b2b46d7496a69427159b06b0413e9610daa9bc035dd18f193fd650a06dcc5a2db3b36b6c68f95593f2da047579e644d5ca4e54bc17160a57dac8f SHA512 9c0cf01ee2a39f77f2e42eb06a2aa60644e10fe2cd39089de58f6206baf7fe7d61fe0ec6bf187276fcfccf61585154ce904fe374b474b7ba9fa050a61a2f3918
 EBUILD libsigsegv-2.12-r1.ebuild 759 BLAKE2B 0f1e96575db99253cb02f48d14a9f07918094b8a25db274b33e1ff07d5d35b50df5658f17426db1934f2aaa8ef6dd03ca03531d6f0c843b9ed46ed5da5c02ce2 SHA512 e7941e5ac2866276883a8fae1bd4191197ca52acf1aaaa242850dff627b80ed3487ce597e14e3e1eb626eb036bbf3898beac4f8900b256c9e8fc39fb8bf0baf3
-EBUILD libsigsegv-2.12.ebuild 772 BLAKE2B bf9ad75994dba60588369794b9e4496303eeb2be9f80c043f95ea66da2c573ba2aad27c3eb22b5b402f92ed59f88def1754e1db0db3fea8540694417eadf73c7 SHA512 0f0600f5198cef58f8cfaf4dc20309295d4bdaedc09537b3e567fd41c9ac289fe504368aac95e014adc29ccccd7783f7d53e049fe1cf383ccfeb080db362a375
+EBUILD libsigsegv-2.13.ebuild 794 BLAKE2B 296c0dedcbf752a532d3369052c19c3f77903ab77cbf6c629a6bcbcc492d05ccf3d6c4e83d6a8c5e55d11a3f2eca172a8fde7a1cc7502129e91da0f90fe660fd SHA512 290bb0db6316ae0945d994d2b8abe011a16dcfa71d0b3e63a6c3de5450d9fdeead59a844aafad08848c56dc8db69c9ba0ef98cad263cb2314769e8932da9c313
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
deleted file mode 100644
index 845f5b2456d2..000000000000
--- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for handling page faults in user mode"
-HOMEPAGE="https://www.gnu.org/software/libsigsegv/"
-SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_configure() {
-	econf --enable-shared
-}
-
-src_test() {
-	if [[ ${FEATURES} = *sandbox* ]] ; then
-		# skip tests as they will fail
-		ewarn "Skipped tests. Please disable sandbox to run tests."
-		return 0
-	fi
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog* NEWS PORTING README
-}
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
deleted file mode 100644
index 333cbcc9bf2d..000000000000
--- a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for handling page faults in user mode"
-HOMEPAGE="https://www.gnu.org/software/libsigsegv/"
-SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_configure() {
-	econf --enable-shared
-}
-
-src_test() {
-	if [[ ${FEATURES} = *sandbox* ]] ; then
-		# skip tests as they will fail
-		ewarn "Skipped tests. Please disable sandbox to run tests."
-		return 0
-	fi
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog* NEWS PORTING README
-}
diff --git a/dev-libs/libsigsegv/libsigsegv-2.13.ebuild b/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
new file mode 100644
index 000000000000..5db18ac2c314
--- /dev/null
+++ b/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library for handling page faults in user mode"
+HOMEPAGE="https://www.gnu.org/software/libsigsegv/"
+SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+PATCHES=(
+	# Bug #363503
+	"${FILESDIR}/${PN}-2.12-skip-stackoverflow-tests.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-shared --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm "${ED}/usr/$(get_libdir)"/*.la || die
+	dodoc AUTHORS ChangeLog* NEWS PORTING README
+}
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 5e0ff5071c62..12f1032014b0 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,5 +1,5 @@
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
-EBUILD libspnav-0.2.3-r1.ebuild 1211 BLAKE2B e3aeced8b07e7e9ebda1b5c0707fb29c4ffd975da33792684d14b16e1449fc9936505ca87acaf51019a22d31477838665b0987a54805ec6eb0d0957ee239b73b SHA512 5d5386e1230e804a3caf90884ba5cacf290595fccf645cb875f84ec2662ab44789a14f6a682d622044a3d31fb3cfc022e1d5ed2afd63e99b2f698acd8b085558
-EBUILD libspnav-0.2.3.ebuild 894 BLAKE2B 7069d849b8e936289ee7c66805c8122038e331503311a607b20dacb34db97529a11b38c7530af70def1073baad08e6505b97fc88823bce3b09367600613709c7 SHA512 e535b119a9a967f262d78e22ba82d438a78a97e8cc56f1cf37c73b6056b48c3bd4a0264bc5c38a3258950358b85ba1e60e8a692b8516c7fc1d0a3eeb52857cae
+EBUILD libspnav-0.2.3-r1.ebuild 1228 BLAKE2B dd67b5a8f5302d9c589900e99af55cd2176fb8c4827cb2683e115b13c156d1d1303a6131c62742479fa6a87ed82b9f11fcd3fef60ff638a0f9538b218f1a6953 SHA512 795f76c810e20b2cd76597288a86ceb8ae30f05263d63d1001adca0b88d5d9e0abb98c5c9a80be2b7b6f92af5fdf9c955186995cc7105017cf824a0a7d514eb4
+EBUILD libspnav-0.2.3.ebuild 911 BLAKE2B 5bc75de1c7f55d63e56221fa2e0de3b468d391bf025a8d961d168792de96508dfda92019bc36eddcfcb69fbdf7b5fde085bb2d7385e01ef9e661d41308055ab0 SHA512 d7baddeca48ec813dad886a2724c1d7afb762b417a5b976fc21b6d1b386df01aaaeb76325960f7351a8e58743374e1a5dde1713463fa9dc3b04a7fcc8cdebcdc
 MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild b/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
index 0061ce48ad0a..e6ac19071675 100644
--- a/dev-libs/libspnav/libspnav-0.2.3-r1.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3-r1.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"
@@ -34,7 +34,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/dev-libs/libspnav/libspnav-0.2.3.ebuild b/dev-libs/libspnav/libspnav-0.2.3.ebuild
index b4411a26466b..51c269b4b20d 100644
--- a/dev-libs/libspnav/libspnav-0.2.3.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3.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"
@@ -34,7 +34,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 85e6e99619bf..fe9c50b1a2bf 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
-EBUILD libtomcrypt-1.18.2-r2.ebuild 2787 BLAKE2B 0ad0080c5d441ec647e09a5b9ca30f3220ef409bfb3f2c21118a64db35a06528d5d3b53925ad65fa65258e70438071382759a910deccc49081d5baf5c43e192f SHA512 419ec8e7899cb16a025c80362d78a77f32adecd88a717bd0c309970e18a57328e9db2f05145cef20b3a9d61cb9d6dbcd79d15b635bc4b1d270da13ea46207c12
+EBUILD libtomcrypt-1.18.2-r2.ebuild 2786 BLAKE2B dd40cddb54421bed1e2693b68d40fc94b2f3f23140033fc6c20916d244f2836bd5a35d12044ba3048261b90faa52c304dc70eea524e638fc13973da752e8be89 SHA512 3b6fe171082bd93503ced14923334b9a956df0ba51394455f7229209d857b0d8c12c85258cb6372101ab5feebe84bd0bc965d3ed7bec2b2e5025b620584f87d3
 MISC metadata.xml 643 BLAKE2B e66df23ddfeb04650dfa8c4cbd7d6e6a1816164fd0cac86dba9990610b672957c5ff7b6e83a17f8b6c19f75d1f50a1b448b8b618058510b8d6f54259ad451822 SHA512 7517fc02844cd6b9a9801b371c2c8faf9626dded317ad610af234cd89078221be021acb9da66f9078bb4b754a5e2f1b5efcbca2ccb1ef5c58afd8cf925e7a44e
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
index 5cd2518270ad..6b394a5ffe92 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@@ -17,7 +17,7 @@ LICENSE="|| ( WTFPL-2 public-domain )"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+gmp +libtommath tomsfastmath"
 
 BDEPEND="
diff --git a/dev-libs/libunibreak/Manifest b/dev-libs/libunibreak/Manifest
index 1be2baaa38f2..70015cae3823 100644
--- a/dev-libs/libunibreak/Manifest
+++ b/dev-libs/libunibreak/Manifest
@@ -1,7 +1,9 @@
 DIST libunibreak-4.0.tar.gz 629403 BLAKE2B 067d09bd48c5381ebef1f3a0ca488732e216234e45977d5c2eee181c9c98b435a7e4030fb5bdbd83035a7937c2107ec05f78dc33158ec64297511d24e329f03d SHA512 43da73f66fabd8fdef444c5a06ad1800464a0aeab590938522d6c19973950a242f2ccc0575a93d10d87bdcf82610452117ac081ddb73f47271a8c2a65897e11c
 DIST libunibreak-4.1.tar.gz 642497 BLAKE2B 79a09cc19e72bcf98605f3c49649c2d0753774825e737e0682ff4b67d4908be748b81b6ba79827ccc2032b7c5284fc2dd932d61d6775cae841888d6ee4a77b70 SHA512 f02a94b1c1757c0321f112ef9b44a17fc9f73c9ec6041f263bb55fe8ec44e5599c6061c4e1f6f92ca9069b282e5a8e40d90dcceaf04b6e2ed6ae948f104e1ce2
 DIST libunibreak-4.2-1.tar.gz 643399 BLAKE2B 620e904113730078a8e74a09594b9e18c63768a926df433b4a251767fd492ae11c0954e97a4d94db577956a621f075bc6743535bdc67f9c5151243f304b33bf4 SHA512 26bbff1203dde9ffdc2b9046727ab7698f5693c1eb898c819ee83d0c97fbfd32b9dc7c4406dea29fff6642b2678fee74a1307aa5c9c3279f65484eb080ae1e2d
+DIST libunibreak-4.3.tar.gz 639886 BLAKE2B ec044b659f1a837b4e6627067b96a6f19ee8302602d635e1e32aab9533486b5cd063aa99114c6443ede9d76d3f382d7492eac8b52b84a4baa2ccd9c2129e79d8 SHA512 4b53fd169912033403b6ca09047b7b928211fab3607ef26070ab731054138b9a291f7d138d3a479f9cde8edb0fabf8da114da68aee32e60cddf45cc3baae1170
 EBUILD libunibreak-4.0.ebuild 1271 BLAKE2B c5f7d7a51ea9c2b7ff881ba8fcd0381f6f35671d6758ab17486d0311cd29d686fbb78ccc23190aa3952fb84fc45c6a4646cc8dce57670df40eeb7967a1c23000 SHA512 d47e18f51abc0f7497dfc97ed4cc81a3ef9b33c106687cc94d4954fb3987089cb37a0958d79ccc239b8fcaead0cfb32ccdf42b299ec292b532f09c1dd6438c66
 EBUILD libunibreak-4.1.ebuild 1232 BLAKE2B 47504972e021c99175e799f3a306ba130c031da7b92be3f31aa0138d98efffe6cfdd7609027f989bc7cf278e64bc457efca0bff9b3580a802f921c69ed04852f SHA512 68b7674d00f517183383124702a51de40ce2f0d06992f29e1965e0cb55c74444ed8ef6b4c268839cd7a0ab123d47ce878adcb4fdb7a4816ef1d646abeb82af27
 EBUILD libunibreak-4.2.ebuild 1233 BLAKE2B b85936fcba3579d376ea3ff9657a1d64460cce6e9d26a8d8f6c7ea3e5edc52575f56ae25cbcbe1816df4baa40d56d605cef07c57e278c8b980b0fa899f3f7f0a SHA512 d2b80e682602a2fb8daccaf15a873db4352307825ab9ded6d88e8013ae62c9bbf8d9bb7fa2931fc294b7efcfd03701acde2f2efbd390f2b6ff4b21b72e031ada
+EBUILD libunibreak-4.3.ebuild 1196 BLAKE2B fc79f3c2fab1c8d9788932a5e561a5a020512351a089e5b7d8c60d8e6751ede0abcd4b0dfe1e42ceec9f60488e24df0d99a91fac0358ba85cc1a7b0908b33712 SHA512 808611b6e37b739ed80ad42988c9a9f6ac8c0dbbec48bd209037a90d57d1c3283a2b964d58c95b2e1f35d306a2b480589b26865489afb1d648813b15deb3c338
 MISC metadata.xml 614 BLAKE2B 9a68d6b1935c236312fb74a18fe8d417c8e11970be97aad071d04b5a2c57cd18df55e2b48a855ff81a3287636af6afb4abf1ab0fa84c6391c013500f65585061 SHA512 bb9c9c2b2264cbb2c7596146c1be2b51a1e0d710432b86b3f68dd7fe9832abe7aa68ffe7806e58b6e4d044d269f86a533b1b9bc437eb5cb80bac39027989e62d
diff --git a/dev-libs/libunibreak/libunibreak-4.3.ebuild b/dev-libs/libunibreak/libunibreak-4.3.ebuild
new file mode 100644
index 000000000000..80d0efb7d58f
--- /dev/null
+++ b/dev-libs/libunibreak/libunibreak-4.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Line and word breaking library"
+HOMEPAGE="http://vimgadgets.sourceforge.net/libunibreak/"
+SRC_URI="https://github.com/adah1972/${PN}/releases/download/${PN}_$(ver_rs 1- '_')/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc +man static-libs"
+
+# Tests require internet access to www.unicode.org
+RESTRICT="test"
+
+DEPEND="man? ( app-doc/doxygen )"
+
+src_prepare() {
+	if use man; then
+		echo 'GENERATE_MAN=YES' >> Doxyfile || die
+		echo 'GENERATE_HTML=NO' >> Doxyfile || die
+	fi
+	default
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	if use man; then
+		doxygen || die 'doxygen failed'
+		pushd "${S}"/doc/man > /dev/null
+		mv man3 x || die
+		mkdir man3 || die
+		for h in graphemebreak linebreak linebreakdef unibreakbase unibreakdef wordbreak; do
+			mv x/${h}.h.3 man3/ || die "man ${h} not found"
+		done
+		rm -rf x || die
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use man; then
+		doman doc/man/man3/*.3
+	fi
+}
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index bc3988eed416..0287ae59bc32 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,6 +1,4 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
-DIST libxls-1.6.1.tar.gz 443736 BLAKE2B 47ed31bb16a65c764ee5882435ce11701e51b6ee5f03aa57ee7991e5445dc477143df48d757c618043a1abd864c46dacedeb1a18a608db1d5ae2b8fcab4a712f SHA512 99d4aa911bc12a52698e11c0592ed8ecb16fa055d4634e6bcc3e0a3900fd8311bade70d2cc8d2f60abbe72d644b6f30757b284544ca589e85c35eeb6f158b8cd
 DIST libxls-1.6.2.tar.gz 443736 BLAKE2B 46f875613caa423dcb3acac0c38a68c7274993b25cc9be891266b8cf59e8eb0f17580e399305cf927854e090f34fa34f57f7fcbdceb75dffaf04c3362fa63095 SHA512 55e5cb33ec63484063d0893eee7352b89f993363762cd5ef42b5f918b09d1eafcf933fba076255267d9413c963481eb07c7054a2495d2d529db2e1d626353d22
-EBUILD libxls-1.6.1.ebuild 678 BLAKE2B 8d2bfb9b828ebb21d08cbd23619923341f2fc735c1c544ba25930166fbf49f690448ed41a39e34589d56e910237173a33cefa52b09ca3cfd82abbdd143ec80f8 SHA512 56cc8948dd2324208272e4add158544282471766cbaafdd4ec8d1d9ab5666e61e2c5d4347dc42e101eb2e5acaf930bc0343d987ad35941a0d6757073d0054a0c
-EBUILD libxls-1.6.2.ebuild 680 BLAKE2B b52b1a23cd7fedabe85ca546ba066b44be141fe345b48668567c3f42bdc93929aa8115604749f8201f2c60c19fdb5e6bdebb05b6b59c65e5582ed29eb090cbab SHA512 af395d6146db419783f614eb6838fa4553e1ed2fba1bc3591d97f886b4e96a79fe12fa6a5f31ae94829172539e42a58a475bce202576fed770a5c056e98d81f3
+EBUILD libxls-1.6.2.ebuild 678 BLAKE2B 6004c15f9ae333c904771e243a0fedf11cd967d016892baa1a54bc3fee1dcf585e91428e28d6debedb0d7815c29cbdb46391dd8e7c2d084f2970c132858c3628 SHA512 bdb9c051bf324a816a22da10605ec983ca23541922f72fa293e14c1b29598c1c227e0fa536854ec0db0ef2ccf98e86518882738146c3369eae66785cce19ae66
 MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
diff --git a/dev-libs/libxls/libxls-1.6.1.ebuild b/dev-libs/libxls/libxls-1.6.1.ebuild
deleted file mode 100644
index 806445dbf160..000000000000
--- a/dev-libs/libxls/libxls-1.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils
-
-DESCRIPTION="A library which can read Excel (xls) files"
-HOMEPAGE="https://github.com/libxls/libxls"
-SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/8" # libxlsreader.so.8
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-RESTRICT=test # test driver is missing
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-asprintf.patch
-)
-
-src_configure() {
-	econf \
-		--disable-static
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libxls/libxls-1.6.2.ebuild b/dev-libs/libxls/libxls-1.6.2.ebuild
index 0f00bd86d800..51f16d208994 100644
--- a/dev-libs/libxls/libxls-1.6.2.ebuild
+++ b/dev-libs/libxls/libxls-1.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/8" # libxlsreader.so.8
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 7f68440d79d9..577848fa4c58 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -8,5 +8,5 @@ DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 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.10-r4.ebuild 6370 BLAKE2B 0b822937c9a5eb7f80e4e4fb308f1419dac9a5169b14cae18c55061e63e288d27526aafceefd99d86e0abcac89eed5d7cfab7da9a9bc1b10d644d3eee11e5b17 SHA512 5cdc14160386a532b55f077ff6edff98498d085adac03fa1b28ff48a3e409cd9e82cc125082377408d7e8186448a1ce0494049e504d9f9d4b1689059b7bcd437
+EBUILD libxml2-2.9.10-r4.ebuild 6409 BLAKE2B 82a43ea7f6ffcf9e648c711db4beec9c6b82ab825fe0f676484fff6529bc00ed948758130919877ac01d12f16ba074f1036e940167e125069183726097ad4d50 SHA512 fea86142743f481018290de2282a06d1a7abe6a838ff745b563a01563db4c0272ae837e562c98ffaed6ba2ecac98f3569016ace7639d6b07194232c900ba0390
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
index b7f4fb0ea5a1..9db3902e430f 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
 
 DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
 
 LICENSE="MIT"
 SLOT="2"
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index d366f62f0977..2f01690456ad 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,3 +1,3 @@
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
-EBUILD libxslt-1.1.34-r1.ebuild 1534 BLAKE2B d2ccc6ff09cbeaf2b1290105f5171611e4bf37901f08aed3fa8ed4b58d6884b3471dcc3756efb3006cfa64bd5735d74c6017d8f5a17cd89c9337e378bd8a6007 SHA512 2f8657950d5276c4490b3fd5a52cfb62e707308873f8c612fcc95467150623c11b2626be7db3916d9bc3b318ac07e659bee65ce5d80efde5e36455c90111a105
+EBUILD libxslt-1.1.34-r1.ebuild 1573 BLAKE2B 0d27be776fbeaad5abf68c7da1afc2f1754b9045f0c4e809e0ba1f2c8f465fba8501675eb47858c636611056040a37a708865d27934e714fb55a574807ac7b25 SHA512 72d4e0d42893bcd59775754f2f413d7598e55ebf440a25e3875a8004d9b344c6acc967a7d13bae3344b9f64f8688c369d9bb82b1ac1c4add065f2ea8d3c69552
 MISC metadata.xml 457 BLAKE2B dea5177b6500449022319ee718e279c698edfbeff13027dbe4db1318126dd693560435a864245898d4f55cbdeb4d3f9605dfe94c1053b3b76dc96f5c80456709 SHA512 d03eecaadd8414b7d2bc73e7a0bb2f91317cc6647f584a8b94346d37ded1b37a32651f0e8c46d308861f18fef94641265b0058eb740c5bcb4f91eee6cf4c05e3
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index e92dbb392288..114b12b1abf4 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit libtool multilib-minimal toolchain-funcs
 
 DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt"
 SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index ed29d09ed619..e0e9d39a9754 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,5 +1,5 @@
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
 DIST libyaml-0.2.5.tar.gz 85055 BLAKE2B 71d1a002b8969db96af9e942bf67944acfdf2e740744b1abceacfd1c3bc54d8936d7048760aa81f1cf22518241e9f45ecf95c76d6ac41eefbdf04eb40e16a618 SHA512 a0f01e3fc616b65b18a4aa17692ee8ea1a84dc6387d1cf02ac7ef7ab7f46b9744c2aac0a047ff69d6c2da1d2a2d7b355c877da0db57e34d95cd4f37213ab6e7e
 EBUILD libyaml-0.2.2.ebuild 991 BLAKE2B 3ed138f98dad86894d6be8806a7f2155be731723d229a4936c533ce83bef958d9a194719e43dc6de509c4e5678455f874e4d5519227d90de9c4d4a3f04309034 SHA512 e3c9b38411b2c0dcea5a70cc9a170d278f9a4b9c00fdb8b66685921055b770ab27f96851accab0c6dea7fc537362cdd500e6736e8eda816c20b191ce0af7cbe5
-EBUILD libyaml-0.2.5.ebuild 992 BLAKE2B bd2f9a71f53cb39e7ca0b3a11d232f9cf7b6bafc2d80f32f045f12d87fbe7237e9425fbc2d6f2979c70bafd55e1b088da75f8fea94bd04e2edbb9d3bc11eba18 SHA512 4403dcbae0abb640325f9f0015c4bd6f9da4021c23ff69efeeb1409a166f4e0d5ff7c534cce31f9df56cb5dc76a1c6052f8384528dbc07c314e2090b48accd5a
+EBUILD libyaml-0.2.5.ebuild 991 BLAKE2B 3ed138f98dad86894d6be8806a7f2155be731723d229a4936c533ce83bef958d9a194719e43dc6de509c4e5678455f874e4d5519227d90de9c4d4a3f04309034 SHA512 e3c9b38411b2c0dcea5a70cc9a170d278f9a4b9c00fdb8b66685921055b770ab27f96851accab0c6dea7fc537362cdd500e6736e8eda816c20b191ce0af7cbe5
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild
index 15024cc5efbc..75975f00a462 100644
--- a/dev-libs/libyaml/libyaml-0.2.5.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 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="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index db7b5d7ca501..16acd2f07110 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.23.tar.gz 627405 BLAKE2B 913173aca367dd660b8e04502e1198072e99e9ece5cd30ef2d4ad528292b3aba00799d89ee336bdf6a1cebf43118610caddfeeedccdd4b5af48bd54ac795066b SHA512 c34aff9b8a19713ea9881ea5a58a038fe7f0127c3503c845ecd6187ab07f90f7ae2727331e43b9cfb6b8db15d8dcbf80b2e1f4105bb4a34e9b30d9778d3a815b
 DIST libzia-4.24.tar.gz 630318 BLAKE2B 83792c75e776b039788d46568a967690e10086b1f5daf3304a658721f1139bbed65b41a8fdcfe213757d342287696c383be7668be111896388b292086ca2cd0a SHA512 e7952822861d7702494309d70e9d7385c5dfa929b521387bc81883d4316a5fae96c5776b00f81da6dcbaa2965fdf30ac8a8a1b9963806d36454ebd6886ddcbd1
+DIST libzia-4.25.tar.gz 632565 BLAKE2B b677ef71a2c02baa04e3a3e1594b28cd7161762456a44f6532462e4514851e6298ade881b61c3d02175a7029b43358e94ebdad558aa82d8210600e35b9a32e30 SHA512 5d3d9f80b53baa3aeaf359d4b3c0eeec265177e47bf11bf2c5bcebf23d339e481eaa14a1ea7f5f686c9c7477fd607095c77d85399df479d297cc5bde1086535f
 EBUILD libzia-4.23.ebuild 963 BLAKE2B a2193135182336fdf555b83670eb02a97cc10aca94a4058b8cce044b3aafedc0c4126534ca3fc47ba5bfc3e5297def41c702de85a173ac1e678597ab4cd7a55d SHA512 68eddffdc4734b8e54f38e886f9bb8a510927210190c538f935f0da982b4ba850e4fa3234678804392c4ba21931d8f1dde5859aa1ef7817ea87c09573704a4d7
 EBUILD libzia-4.24.ebuild 965 BLAKE2B 8805cbc629207604f0c86ec56006c7da1ac1f1524f903cef9f6e847a259041fe638381cabde739183e2a033e131b14f3a299baf5b07657431d59f3b88b479bc5 SHA512 4942e7626e8a464d48642e6b313cfcb2368f9e081a8e4359cebee692333e6f2a2ef42f1e9d15e619a2c0a440e01787054bda2274174af82b8f347e082b77aaa0
+EBUILD libzia-4.25.ebuild 965 BLAKE2B e12e9376ae1157ec7b15186615b2ac7ccee22b7312e43b6108285826572fc18fe48f0d61b6b81e803e792ecb0768fad6cb333a12745ac906106755b7afa08482 SHA512 8439d9c29f3bad065427b7245071bb532a15356203a11b9c9fae0d68ad02e2025ec2db211b17c8e71865b2604748b36c13491ee74f3c30e90a75e185082a6bb4
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.25.ebuild b/dev-libs/libzia/libzia-4.25.ebuild
new file mode 100644
index 000000000000..a3fecb46f788
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.25.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest
index 3805dd7691a0..cc055129aa63 100644
--- a/dev-libs/miniz/Manifest
+++ b/dev-libs/miniz/Manifest
@@ -1,7 +1,7 @@
 AUX Config.cmake.in 65 BLAKE2B 520fd3e379b53671d4bb9cb62567ec0f569c711d18019b428914967c57189b5e5f55aa589d0469f1c2891a68f285626e88395c2fef04f677bdf4a26633651526 SHA512 040e97901dea4890625a5bf80db145af432dcb0aa6159ac35e496b027ab3d35132392f45e734ab74002505148c7f879efc72595c6cce99469b8526786af3e7de
-AUX miniz-2.1.0-export-cmake-build-targets.patch 6592 BLAKE2B 96b279e4ae5888e8604a99d40ae0000927f5c654b9ef6d0ea95a57e97dc0a43d87004e5bb9750b92926445b75dfcb6313994eb6b3db1cbbcf2e78d891c5bf3df SHA512 61cccaac9734183416320de302c06987db186930e455ad1b78ba2a87c10f6b2965ea9e70d192bf22a26b487c4592b70da7a99ffaeec9e132f0e5adf0f66ece9d
+AUX miniz-2.1.0-export-cmake-build-targets.patch 6510 BLAKE2B 1622c34af849f7b8818463759f205f71e7b64ba52ecc4cb8a552c457577c95cdea5beb94d5f6ffc986960e5a071b00adb54eda7cd1b34a5aeb692f359d989a2f SHA512 b36377b8d19a8b1d8099e0645d90e9f5778a4947de9da0d0bf04eb344a2ab24a1f84e8410115159e59bdb5569268761944409caecb6bb860aff5f42a57b3d9b1
 AUX miniz.pc.in 315 BLAKE2B d05cd14a7acb4039e5f0521a68e6e5eeed00849a5b5d639fbbd4de45c1e0eab8ed33a22cc608761ab1dd1e1142021b8e5bfbf8e9bab589bfb2545701828f5f7b SHA512 8c1828759a45c58a96bebaac9fa5196d95be85a76be8d4fdd30eb2b4db5dbe582a7e0156fc9a4249c84426bbe69b30d31b2faf162c8d619810012afe6e1ad0ed
 DIST miniz-2.1.0.tar.gz 104502 BLAKE2B 9a7b3818b454809cdfec523d98f13bef3a52e27b6d3857d289438978d12997e38c71aa97fffe060a6b765f8fbbdd8fe8cebced4a45d9f1f040dd3e39cf2a8055 SHA512 e0aba16afdf230d1e54d0a9cedd336b0b158b02744839f0547e14ee47a97fc1a6668f3a181bd46e969b01b158af18dc8ed3c0a4210b3b620242338a2788806b3
-EBUILD miniz-2.1.0-r1.ebuild 711 BLAKE2B 639316c2389f57bda50c675671aa829accfe17111a869c63d6defacc73f63562ead4f47f723e6dfec3216f2bd6e7e8a392bfb2d1bda3d20e320ed4f59d2b6f20 SHA512 756f4f758d18cb07dd5e3ebdb62722847360452b2526cddb7e015f3996b4049333342d26cd6d728d4c79b5e4792bc2052276e1fd8cbd0444d4f8eac49750edba
+EBUILD miniz-2.1.0-r2.ebuild 711 BLAKE2B 639316c2389f57bda50c675671aa829accfe17111a869c63d6defacc73f63562ead4f47f723e6dfec3216f2bd6e7e8a392bfb2d1bda3d20e320ed4f59d2b6f20 SHA512 756f4f758d18cb07dd5e3ebdb62722847360452b2526cddb7e015f3996b4049333342d26cd6d728d4c79b5e4792bc2052276e1fd8cbd0444d4f8eac49750edba
 EBUILD miniz-9999.ebuild 868 BLAKE2B 4c35c1ff7de11247e71860fbe61c973b77d456db29a87cf01b3e34a83df0d61b3a2b3d0f5a938081cf1f6f578a97a1489e292ee50b46d1e0ece1bc049b70b7b6 SHA512 9cfb04128eaa89af0a0d005ca8aa03a410addb3953d6522be5c480bbb93e765c1c2b6dbc145c91d57fc9931d7267bca47eb34e711561f4bc2ca7835cf98647bb
-MISC metadata.xml 1067 BLAKE2B 4360a8656cd006529dd8955d1905daa17e2a51c2ec5dabe6bc692ebdca70ca2a06d588d9e6dc6989c773922172e32ded9a7c1d65e41907468a2df5d1f18b1abc SHA512 8e36cbda8ad79dccaf7cd95eb9675e306c276d2173b0e1944d21b924f518ab0085fc4262eafa23aa3870633f198d8622b1d05866336b5551111b8750f16f220c
+MISC metadata.xml 1131 BLAKE2B db29180f6a2d306d92cc4df6adf03cd51530fd9c552c366f356994f94b40205aa3da7f87eadb7be105ab499097f951a83dde42c248746a6b0537b3b00c467da6 SHA512 e8d4a2365662857afb9f6503fea5e0750510801af7c7256d11f52f2b56dbe8185ce694e5dc3a7aa3820d6356829432f5195a058518ed6787b5e9bb5daa214acd
diff --git a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
index 6f8429222700..c1fb1a52215d 100644
--- a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
+++ b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
@@ -18,7 +18,7 @@
  if(CMAKE_BUILD_TYPE STREQUAL "")
    # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up
    # differentiation between debug and release builds.
-@@ -8,45 +18,122 @@
+@@ -8,45 +18,120 @@
  CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
  endif ()
 
@@ -39,8 +39,6 @@
 +string(TOUPPER ${PROJECT_NAME} PROJECT_UPPER)
 +set_target_properties(${PROJECT_NAME}
 +	PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${PROJECT_UPPER}_STATIC_DEFINE)
-+else()
-+set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden)
 +endif()
 +
 +set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${MINIZ_VERSION})
diff --git a/dev-libs/miniz/metadata.xml b/dev-libs/miniz/metadata.xml
index 8cf9d7cdd9de..94de8f522eb5 100644
--- a/dev-libs/miniz/metadata.xml
+++ b/dev-libs/miniz/metadata.xml
@@ -15,6 +15,7 @@
 		fastlz/minilzo.
 	</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/richgel999/miniz/issues</bugs-to>
 		<remote-id type="github">richgel999/miniz</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/miniz/miniz-2.1.0-r1.ebuild b/dev-libs/miniz/miniz-2.1.0-r2.ebuild
index cc26fba366c0..cc26fba366c0 100644
--- a/dev-libs/miniz/miniz-2.1.0-r1.ebuild
+++ b/dev-libs/miniz/miniz-2.1.0-r2.ebuild
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index 2f050e1281f5..1fe02f5f625b 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,6 +1,8 @@
 AUX nss-pem-1.0.5-nss-3.53.1-support.patch 5005 BLAKE2B 4cacfbc965c5c5add442e8a37a1c4ad5c567763aeec7ab567c7558fd4b343cfeeec952a5d4c5131f279d3a7794b753ba424c27398263d4b03751a7308eda118c SHA512 8a19a7831d92e45f101ca44e278b319bfd3884d4eb17ec268ca08ed08542ecf51f81be23079e30d5b87aaa467f4104c88d739043aa3c36989540a69a23f4ae13
 DIST nss-pem-1.0.5.tar.xz 36320 BLAKE2B c2294595d95a2de2bf6d9e68dc10955297fb6ef27c9e85dbabc7854b900942070f70a8e4c1abef618e7265daa75f5bd2a2fca3fe923973345f9c1b64a3da8ff5 SHA512 8dabebf114ac94441caf6d279f810de4124a3ffc05ae66777496b3e66f8b8148d535cb438a165d84f53111c468d595f3b16651cd7a990eeedca9d413aad65b2b
 DIST nss-pem-1.0.6.tar.xz 36304 BLAKE2B ea804bb7b45c6d23c82ac823e36244b13d9b8ef8355cf30e82cc09850e623317ddffdbf4f8fd0ffa9253cd64d47dd12aa1738a8f720b3ac0e9091dff3421fa02 SHA512 2640c30aa8b0721e479f77781da7b4984553a01bff481084ad6e028cb6c99e2441f89b7758b5fc10f7c586e41dfcab2083a7c47bd1e0ce19712d0c61ac237540
+DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
 EBUILD nss-pem-1.0.5.ebuild 644 BLAKE2B 6c953bf5e89b2f2fe668af5204a463f9aba5103e20bab64378d3b41eb1fbc66e53ec16b284ea3593ea05674f897d7659b8b8c25f8a3d3320c2209274eb495aa0 SHA512 7e6c8698937df6330d566736391717e4030fa026216a7d5f3f015e27708ac60402f551987c729ce536c0203202b4377673062f7ad4f7e5d6f3e05b213fc5f452
 EBUILD nss-pem-1.0.6.ebuild 711 BLAKE2B 74a349ad6bf0deef84d57e099c7473518c187743657e700625dc7aa18412c62efbb63c907185087a01f6edbcbf9eb575d05a30a93d3ea3453205a442c29aa451 SHA512 0105fc1eab10de04e0b256e13c199740a8c13d6f921062112e0e6124cdd7b6640ffdb3fae16ef7170bef49e41074cb209d69af84530a83c38090c18dbedb58ee
-MISC metadata.xml 332 BLAKE2B d0c820a1adbfacc8057f9110c542b17a456425ff7db013dbcef98a325a2f2c04950b15589cad36eb9bc9fb113a9fad35dd913821b41865282160878136783749 SHA512 20a26118c4e465049f6ee61e855ccd9b19a2c52caca91c0c73dd8e30a381c653f97603e7f2a6d8d64bd7aa6eff32f40044096a3257c5587ddbe6570d258e94bb
+EBUILD nss-pem-1.0.7.ebuild 664 BLAKE2B d7646f185ae9dd5e3887d9698988fe805485fe2fcff2546f16fc28af50287c0cbfd46487a7b1d5068aae29ec22b85a8b95273af97037974eb348eabfa4494b23 SHA512 d183e493306cd3c27b5a866eb2ada0b96f2a149b7161b6b31a55a5de266898c3f169077ebd5e296dd290b44890dbcfd105f749781b27b5168e7a278011d58f77
+MISC metadata.xml 333 BLAKE2B cdd90c0d17983bf6dc3dbed22382259e079792e7294ad84af5b38d07609e184715322d2e8cb57623b13e24c6c5f68a1347cee111b089042b0a5eb11f1ceab2cf SHA512 d7c04e39d92a43fa144ec157c971250bfed9bd16e5334e1c337a3ebc29d79866c8d4832fb5c62766a74577b07b983eec96991a5531a07012fca77b53b705376b
diff --git a/dev-libs/nss-pem/metadata.xml b/dev-libs/nss-pem/metadata.xml
index 013b4adb2108..ecd77608690a 100644
--- a/dev-libs/nss-pem/metadata.xml
+++ b/dev-libs/nss-pem/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>anarchy@gentoo.org</email>
-    <name>Jory A. Pratt</name>
-  </maintainer>
-<upstream>
-    <remote-id type="github">kdudka/nss-pem</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>mozilla@gentoo.org</email>
+		<name>Gentoo Mozilla Team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kdudka/nss-pem</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
new file mode 100644
index 000000000000..c5826f3d4e9d
--- /dev/null
+++ b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+
+inherit cmake-multilib
+
+DESCRIPTION="PEM file reader for Network Security Services (NSS)"
+HOMEPAGE="https://github.com/kdudka/nss-pem"
+SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~sparc"
+IUSE=""
+
+BDEPEND=" >=dev-libs/nss-3.50-r1 "
+RDEPEND="${BDEPEND}"
+
+DEPEND="!<=dev-libs/nss-3.50
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 1e700a95dc11..1df41b05d0d8 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -2,6 +2,8 @@ AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
+DIST opencl-clang-11.0.0.tar.gz 79487 BLAKE2B a5ec89c68dd31f53881a002fda0fa9f83b6355273a6f2085c6794a0c9a74ba44b8ac21175854a87427c30523f2dd024006050b77d90bbfa7041e4abfbf0bb9e5 SHA512 bd27d15d5e6f396f0b0a79fb1f2081033e26db1df701a37558f7b9976299e17cfb383beff8fb0f1a5ab63601648cac2a33e4de73100fd1ab8706161c52aabe3c
 EBUILD opencl-clang-10.0.0.1-r1.ebuild 1135 BLAKE2B 1c99942d66a2bf1e3b9e8f4e8f778b2af0452529f6bfa1aab10e1fab66739296613853180e9b22a8aaea8c5f53dc84cbdd235a79b8d5fed479787f48e4148e8b SHA512 631065c3510b38de41ea37663bb95fe49fbce708f363a654ee532f50f5743b115b1c73d1b2a40258d3aa6f9ae38de196ba32aac31db6bf76ca97df44b2fbbdcb
 EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
+EBUILD opencl-clang-11.0.0.ebuild 1146 BLAKE2B 0b2455f22a68726583b9638b8a20db67efde7a9a19c2879561f5614df99462375fcc453ab6c638bf72d0056325428698976b213a271338f8fa449145c8148e14 SHA512 6297e9bee27415679474b922b31ae1f3b1a5df7b7ccb7954993bd5f6346e7994a5b2e89794ebffd18c306abe48644691eaf764b844532d3d1744a715da8cdcb5
 MISC metadata.xml 251 BLAKE2B d59c954af9491cf4baaa1ef87798223542baa4d51b53d7efe06cd840bad610355371123af40858103530471987e6689863955eda4320e45add1964d64a2d3f10 SHA512 1f5116232dec742b8658c6296c94e33b014a4305a191fed50b9c840dd2613d3937a2405efd57b23d6bfeace5473a310bf36b087cf0b73817287043f6a2ff701e
diff --git a/dev-libs/opencl-clang/opencl-clang-11.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-11.0.0.ebuild
new file mode 100644
index 000000000000..c359b97d9e13
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-11.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="11"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
+# in order to work around Bug #743992. Hopefully a one-time thing.
+DEPEND="~sys-devel/clang-11.0.1:11=[static-analyzer,${MULTILIB_USEDEP}]
+	sys-devel/llvm:11=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-llvm-translator-11.0.0:11=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=11
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index b4704143befc..2ba0ab504c34 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,5 +1,4 @@
 AUX gentoo.config-1.0.2 5253 BLAKE2B 2a167c760399401cd595e6b85ee8c29f8e4d3e4a44e7b6b7e42320ec9f88b1a61bcd4387815bd6f73dea71c9b39603c1809e4f1537d5de553ec77996429c0516 SHA512 59479e5af84e1f991ba8abeac42276a08a5c9f61fa0c79af96cd7c94fddb72de82ba56f31babf9b3bef5de26431ebb2b98bc1c58715b20baea350e16360108a3
-AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021dcbb3efa421866f6e09bbee6287aae95c6f5d9498bd9d8974b0de747ef696242691cfebec90b31dc9e2cc31b41b81ec SHA512 f75ae1034bb9dda7f4959e8a5d6d0dae21200723d82aebfbea58bd1d7775ef4042e49fdf49d5738771d79d764e44a1b6e0da341d210ea51d21516bb3874b626a
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch b/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch
deleted file mode 100644
index 3a005c9b099d..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest
-
-From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 21 Mar 2015 06:01:25 -0400
-Subject: [PATCH] crypto: use bigint in x86-64 perl
-
-When building on x32 systems where the default type is 32bit, make sure
-we can transparently represent 64bit integers.  Otherwise we end up with
-build errors like:
-/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s
-Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890.
-...
-ghash-x86_64.s: Assembler messages:
-ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression
-
-We don't enable this globally as there are some cases where we'd get
-32bit values interpreted as unsigned when we need them as signed.
-
-Reported-by: Bertrand Jacquin <bertrand@jacquin.bzh>
-URL: https://bugs.gentoo.org/542618
----
- crypto/perlasm/x86_64-xlate.pl | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
-index aae8288..0bf9774 100755
---- a/crypto/perlasm/x86_64-xlate.pl
-+++ b/crypto/perlasm/x86_64-xlate.pl
-@@ -195,6 +195,10 @@ my %globals;
-     sub out {
-     	my $self = shift;
- 
-+	# When building on x32 ABIs, the expanded hex value might be too
-+	# big to fit into 32bits.  Enable transparent 64bit support here
-+	# so we can safely print it out.
-+	use bigint;
- 	if ($gas) {
- 	    # Solaris /usr/ccs/bin/as can't handle multiplications
- 	    # in $self->{value}
--- 
-2.3.3
-
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 2131e8860ccb..0605b156fc01 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,3 +1,7 @@
+AUX pegtl-2.8.3-cmake.patch 1688 BLAKE2B d99c349dc31468cf84c2d2f3a26d514e5ae8c55bf72f444ce6def76cd858fe2ce58f7c4d5d305ab7ef3c150204895fcff8c3f662d78e40941a5344827ad587ff SHA512 076bc724a09edb3c1d1962a686da9e48d469a3fbfec056e1abbe401f80b9b2eee67aee06afdb7fd540c3997ae6f9cb6a33f63f713c5ee88825f75c6c488c581b
+AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7e9eef4f4f660aece9a322065faac2e0df8d1ed5f0c48b9ed009f94942b99e49eee13680ba5b2c25ef062a6ba2c SHA512 3a9255811d4c579aeb7552ff9eb6697e9401746ce0df031e2432266e946c6ff0b7e26792c37bf01c3ee3a89d31aaa8b39f4527025701ed0f6e6a49a96a93984f
+DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
 DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
+EBUILD pegtl-2.8.3-r1.ebuild 721 BLAKE2B 1b9ccb93bd4b593b8bd20636f14eacc6d5296646e8e76a1feee4c5858297f65c5ad60d0540683bf3b121c9c0dd7bb74a46c9348e78fc4f85869dbeb2c4c890fb SHA512 9960fef33434f9a272eda13e30a9dc8379f454922b46879a9e137a535e42e43cbb7be9f7ffe291a106e5ee47648b3a201168c8f6d37f6b5350c6007b500903b1
 EBUILD pegtl-3.2.0.ebuild 624 BLAKE2B 7e06d9933634b397cb7217c8558e0cfb0ccd9ba58301a38862d27a23a526200e3c9bc8f19bcb2a689978e9700e47590553aea555bc8607601365c4558d7fdd87 SHA512 0d4d90e70405a82918e28a04cb67361e838c523e8129e317f051b0285a2cbeb64acad998f4880adf746a0b66e5f62da7cc2be674f172580b88bd346a7d49b51c
 MISC metadata.xml 330 BLAKE2B 4b09139ea492f1fefc4b58c0afde7354d8f9f966932f5b0908c43c6fab7ae9e822ee8fe02905763d8fe69a128bb7159d4a8b3cea7b1ab087a8a30a57ab297f83 SHA512 721c1b987d580024e7c937f54c512c1e55351db3011675080fd8b1a36c42916eb216b30707f270655db76dea8bc9ee4548197270ffc51b570bbbc0fde33503bf
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
new file mode 100644
index 000000000000..140e1f5cfbb8
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/CMakeLists.txt	2020-12-27 00:00:15.886046938 +0100
+@@ -78,4 +78,3 @@
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pegtl-config-version.cmake DESTINATION ${PEGTL_INSTALL_CMAKE_DIR})
+ install(DIRECTORY include/ DESTINATION ${PEGTL_INSTALL_INCLUDE_DIR})
+-install(FILES LICENSE DESTINATION ${PEGTL_INSTALL_DOC_DIR})
+--- a/src/test/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/src/test/pegtl/CMakeLists.txt	2020-12-27 00:07:19.122766830 +0100
+@@ -123,7 +123,7 @@
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+   if(ANDROID)
+     add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" -DTEST_RESOURCES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../../.. -DUNITTEST=${CMAKE_CURRENT_BINARY_DIR}/${exename} -DTEST_PARAMETER=-all -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
+--- a/src/example/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/src/example/pegtl/CMakeLists.txt	2020-12-27 00:07:32.970832890 +0100
+@@ -48,7 +48,7 @@
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+ endforeach(examplesourcefile)
+ 
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
new file mode 100644
index 000000000000..ef418e44254e
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
@@ -0,0 +1,43 @@
+From a3a292c2ba66bf09b4adc4cee8fcdfb1b1386067 Mon Sep 17 00:00:00 2001
+From: Daniel Frey <d.frey@gmx.de>
+Date: Mon, 11 May 2020 22:19:31 +0200
+Subject: [PATCH] Repair warning from GCC 10
+
+* Backported patch thx to Fedora.
+
+---
+ include/tao/pegtl/contrib/rep_one_min_max.hpp | 21 +++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/include/tao/pegtl/contrib/rep_one_min_max.hpp b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+index 7ec4639e..ee0a3782 100644
+--- a/include/tao/pegtl/contrib/rep_one_min_max.hpp
++++ b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+@@ -45,6 +45,27 @@ namespace tao
+             }
+          };
+ 
++         template< unsigned Max, char C >
++         struct rep_one_min_max< 0, Max, C >
++         {
++            using analyze_t = analysis::counted< analysis::rule_type::any, 0 >;
++
++            template< typename Input >
++            static bool match( Input& in )
++            {
++               const auto size = in.size( Max + 1 );
++               std::size_t i = 0;
++               while( ( i < size ) && ( in.peek_char( i ) == C ) ) {
++                  ++i;
++               }
++               if( i <= Max ) {
++                  bump_help< result_on_found::success, Input, char, C >( in, i );
++                  return true;
++               }
++               return false;
++            }
++         };
++
+          template< unsigned Min, unsigned Max, char C >
+          inline constexpr bool enable_control< rep_one_min_max< Min, Max, C > > = false;
+ 
diff --git a/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
new file mode 100644
index 000000000000..207b474188a1
--- /dev/null
+++ b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE="https://github.com/taocpp/PEGTL"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/PEGTL-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 733678
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
+		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 9cb3dbb41efe..f8b2a413a530 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -2,6 +2,8 @@ AUX simdjson-0.7.0-dont-bundle-cssopts.patch 1318 BLAKE2B 29fef993c326fd918c279e
 AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676359cd5c02cbdc5c97d3645c627667b6986b84bd53285103b50d152d663469623d973ca6f1332fc6b554412ba57be9395dd17a016e1 SHA512 00814353defbd7b77a88ad67faa151494c203470cc4627d8777f8dad7e5918e7650514b76dfb3007644a0864fc848cc30bd71aa61ec86b93bb9b66417da3d961
 DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
 DIST simdjson-0.8.1.tar.gz 7994048 BLAKE2B 800fbec2b8d20394a894407dea09e3b61302cf6c772dc459b73a97f5ec1e29feb082366d202f5bd835fd54802435e8f437dddbe3ec6db449812b849cd02639b2 SHA512 c4861901595b574e5f1a17abb58f30072bc16e90dc245304019890cd59f172a56c2661410653ff3e4472670541ef2291b3661765f6d64b5f8f70c562b90a3bd0
+DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127
 EBUILD simdjson-0.7.1.ebuild 1038 BLAKE2B 0aea6fa87992593836dd852a8982bb5fdaec652a629d4fd2e5783cd2a5823539a0b0227f77aa0ee6077d9f20f0fe44209d0564ed4c80c60e5ad05010a346d0df SHA512 ac317104a1255436a41cc860f854fc2e2054ac2adc0866cd5b86b289833f8823d7360b72433dfedd91208e828a45d7fccc135e24fefa0f4c4ef964832f0ded1b
 EBUILD simdjson-0.8.1.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
+EBUILD simdjson-0.8.2.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/simdjson-0.8.2.ebuild b/dev-libs/simdjson/simdjson-0.8.2.ebuild
new file mode 100644
index 000000000000..b97cc2e514e7
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.8.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=ON
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index bec68778ab30..9f4c2886aba4 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -2,6 +2,6 @@ AUX sord-0.16.6-x86_32.patch 1292 BLAKE2B 0177c404d77cbc27a79a31b21c6c7e51015aba
 DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
 EBUILD sord-0.16.6.ebuild 1207 BLAKE2B 5dd477d558144bba5f42212393bdd61c4484f9b860404970dfa89d04570055a23059e96896e11295111a9a6ec4cea05f001f28b2361d466fecfb73e00695fd88 SHA512 7618731c519bcef759234e6c545320d120860b73aca0be480fe4b975667d437c4ee4f92f3cc8597049ec8121ae3657c2c3b486fab8ff09ea4e421bc06e3354bf
-EBUILD sord-0.16.8.ebuild 1181 BLAKE2B aad240adfa5d95e5db8940ad8a5601d8229daef202e65071686000f51eda6c0c473b1d139ce5d6963b0e9d0ed12c255b2793a9924ccb8053f8f926b9c43014d4 SHA512 112f336aab18248c491038ec21499dc32ccf5997389b5e72685ce747998bb1c07f54adf5f67704bf5b208c3ce277f176b03a958fceb17513462ab27324a0d082
+EBUILD sord-0.16.8.ebuild 1178 BLAKE2B 391a87927e2c9891709e7957e93b1f8ae24ec227543ce7625f8b7e0c17ffa3a5f322b660ef9163e9e2496d810f0c938c84060367bb5a22d2f932a00788aa7c7b SHA512 d0f0d71cd531cbffa14f72fbd42dd92ce4605f19980f962ff2a13852c131153c4f1ca84205b0a4dbe9414430d2218e0c7610e7c56cdd2924e629271cc4ae37e1
 EBUILD sord-9999.ebuild 1128 BLAKE2B 77268a5bc22cb33548eb443e14cea7adbf3a1789e05c9b8070e0c59c91d7c315a64aa3ba924d3d21f8bd1c32a6408c3cf66435f38f88df77fd3559c02bdf0a9d SHA512 926eb592bdf596e9d1b64410e391b74a4a39ce97695aeb337bf7adfb6bf457a596a5999753bdce53f1c797dcf6ddd7d4ab919693d9f3ecbceb58abed139c3e65
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8.ebuild
index 0e23c8c7e16e..7862bbdf87d9 100644
--- a/dev-libs/sord/sord-0.16.8.ebuild
+++ b/dev-libs/sord/sord-0.16.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/stb/Manifest b/dev-libs/stb/Manifest
index 6586bc85c284..66350041d8c0 100644
--- a/dev-libs/stb/Manifest
+++ b/dev-libs/stb/Manifest
@@ -1,5 +1,3 @@
-DIST stb-20200205.tar.gz 1375616 BLAKE2B 11acfb4b1938e75c388b426e4b568c2976566259469716514d0ac8c97ab23d45f51fed1dcf458ca8f07e51d88d90708b33d66d545ed1aa09cd96fea46b9eb738 SHA512 31f945de8b642a359363c81e67f09b71aa663eacd68f5ec602eed40987f2d953943871af3b408d1e948a9e5c953098fca34b9e971fdeed92b734bb0c79c79a42
 DIST stb-20200713.tar.gz 1378579 BLAKE2B 13f2deecdc20c95fe3dfd1820346e9c8d1046004082a4b6044934efa7e20270b253953fb8e2d9eecf2a263ea342b740d87807e50da48178c0eb4c7028bd27488 SHA512 a9ba80d19dae4e527171bb02e1caa4d3eb0704cdf7f8fef1a7a09e6b05c65b829b0aa580f469f158a39bf13018289f40c1680ab5c22bfa5e932bff94eced475d
-EBUILD stb-20200205.ebuild 719 BLAKE2B cfcc051e427552368e023c465f215e3e47b3ef1fff350d52c2383a0fc4a607cbeb7fb19e41c435af726379596dfa2fa83d68685a02315356846166f54c6922f5 SHA512 8316c362c1f0662cb87350de115e15cc852e6d7b0e2109676a7e2de7fa2bec232cd25029a09a1c2138774b0795baed0081fd3968bff7b78341e05a804174dfdf
 EBUILD stb-20200713.ebuild 719 BLAKE2B 51077574a1751160fa47f7a15cc58069fa7a51db0002ff0e97ebb50df58ad3f843eb57b642f782efb1c0df0f712939a3f09ce3234b4905525131397e3babc18c SHA512 5216946ea6ddbdc04776adbdc71a44895cd62a0e33ebf5fd54a279d8e4f39beac2cabd82bc884ec4d6b549f2523dcd77a7d109d61b4a6cac5b998e85ea2bd987
-MISC metadata.xml 566 BLAKE2B 31083e6f694a1b5f7fff41a5ca5df347107cb75c6a116cae7f8d6652ff55a197539d90cfc77828728f1b10e1ff091e1bf658fa95298de1da3415472fbb837fd8 SHA512 d6db1290da820060b19a4cee9536caf912eda54a4e11a8ef21ef4e74e60cb1580a1ba320803f0c5b815a77a6b906c9c3d11c6193443ae4abc451c8b5c978fae3
+MISC metadata.xml 626 BLAKE2B eec1e68c5005e9bcf16a25774f766b33ee02e7c4a3146957a7a7c011f42185fc9f4fad48be96543187573b59489c5dfcb8412d7d26719ce4374703117a4ec9ea SHA512 c0658ffa41b20ff650609b4e31072845977c97f09c9879248a76fd89c3215bc22bf2e992a1702d59b775edb9464d70cf20f866a08d7e885ac0f13d6380079a9f
diff --git a/dev-libs/stb/metadata.xml b/dev-libs/stb/metadata.xml
index c6be08a32616..06108ef2af4f 100644
--- a/dev-libs/stb/metadata.xml
+++ b/dev-libs/stb/metadata.xml
@@ -14,6 +14,7 @@
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
 	<upstream>
+		<bugs-to>https://github.com/nothings/stb/issues</bugs-to>
 		<remote-id type="github">nothings/stb</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/stb/stb-20200205.ebuild b/dev-libs/stb/stb-20200205.ebuild
deleted file mode 100644
index c89c8af062f3..000000000000
--- a/dev-libs/stb/stb-20200205.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# There are no official releases
-CHECKSUM="f54acd4e13430c5122cab4ca657705c84aa61b08"
-
-DESCRIPTION="single-file public domain (or MIT licensed) libraries for C/C++"
-HOMEPAGE="https://github.com/nothings/stb"
-SRC_URI="https://github.com/nothings/stb/archive/${CHECKSUM}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MIT Unlicense )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE=""
-
-S="${WORKDIR}/${PN}-${CHECKSUM}"
-
-BDEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	default
-
-	# Move the header files in a folder so they don't pollute the include dir
-	mkdir stb || die
-	mv *.h stb/ || die
-}
-
-src_install() {
-	doheader -r stb
-}
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index 6d07ee128385..0a2e19fd143d 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,6 +1,6 @@
 AUX tomsfastmath-0.13.1-export-fp_isprime_ex.patch 297 BLAKE2B 4147cc95152298cfbbd88416d11e298b95f574d7bf083900a2b0e72069764f4efcade6b074fb632abfb8f92a4e15b2e71de9a9578b2e65d0c63e4e258923a4b2 SHA512 33bb97d9a33d8bdb81a6a2df5b1727430a421bcf73df292b965663be532e30a4d815c332ee63b9790e04425ed80e58a30d9915a746cc265d98ad71a10da8bc34
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
-EBUILD tomsfastmath-0.13.1-r1.ebuild 1726 BLAKE2B 0af2687c01fc85cac50012c1573a6b3762b2426e735c0244ef58ac765c4dda126d616e0eebac683e739246353200c6ddd230f64ddc487b2aa4e28fcf3ec7d899 SHA512 a27969cee538df91491aa1547fd6b2ab3cffe621889a795e412d2566f6b54154405d6e68444f38f828d7cfdab8ef624c52033d73ebe32f2b6a9a03cc06116552
+EBUILD tomsfastmath-0.13.1-r1.ebuild 1725 BLAKE2B 4cc2ebfe928190fcd7191e233cdc2bd7e04b7f331bb39ec08cb6f84aa7733755727eb176337265d60a1b290da1ad3719b2f4ee2e221de83a6f6987564adb0275 SHA512 e8e2f38a7ad930a5566f9d89e9da998676dfba5f466f44b6cf9463cf43ee315c0dceb04629317c6eb93fc9346a10bae11aff70cc3ccbcf9b01372eeb515c1e28
 EBUILD tomsfastmath-0.13.1.ebuild 1671 BLAKE2B d385ecfa9f3e970fffe7a01e3725a8fb6079c854cdf9ae1a8801510321ab720fb6a3a44bbb8ad554d85bbe469389c12cdbe40ca7531ed8c88a130faa4e92a4cc SHA512 6020bf9929d9054ebae1db1a0223b31760e5c0d2638dd59ca077e5b1275b4ed1bb53f6adcb9fb32bbcae8a60b676613e84dbc978aa78564ed93f507812465f94
 MISC metadata.xml 358 BLAKE2B 8dc827f40c0b51ca769622a56b5282b3265428fccc2330cb1732faa1ab03a6962057eccda6c0c0b58bfed3fa190e64c77fad4e6480cf65fe7ee251eb087422e8 SHA512 1473c76d0d4a743815de12895599cb3f9f97201f0eca1231af0f16600b5b795dcd8c4cba4847e3166004dc0b3319011bba2945dda510bd789d7b0ee066d96f88
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
index 35113efd3c4e..9eabf46f3fef 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="Unlicense"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 BDEPEND="sys-devel/libtool"
 
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index c544522756ef..f3572566f4b4 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,7 +1,9 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 DIST tree-sitter-0.17.3.tar.gz 519006 BLAKE2B 81eb9bdfc9f27e7b172b6c17333eece5515cf292d5b08eb5362f108db483e329ff6d309ccc40ef2de23d1a32c437cdbc1b9cf800146902a3d913feecf8b63269 SHA512 48a827d7bea184a84ad9f594bc5dc1869bad9aa2823f83d1ac7d58e6feaa092e7088e7eb0dcc6d3aa3810d25ff9f25ecb531751c77314ff7d07fa05f95b7a013
 DIST tree-sitter-0.18.0.tar.gz 521866 BLAKE2B 16fdfa721b6895f4945f02875f6ffc8ba6931bb822ad0c7666e302d9a67fa0260ca09e8add6eae5cd5b37a3251dbfca7feb9581a78bb8385cf9466fc07745f49 SHA512 ba090b5136330e24ff3c23f3f9f98af197bddf5ed56fb4930fbbfac317ba5ebd02488afe6c1f35afa45e324baa785569f4fbdb1b8ca020f4bea5e22d9fc76aa8
+DIST tree-sitter-0.18.1.tar.gz 524193 BLAKE2B 500ad9dbb40bf7fbc3fb1da9012c7a3236aa05397571040a08494ea48810d491fe15593106b1f4dbcee45ecee3765b088e1e41afd2def3487acf2273cfce5bb2 SHA512 b78af07f29bfd53e394103260bfc8645ddd5d3247429cbb9b00b8a79a8006f2b0c98ab66fa6f59ab1312cc875aeb9f3e17f3c05ca65aead8e5f6e3ba7eb1cca3
 EBUILD tree-sitter-0.17.3.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
 EBUILD tree-sitter-0.18.0.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
+EBUILD tree-sitter-0.18.1.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
 EBUILD tree-sitter-9999.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
 MISC metadata.xml 692 BLAKE2B e8a04ac2d2dbe16214d82067944baef692a4e8896fcbad7feca9e54565e603b0e5308bb4f1e4bc5aaf39f41b1ca0e10fa5710159ed1012c6ed47f2007fa19a69 SHA512 a319341832c189a845f1a757b17bbefc10a7c4b00c49e80b49745061112b91ebb80f2f96a99de27ed6aa5799f25bd56ddec3eb41bfb2507b037ee8e965525053
diff --git a/dev-libs/tree-sitter/tree-sitter-0.18.1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.18.1.ebuild
new file mode 100644
index 000000000000..62e7c8355b29
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.18.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
+)
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+}
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index 4ec46f4e4265..b0966d4f33fe 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -8,6 +8,7 @@ AUX tvision-2.1.0_pre2-ldconfig.patch 522 BLAKE2B 459dd4941159ca23027339e812a0c2
 AUX tvision-2.1.0_pre2-outb.patch 954 BLAKE2B c0cf973c3d83008106b96ad2b1658a2b50891c88a9ce81091a65db9b98818fc6fbef105604b78101e2fd84e217eca17a18b21797876a119ab293ef986467f03f SHA512 bb9cf5ac414f02d008aac345299d1a0701103bc044e637cdf4be5181fabcc7c4851ee6d569f91d86a8c9ff1134e32db36f3efaf5242e528b091c029a489d1fd7
 AUX tvision-2.1.0_pre2-perl-INC.patch 680 BLAKE2B e525daf089b00cd22338dd483394591c12be634b3d825a22706b31aff25a46c119bf662c808f74267f2b9f465551b230b7753d816e23934e57ee087f5dbafe9c SHA512 007d2a8738a918e455685b50ed148b5a0b43c64c53c1674826771f4b3510706161e81477f82f1cf123d52fee123c649446644be9a78dbf6966650e3bf51db1f3
 AUX tvision-2.1.0_pre2-underflow.patch 279 BLAKE2B e0eee5f31987b57f39db001ede136a919e306a128adf256791bf1a8c1465958072518baa19d35aed92bedd9b6ec9b31c3a708bfae216857941bc1165e721a375 SHA512 aec060b923adc3c98f21ca659eb26f3c3cbd5164c1287a1e61e4a5d34ba6dc609cc352a465f937b851d63379a8682f44a199e64822f1d590042d75a120a42bda
+AUX tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch 1267 BLAKE2B 3e0e09562052ff2830fefc9ded095f7693de0e92290aebb8317327261968cbc055dd908e60b46aecc6705e64974aa4921ad4e00bfa744e8f11fd838044053fb5 SHA512 83f50ecb6ee9f1eeb2599c46764257c8931fc6f6d8daac3b9f0ab28de25931718c90fdae4d52ef042dd42cacd3f5946c55697760ed35939e4ca5d6f0d0a9d516
 AUX tvision-2.2.1.4-build-system.patch 1119 BLAKE2B 98d594371ba91cb70acb8865b1817c4cfa4563bd7965d4079357ccdab2c679f584677f209275e9a4851b31cca0de7ca2ca1688d523970704a3cc126620b4df59 SHA512 60b239c4f2c6a5c3ca00e5f6c29293f92ebb5f00e6dcfc709bee986a1960a01cb77c542921c2e02c576ef9ffc2a7a600534997d8c2a6e5d691ae2825b38b161d
 AUX tvision-2.2.1.4-fix-dot-INC.patch 675 BLAKE2B 8fd53d6e384b5cd71a2850fa0d80fdcd4544f1462d21cbfeb0cd5056ed23f5892d5f97d4f5fca7d8a86757ae171aae19fb689df98927f8ae0acac2d351e92e5f SHA512 49ab191bb74388d1cb6fd31c825b924dccfee5e9a85a55e86c2df50c5a186f78e6112b3fc0dde361f481ea7daea5b9b656aaa93ebbaccb80bcf146d460efda7d
 AUX tvision-2.2.1.4-fix-overloaded-abs.patch 2771 BLAKE2B 84be3f2028a24fdd60a214fc27e99b2d09c7aa67380bd94d171d799424f745bc269d8df7e848326b0dcec0a37c05b56cc066e574c3f686d26b7db29615164516 SHA512 fb0bc0091e7101947497b3ddaf2e539b86fcdd4613bdb7f607d956b503a13bf285ce1eb1d32d809ad0f1a8d6b6fee7e74bd7e47ba69af46515386655247bb14e
@@ -17,5 +18,5 @@ AUX tvision-2.2.1.4-ldconfig.patch 596 BLAKE2B 672d0c67c4cc95d0857a79d824c34aa5b
 DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5f24fce22f19defe3530d8a6cfcd728bf9cd3bcbb4e5d1d76c1fa3bc13c3b84f1147bd3c5aa07810077f5f159684eb0 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
 DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
 EBUILD tvision-2.1.0_pre2-r4.ebuild 1275 BLAKE2B c1c538a7a489f6854e67ad163bd6258a217e6401fabcbe0757162835e5775dd262c5f8bb0a2e6e32f72cac5983e962ac5c09f1152b0d5934f6ac24f371e32df2 SHA512 e63b0507b474f10a61c3c369cbaa18c1f51a7d6fadffc74a1a19309b2cd151047e9e40884e826a32d154d0a83259c2b3f76bef9c4f87250283b6829634cd7cc5
-EBUILD tvision-2.2.1.4.ebuild 1529 BLAKE2B 1b53eb32da985f60ae0a1175344845355f9ced9b9bd389e03d52a94728bc35cb6faca17c2926fd7e4291e1813e21f563f082d8428a744708aa7acb34a2aa2164 SHA512 6515f50efad2f73fe08445cdea72fa6995b1dcd061731ec76b15dadd26ae797c446ab45a570aad8f1c02223be30bbc9f2eb0b76fee5282c841f537093c0c0fb4
-MISC metadata.xml 583 BLAKE2B 1b2b6710030aab0d59417239cff1f9b87e1216c79f817effd9faf3b61529bd89ffbcbb08edb53207034995543f38f54f46f8f33446f3eca890ea35a29ec811a5 SHA512 7939f39af0d30fba7ff1ef5be4efd29abe0e78b0fc3dace42ff9011373f9fb913eddc3338e86883671d5f84a49e5788accf29dee8ba583236b5f3dc380b97ce7
+EBUILD tvision-2.2.1.4.ebuild 1594 BLAKE2B a1bccac96513ec89519025292db0189fb4dba4c8cb132bcc1367b8ff14664bce0113b5fd550dfc66b8357acdc25cd76523732414ffe13c5917e8390f97ffda4d SHA512 4c5acb5a63b1676dc9e5f92736608d579f7055cf4e0b301d3042f76ff56fe042e802f38a3b18608df4c9c3c273065de292713faf46bcf65e01f295b03add0ad6
+MISC metadata.xml 554 BLAKE2B 4c11c1b140681f4b0b228f5a586526a496946a198587cc98148d4e86af29afc7a4e7981074520af47850dace4d8b4bb3d0473f2e3788cd05cbd9fb7293a4297a SHA512 5b3962e4385fb76bca1a5d188ab072d625c24a4e471d9c50c402200a00f42ce1ad3a993a314bf3b99203d6ce987a43fee59d42e74f7f923cbdea2ee6287bdbff
diff --git a/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch b/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch
new file mode 100644
index 000000000000..6721aa9c029c
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-Gentoo-specific-fix-linker-paths.patch
@@ -0,0 +1,33 @@
+From 62fce1e63e92ae71e2ce061c40ba736f4b22f71d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 8 Feb 2021 23:43:47 +0100
+Subject: [PATCH] [Gentoo-specific] fix linker paths
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ config.pl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.pl b/config.pl
+index 4664baa..9e2cb96 100644
+--- a/config.pl
++++ b/config.pl
+@@ -179,13 +179,13 @@ if ($OS eq 'UNIX')
+    # QNX 6.2 beta 3 workaround
+    $MakeDefsRHIDE[3].='/lib ' if ($OSf eq 'QNXRtP');
+    # Link with installed libraries
+-   $MakeDefsRHIDE[3].=$realPrefix.'/lib';
++   #$MakeDefsRHIDE[3].=$realPrefix.'/lib';
+    $MakeDefsRHIDE[3].='/'.$conf{'libs-subdir'} if $conf{'libs-subdir'};
+    $MakeDefsRHIDE[3].=' ';
+    $MakeDefsRHIDE[3].='../../makes ' unless $conf{'libs-here'} eq 'no';
+    $MakeDefsRHIDE[3].=$here.'/makes ' unless $conf{'libs-here'} eq 'no';
+    $MakeDefsRHIDE[3].='../../intl/dummy ' if $UseDummyIntl;
+-   $MakeDefsRHIDE[3].=$conf{'X11LibPath'}.' ' if ($conf{'HAVE_X11'} eq 'yes');
++   #$MakeDefsRHIDE[3].=$conf{'X11LibPath'}.' ' if ($conf{'HAVE_X11'} eq 'yes');
+    $MakeDefsRHIDE[3].=$AllegroPath.' ' if $conf{'HAVE_ALLEGRO'} eq 'yes';
+   }
+ elsif ($OS eq 'DOS')
+-- 
+2.30.0
+
diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml
index b8828b1e0aaa..2b609c0582b1 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>waebbl@gmail.com</email>
+		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
 	<maintainer type="project">
@@ -10,11 +10,11 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag restrict="&gt;dev-libs/tvision-2.2.1-r4" name="gpm">
+		<flag name="gpm">
 			Support text mode mouse through <pkg>sys-libs/gpm</pkg>
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">tvision</remote-id>
+		<remote-id type="github">set-soft/tvision</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild
index 4cbbeea9403b..40d5d8d3482b 100644
--- a/dev-libs/tvision/tvision-2.2.1.4.ebuild
+++ b/dev-libs/tvision/tvision-2.2.1.4.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MY_PV=$(ver_rs 3 -)
+inherit toolchain-funcs
 
+MY_PV=$(ver_rs 3 -)
 DESCRIPTION="Text User Interface that implements the well known CUA widgets"
 HOMEPAGE="http://tvision.sourceforge.net/"
 SRC_URI="mirror://sourceforge/tvision/rhtvision_${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,8 +19,6 @@ IUSE="+X debug gpm"
 DOCS=( readme.txt THANKS TODO )
 HTML_DOCS=( www-site/. )
 
-S=${WORKDIR}/${PN}
-
 # installed lib links to those
 RDEPEND="
 	dev-libs/libbsd
@@ -45,9 +45,12 @@ PATCHES=(
 	"${FILESDIR}/${P}-gcc6.patch"
 	"${FILESDIR}/${P}-flags.patch"
 	"${FILESDIR}/${P}-fix-overloaded-abs.patch"
+	"${FILESDIR}/${P}-Gentoo-specific-fix-linker-paths.patch"
 )
 
 src_configure() {
+	tc-export CC CXX
+
 	# Note: Do not use econf here, this isn't an autoconf configure script,
 	# but a perl based script which simply calls config.pl
 	./configure --fhs \
@@ -62,7 +65,6 @@ src_install() {
 		libdir="\$(prefix)/$(get_libdir)"
 
 	einstalldocs
-	dosym rhtvision /usr/include/tvision
 
 	# remove CVS directory which gets copied over
 	rm -r "${ED}/usr/share/doc/${P}/html/CVS" || die
diff --git a/dev-libs/udis86/Manifest b/dev-libs/udis86/Manifest
index 0b8982231cce..b08b245244ff 100644
--- a/dev-libs/udis86/Manifest
+++ b/dev-libs/udis86/Manifest
@@ -4,5 +4,5 @@ AUX udis86-1.7.2-python3.patch 1543 BLAKE2B c2bcd32c934e2a3ae5232ab6cf2516ae0598
 DIST udis86-1.7.2.tar.gz 445085 BLAKE2B 0e67a1ae28688a5febdb4502714a6d99b1fda9028470bac1ecf9314d33c2f081726e3706e9616f352fbf1561283429cb96b92ea4a88e454ec21eadc84bb336d8 SHA512 8cb35d70ac020cd74ced22252aa735a266e5db98d89df565a560baa4ace0cd730e9db838241b70c3b93c27d6b2c75a88edf9c357c864d0f0104323925371c96f
 DIST udis86-1.7.tar.gz 696651 BLAKE2B 5d0a97e06b6bc7b263b6f080e12f832d4bfc9a4791a495e49cd2f4ee6d37d13e593891e02fe9ee3c3fb5e7ec23bf25ae7aa1dccd1f95b5c003f6a6e45bbb7f8d SHA512 df0f802d4c0cf6b39b5b996cfd721cb7d0bdd1b0e2f2f7bcb7165514541b94d795c653e885d9f928d9a27f19464ed6fa948f4315fc1f3887079201fcbb2a241e
 EBUILD udis86-1.7-r2.ebuild 727 BLAKE2B 9435654d37e1dba515e815fcdfb6f07bea96b9743dbd22e9a11400924f89a1fbbba30203216184fed53abe71501326e11708a01bd19dc4517e1b30a545f36788 SHA512 1901dd09fae0f12e1c4a41b905460704794708803f1c68e04203f0612a63d1a8057991fdbbcf24bb0e1757f3c2814f4793ea698bf45265dad3806e05fda96e15
-EBUILD udis86-1.7.2-r1.ebuild 942 BLAKE2B 6d3c13c937c74001bfb2411d7dafb10525ac5b34b8f109f550d4c097b6a7319b451346eafa673322806f5af6633f4992c2dffbd5f73b451c2e67e9c5571c8200 SHA512 04d73b7d3a9f5d79089065fd42e3fe590acd52f05ea18a9aea69802e9c092cf25eec82fd636f51006a18dc221ead1a7bf56bd984a3d99ecebd8b0aef047ccf9b
+EBUILD udis86-1.7.2-r1.ebuild 941 BLAKE2B 56852542a9ecfc48292f2edc6d836ee4d1370c4449122568fadf163987f4bdf6af2bca16caf4012cc8b5435d142a49969d3198b765d8f02fd95cc2d3476968ee SHA512 34e3fff101b531ec42ca16407336a0d107c1a5fc1c9cc3c3ddc9a0def2c23b7b3f1a10eb494e8db6ff4ebf54b12d71d75c6fbaf8c0aa90c7a0e538cb10366576
 MISC metadata.xml 342 BLAKE2B 5f721c4727a6ee72b711b6df53a260dd420e4389f02091326483aa69995817965b8375097d3abd519b6c25e5cbceecff3de7efdc23178a2d98ee5d64522522e7 SHA512 042c3b3a181b435308c2c6cb6fb411cf5c00fb0403736a7fdd4048553c5d3ce7b2130421dd785511ec97b2c0e55f0e6e3cc603273ae5f87d19a61f9da0914a66
diff --git a/dev-libs/udis86/udis86-1.7.2-r1.ebuild b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
index cfea4d942ce6..f7f19738e446 100644
--- a/dev-libs/udis86/udis86-1.7.2-r1.ebuild
+++ b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index 2fa2ab5e4499..76f2e4938f92 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -3,6 +3,6 @@ AUX unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch 999 BLAKE2B 0
 AUX unittest++-2.0.0-fix-tests-with-clang.patch 1018 BLAKE2B 5913b010ceae5975b8cdcfe7656c137cfe47845ae92815d3b7fa66f429a712e686cb7accb400c43149458b6716020c7ff48f0a673a7c2b7bcc36f5cf0fcd40ae SHA512 dd77794e8c22e168235f14c3c00381bf7439bfe60a700ae038290c93e2f6faa276d4f45de17a159d7a1edbb182a40b078b7751a25e1dcf646e7d311fd33e31cf
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
 EBUILD unittest++-2.0.0-r1.ebuild 1082 BLAKE2B 1ba9a0302f39ea36d30d3566e2d185ece2f7a5cebcbf872338b25ebdd447ef4d4abe3f3fc9dfe37ec72cc50cdd14637363d301c338fb94dd44fcfcbd340ca2e6 SHA512 fa6347d4a4da9e656523f49c31f0e553a2c45203edad7a1a70bbfd0a9c9c5b7e08ad003b299d6174dae93925ad38863f1fd86d00b4b0706de060b6d0027dd7b7
-EBUILD unittest++-2.0.0-r2.ebuild 1223 BLAKE2B f86b22a1a9d2f77d5197788f5bfd812615be57a388742b19b5384634f9ef337503cf92c29bc8e5360c64e510a13759b4ffdff80059038606b3722b3858f1c246 SHA512 cb7fd35441f195f66c8b356bbef818f4363a4d3a75b3710644db34fcca800bf819a1b7a920ebfbc74c82f89662a60c9dba9876e03c0253108539673427550a05
+EBUILD unittest++-2.0.0-r2.ebuild 1254 BLAKE2B fd0b8216628692ca8576acf343dba85609e564578a254660ed0b8c8a85fed45eaea285007348471f01f8f8ec6e5e91b820c9a4eb60594abc860395136106a109 SHA512 04d44996d1562d80b15ce75e8d5a9c6478d11eb77b34176afa2d28660d8784f9c221c5c88c0babc0ed01395aff438301dade4f7eadb44ee09903248060e70dd5
 EBUILD unittest++-2.0.0.ebuild 1007 BLAKE2B fe8d05aa14bbf52caba06854a459eeba25ca8db8c081adb0abf468ec8585370543286fd58424078c9b92a9a8b2b8a604c76bf2f11b5fdf389af6d50e2dd4aa29 SHA512 8abb78978aa9283e9901e909d46fd31d6f74d97cee1d8dbd0926f4c7ade5c2c2948acdc9fa334f26b7801fe681ec54f7751fea0e86647f1ce90e20afe48fbe35
 MISC metadata.xml 408 BLAKE2B 79c6d8551125de4ae8c262513a3c8a7fa46d1518418312aed741eebc9f60ca5be8032ad4df6ca08b67d5fe65a46b11eb99533817556248df44dd04da741bee88 SHA512 6fec64fc5f6ecc1971d0cf79caac9d3529b4e9a7cc32b0b1a39254761de8c487df692b9730221866276f44a79ab7bae0e4fc8cccdacbf7bfec8e4c372fdada25
diff --git a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
index 4d25b1e2a626..cbc9ade981cd 100644
--- a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 659de1eeb49b..2c39683569aa 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -4,5 +4,5 @@ DIST uriparser-0.9.3.tar.bz2 173073 BLAKE2B daf4d4ef2801850b8b4b3622ec195c7bfdc1
 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
 EBUILD uriparser-0.9.1.ebuild 929 BLAKE2B ad4f6452fabff09e9d7307ac3ab412bd10c67a69c8e96acfe79b47e57ca08ca2afde276992de3a46d4b13845f4ad087a242389e3f36903c8f79f03cf3252c34d SHA512 93bf1fc1b036ff7ed3ccfbeae76ecb764333926c5fe74cd813e5bb12ca6ae72c443aefcbc92f31f831b2a22427f0c021404ee0bae5e780b7fd21912b85df8ac5
 EBUILD uriparser-0.9.3.ebuild 1199 BLAKE2B 253164cb9593781e1c797e6808a33ee19201ba8abf41b54f95bb41b293c6959b87b69cb6fa0233e0b1348597231b4517ad3d38b605dc723c03e2fa0a6ffcc729 SHA512 ad96686a67e71aa0e31fc87f38a2574a86b3e3c28f6f344efe645896128ca8abb03366c232441e6e7062540e9187789367341750593215a5f7cd8a4e44a32bd6
-EBUILD uriparser-0.9.4.ebuild 1158 BLAKE2B bc8edcee521f6d67895b142c596512f8b8d14ec1685ca4d90444e8d878ff846ee908dd328769faf297155ce543845effaa92e8ee7859a73738f5319f9a8e2520 SHA512 475389ab7f21c66bad860e636c06a2236d55eeeba24f1fac451c30d97965ae3506705e2771e59f6397939a6161cd4a7316028612fbee00a27443e9c7d22ee58d
+EBUILD uriparser-0.9.4.ebuild 1165 BLAKE2B 8d5f75f1e2f6b49d0c840351837bb21f5966e93bb2216b70f5f6c0c9af2f45c958ffe2e0d4c3ac0a3aabceb119b812fe2dca514b5828c63bea48c37007503f3c SHA512 f3ad2a08062cf7b59550139502d1eabac41e2dbae551f54e5bb5222b825e14f78dd081917aed991c9f4a4f9721d53468cb0923cac0e731ca2fcdc9198c137844
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.4.ebuild b/dev-libs/uriparser/uriparser-0.9.4.ebuild
index eacccdce4b44..d814ac60e353 100644
--- a/dev-libs/uriparser/uriparser-0.9.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc qt5 test unicode"
 
 RDEPEND=""
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index b50afe11cde6..2cfd77479a10 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,6 +1,4 @@
 AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f727546d7c1c62f72c6d85a38c477c7a439d1924188f046ac263f21153f5499a1aa29aa0b9061b0e683f101951f1b53 SHA512 046e619a75a8ef28c7c18d078ffba1653971536a287ded36b22c6700358351fd95b2709318ed05d68e81edc13a8f7abdb03d0c5616a01817752fec45605215c1
-DIST uthash-2.1.0.tar.gz 191782 BLAKE2B 322661aca33e8df27ec3166cd16549b11f49a6f9eb12f11c78f44b75baf5d9f208825028fb3b89a380277de5784bf2d4c41a6cd2ff070b1d3cd667ec074a85d2 SHA512 c8005113a48ec7636715ecec0286a5d9086971a7267947aba9e0ad031b6113a4f38a1fb512d33d6fefb5891635fdd31169ce4d6ab04b938bda612ebbccb3eda0
 DIST uthash-2.2.0.tar.gz 191356 BLAKE2B ca07634c30f49fa21af5fed9ed254351d038ca9f831b2c3f3fb545ee451833aaec9e1666572635e2fd31d6b791fb88800e7d870aba2cda0cfbeddcba20d969a9 SHA512 441ee907adc39c9b7e9c1f478966b7e8ddebb94cb6d5db9d2db409aee9a5e237033ee8cef3fed1c719fea01c7cfb5991554ac89f5a1e59241bd5c6eb4854cebe
-EBUILD uthash-2.1.0.ebuild 649 BLAKE2B 3afd91e81a06ac12ff967a8196d81282596a9b5d3db5d8dcff8cbc1e20efb48839df081406f96f29b997c0184907800d3abaa6df79be0700f98e54554262c9af SHA512 47043056937f33b1fb8f74f56c6ae22dd23b684069faac09058a4a48511f3069287c4472ee9afee643d9a6bb6184bf3d08057094cc32576f09e18db20dc14a90
-EBUILD uthash-2.2.0.ebuild 659 BLAKE2B 6308c39ed1da00a25080e9adb253dbbacca377f73e39af930af706c1ac8e3c27da4aec20510036d73cdeb95b57013a5eae6a00d92286156c70dea600e1791b31 SHA512 0c0b4971b806264382dd6778865fceff2f72ec4e74b0ffc43ac9e7d91f38a4201f7744aefb59d18fe6e5215165471d24f94d72388b16ca48044e19e1e11195a9
+EBUILD uthash-2.2.0.ebuild 658 BLAKE2B 4f84c4e782c243d797d3cc26c8a1d9677ae39d23ae6028067a4eb89b5dafb0e219cdd2edd6ebd88cb35bdcdbaf2470bbcb1f6fb70e7d16b6cb4b27f949b6c989 SHA512 353e9cf6ed85b7d2444c55aae546b7e306ac65bac34392f8d199afe23e803ba0acc032e21c43e90d0aa0d5feff1b53562fa7e7beee59f7ca7f99f250b1e5d2aa
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/uthash-2.1.0.ebuild b/dev-libs/uthash/uthash-2.1.0.ebuild
deleted file mode 100644
index c991385c4c34..000000000000
--- a/dev-libs/uthash/uthash-2.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy-to-use hash implementation for C programmers"
-HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
-SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-lang/perl )"
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_test() {
-	cd tests || die
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	doheader src/*.h
-	dodoc doc/*.txt
-}
diff --git a/dev-libs/uthash/uthash-2.2.0.ebuild b/dev-libs/uthash/uthash-2.2.0.ebuild
index b51e454cc11a..7e3b5953a15a 100644
--- a/dev-libs/uthash/uthash-2.2.0.ebuild
+++ b/dev-libs/uthash/uthash-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index e7173c251014..928580e422a7 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -3,6 +3,6 @@ AUX xmlrpc-c-1.39.11-cplusplus.patch 374 BLAKE2B cacbc4fc8737d5e3f675a9579281fb4
 DIST xmlrpc-c-1.39.11.tgz 815463 BLAKE2B 7d169d51835e64e5ac822c48b1a6d7622293c1ce1e7379985ebf6c10f3ab331c55eeff9f655cf914c4cf7e3c107fbdbd741d664489f4ad7aadb5e576ceb383c2 SHA512 13e7ddf5264436671437c0bcd698380baca35c4469f592edf79cb4cafda254fe8207ecb992ee728ed20ec70457a20bd0cf8e180ce5cf0561a38a21f1e588f584
 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
 EBUILD xmlrpc-c-1.39.11-r1.ebuild 1906 BLAKE2B ef9e533ca06556fe561364b1ad2e824e0ffc44b7a8a63928640410ac1f7d608764b94387bcc892ea37ad2ed61482cf8cdb528a46fd2ba6b289b888c191536f40 SHA512 9543ea33b4e23c035491d94ba1046ce8fb355d1bced2acd99827d969c09cc719def5d11842d0ed6733ae95c45bd23c86a7bf8126ac3f0e0941f51d7666dfad42
-EBUILD xmlrpc-c-1.51.06-r2.ebuild 2070 BLAKE2B ae2c26de4d30d36c9f9c4446b745c69cd11f802207a1ba2d884368de3c94690d1f84a30b4772ee91caf951683b5ec0cb1a915d5bf0140a61109e607cf68cab8d SHA512 288f29257a7d725a1a0225ed4a8b36fe15607ad9c535d463475b0ffd0386773def1fddb0bcd72b67d624c365c64f7fd2f4992718befcff364ed228484dd55021
+EBUILD xmlrpc-c-1.51.06-r2.ebuild 2068 BLAKE2B c7de028c5dfceead7bf888f480c160167bac9ad092f2b2e181ad0734ca362309ef81f9ca9e64e73a55ae3b7f5cac763259c28f5f260385a1cbf312b8402d780a SHA512 0709cc0616abc1c1da8bcb145bcef5725fd3d38e135b3c0e5e90f74a3e1b03b4feeb61a87c85b53e025faba8ed8a9ff66b687dcb214794caf775a990cdc07741
 EBUILD xmlrpc-c-1.51.06.ebuild 1811 BLAKE2B 051cdaabaf2ea0476a92e277e4421c03299c6211305685fbef1ce23ec7ecd1c8f4f2015bd19582f956d6e017a383b14538c15cc3bd9f89e2b4f8f7f3bfa05194 SHA512 61e7476b123b33aeba36d6b85cc97b2a334211224786e031a1f9e5624064ec5cd0146b16d27f64781f29f85f0aae8bf74284c0c83ae16997be7dc698ad95dc21
 MISC metadata.xml 669 BLAKE2B 04f88706453ca3f6c7960b6a8d9fa0201cc620386d00f5e709070095e58f689ad7492d3b2a0effc9de985f642f55a347f3678f734170d36e141f1eca231612de SHA512 6009e48c681fd9a98054a37eb9ee78d87eff527d617094b55d6f3af6fe59f81328a03ccec47ab7fc1b4e54bdec50629b76b522e8943e2be43c1adf57e74caecb
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index 13b34e66e318..eb7e22e545ec 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/4.51"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
 
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index fa80560a3b49..0c4c16709de0 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,5 +1,6 @@
+AUX xmlsec-1.2.31-fix-nss-3.59.patch 980 BLAKE2B fb0d28e3a33a2d581796f03f2121f08c26cb964a727876a1bc7a1b9e63f92056a0213d315a0accc94bb582d9224fcbe10ef0c95528f70f29d6d69a34fa5e342d SHA512 a1857ad89b0d4d20d92deda23112abac814b312525a662af85edc44150c78e58fe54142d0cc92857e01a14719e698a810585df350ea4844544328eb7848b4680
 DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98
 DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af
 EBUILD xmlsec-1.2.30.ebuild 1400 BLAKE2B 33a78b6d284196e366c67719cc2d0e292696e761c297fc0bc2e3cdfb13cbd3fd732ad3ebb5b1ffc7c3ef4d1992ad368dee5f392900849e1970e7db67730f1f29 SHA512 8dd204f7d770a323c0f1943c555cabf67fa9ae3a83d89fe325f23be24b21cad29f62565cba9c8eae733453b76c1547f022ccd2a263edb85a2aba0ea6efb0b6cd
-EBUILD xmlsec-1.2.31.ebuild 1405 BLAKE2B 0f41b67a723a978e8510ef16f2a3455d7aaac2eedce8ceb16a5d2bc91d14642b5f05f6112eb205d88a9faa040697e51a50e711c97bca6e9b4ff92985476190ec SHA512 7f09fa4ef386bfa3f1a7ea1f27dec14a6a21eb02e22fe159739ac2554c825d03f58a96162c8f2eed7ac31507a5a7180aa896869d0c644e8a210a402101ca12b2
+EBUILD xmlsec-1.2.31.ebuild 1454 BLAKE2B ddda57c716158a60039edcedd03c3dfa2f7d2f454f30a6b8f99800bebe8af259c8de06dc64adf67d4355868f98b92033e43dce1fceefb5be7b35634d23c7453c SHA512 3ab54a0b41148d4ecc79b94d5bd503080ea63809771505f68db24b80223615fa3f1c3e35a455c3d3b723948ba692b127ecb5fac541bec598f3ebca2576d0146c
 MISC metadata.xml 492 BLAKE2B f1d4308323da79d17e6f5e0025fff338024b6d74c90584c469917418ebb06aa9be43a1b1d5f8a8e4a25aa0584b8b96aadc5508a2aca1b9f6d3924c81bb33f41b SHA512 920fe71d66278f82b0fcb18044998d5b72cc69a07966e8d1d2527a0d1a7e78c89536e165f105dc4ed9de84377a80f3ef55804bd26f71d868808077ffcd6b39c3
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch b/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
new file mode 100644
index 000000000000..b70b8cf2d61b
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/764437
+https://github.com/lsh123/xmlsec/commit/f3a59c721e38a663405093e2bbb30e2bf45853a2.patch
+From f3a59c721e38a663405093e2bbb30e2bf45853a2 Mon Sep 17 00:00:00 2001
+From: lsh123 <aleksey@aleksey.com>
+Date: Fri, 18 Dec 2020 16:22:40 -0800
+Subject: [PATCH] Remove MD5 for NSS 3.59 and above; enable nss test on osx and
+ mingw (issue #305) (#306)
+
+---
+ include/xmlsec/nss/crypto.h      | 6 ++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
+index 223c1d85..614ac931 100644
+--- a/include/xmlsec/nss/crypto.h
++++ b/include/xmlsec/nss/crypto.h
+@@ -19,6 +19,12 @@
+ #include <xmlsec/transforms.h>
+ #include <xmlsec/dl.h>
+ 
++
++/* MD5 was removed from NSS */
++#if (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58))
++#define XMLSEC_NO_MD5 1
++#endif /* (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58)) */
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
diff --git a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
index 2da2a8e15d6d..08c8ae220183 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.31.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 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
@@ -36,6 +36,10 @@ BDEPEND="virtual/pkgconfig
 		)
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-nss-3.59.patch"
+)
+
 src_configure() {
 	# Bash because of bug #721128
 	CONFIG_SHELL=${BASH} econf \
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index bbeb11d341e3..0599d1931a0d 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -12,5 +12,5 @@ DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
 EBUILD zziplib-0.13.71-r2.ebuild 1687 BLAKE2B d25b7136cdd1649653e22168da5e7d5a634eb838e233995cbae2051f3517ea935d2188cc79c772883d8b5e91fc1aa1215e3a20f4a5e6ef09b0a6d55130cae40a SHA512 73827f6e7ede1e797731c2e3ce54927aac0856c40fb55e85a4acda4d8cb0a7088556bb422205d688efa5e19b817e5b04f5287e9944416303ed5d2d00cf864285
 EBUILD zziplib-0.13.71_p20201021.ebuild 1873 BLAKE2B 2a5ec064cf753856e95f693c3c9f9044226eae7f931f98f0fea5bd145228422c340e7ab7712e05dc98f06d9091bd5f4c7ff31fc0983a856c391887c16d7b97ec SHA512 064f7881a753eb842e0ae6b449e818652dfc2f6abc07a63230c0ea8f49c6419ca880207317d6574c4dc1790e034138448a279947c6a857cc75675eda2abcd147
-EBUILD zziplib-0.13.72.ebuild 1267 BLAKE2B 30cd6f184c166896e9c791c5a677e6c9756b1cd73f3eb80ea9e643c315cf275f2549cf46b7969e99b4d97d74e60bada11cb9d0774d091c87f24380b8948e996f SHA512 43b0dcc179ebc8614cf5e87f9409868884567d8d028ea607a867e20ada6dcb4a4042befbbf333ad0deed5fec891fa6cf066ced1e094fb8e730cb264de036f1c3
+EBUILD zziplib-0.13.72.ebuild 1261 BLAKE2B a8df8b8469149e572be45c0e71f0b2ed801857839ecfeec2a256ce0def01a64c99a06921c95946fc6ed01d9e31a6134062c4fdc44b2de679fb5ffe776dc47019 SHA512 3272e295a11593f81387abc62100af10f49bcee731ca84ccecbf85829eca4764cf82f77386a3869275bd4c1bc74e4cd32d14e1a10e655621df8de68f8324452e
 MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
diff --git a/dev-libs/zziplib/zziplib-0.13.72.ebuild b/dev-libs/zziplib/zziplib-0.13.72.ebuild
index 51c4c3d95071..3ebb06f83d6c 100644
--- a/dev-libs/zziplib/zziplib-0.13.72.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.72.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="sdl static-libs"
 
 # Tests require internet access
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
commit	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree	c44943ee0563a3fa957716de909fed683117fcb9 /dev-libs
parent	69051588e2f955485fe5d45d45e616bc60a2de57 (diff)