gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-libs
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
182 files changed, 1519 insertions, 2324 deletions
diff --git a/dev-libs/9libs/9libs-1.0-r4.ebuild b/dev-libs/9libs/9libs-1.0-r4.ebuild
index cc510097ffa9..b8a794c0c29b 100644
--- a/dev-libs/9libs/9libs-1.0-r4.ebuild
+++ b/dev-libs/9libs/9libs-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,11 +11,10 @@ SRC_URI="https://www.netlib.org/research/9libs/${P}.tar.bz2"
 LICENSE="PLAN9"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs"
 
 DEPEND="
-	>=x11-libs/libX11-1.0.0[static-libs?]
-	>=x11-libs/libXt-1.0.0[static-libs?]
+	>=x11-libs/libX11-1.0.0
+	>=x11-libs/libXt-1.0.0
 "
 RDEPEND="
 	${DEPEND}
@@ -36,8 +35,8 @@ src_configure() {
 	tc-export CC
 
 	econf \
-		$(use_enable static-libs static) \
 		--enable-shared \
+		--disable-static \
 		--includedir=/usr/include/9libs \
 		--with-x
 }
@@ -51,7 +50,5 @@ src_install() {
 		mv "${D}"/usr/share/man/man3/${f}.{3,3g} || die
 	done
 
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/9libs/Manifest b/dev-libs/9libs/Manifest
index b49c023b2c1b..20affd02b69f 100644
--- a/dev-libs/9libs/Manifest
+++ b/dev-libs/9libs/Manifest
@@ -1,4 +1,4 @@
 AUX 9libs-va_list.patch 2819 BLAKE2B 641d1a22c9feecb635d470c072ee28fb4e3fd0fb54d2db3c667bf6907d38f4928cc951057df1b1dc2bc0dd4c98d2d5ff16d1b94243df9db1d96d2f52608db804 SHA512 3c441f0bca520baebe06b63e099ee4ba138257c40d3870894c910173379f0d1e52f1627e984ceac61dca76ec68ac68e75cffa919895cebd4b38d09e12f271783
 DIST 9libs-1.0.tar.bz2 163744 BLAKE2B 3cc984ff83ff48969148f8fb3b78e6b85b32280634e99f552c869e650d4893a18ea2164c10ea7662a704c7d55a49bf7434caa219c3a716637895d1f3df4d2ad8 SHA512 35fdd874dbf9aca07e681d7c3f707d22a45cc8cadb2c273a1fbc5f8303886a6b512eb16fc1b81d64d7f665b16a3b19a8d678a540cd4ad453de853b90905d98d2
-EBUILD 9libs-1.0-r4.ebuild 1086 BLAKE2B cb8aedf43f07c1cfe9662dfb8f89012f468ba39c7729a9fdaa2a3c50233501809d7146321eebc9c20a2cacdd74e14d5c095bd7bd2d613e670828bdd5b1df62d1 SHA512 dcd4db6f4ddbab96c968dc3f007e0bae663a0765a721a4f6ae6279ab0983851a3e0d734f95f6858fe39f1c0d8434bff47e76133cb85aa3aca406f91e644d0f74
+EBUILD 9libs-1.0-r4.ebuild 990 BLAKE2B ba26e98994d6e874ea234242dbf77a15699ac3bed522dc47c481d5f8730bc69f704123465a3059ec23dd8f25148a668e32063fbf788926325541c1e3ef2e62b4 SHA512 713888ceb0fbb947287f06715e620050861952bf188013bcea5c916ee55c77271d0fddc10c4efb59dbdf11bc236c48cbdb37a8cb7dd3e3abd0bad87f80c6857a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 799840efa45a..f9a262bc99e5 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 343eca84e1f2..67db936e6242 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -4,11 +4,12 @@ AUX apr-1.5.0-mint.patch 872 BLAKE2B dda2941cbed87117a8a6c488bd8045894686aef0ba2
 AUX apr-1.5.0-sysroot.patch 1309 BLAKE2B de3dc13a44a9d5071c249875322b7d6be9ed765176f8232b96a5e5088c5764dff8b810377b214999b59380522fdc9d0577217fe1acff5a7ab4b17461d6daf909 SHA512 48609c522225b47df96039174dafa043f77ce5b91f464b14250dd2b30590d6685c9baa03d4ca34937532c26afea8d208fb78158dfc8026a606ff90543b5c8d5d
 AUX apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch 567 BLAKE2B 7a41d3aeb1e69af2a90bc55ac5aeb1e8395c5b0f6ff569f65f88de15c29c1df794415526b1ef13ca2deedfe48f8801e93b2eca655086518d9cd7bc5159252d1a SHA512 d2c4e0fbd9d4b909669820c30642c34de51b87edfc746875c0743430a7cc2599b68a037a6146f9c0f49d8e78844617c392819367636e2b6175bd919fce5ec5a8
 AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2
+AUX apr-1.7.0-autoconf-2.70.patch 1970 BLAKE2B b552e2bb1be932a692e2d1fad5124b5db9163e45b1bef1fe97082db28efd6f6079d75253e961ca257bd31f53f814bdb11a2c6554fd5d1925d26fe7b42664db42 SHA512 63a56be83f555a78f422f9ce7074e5c3a497a4996d32ead78d9e1a05fba2e0dbdfb135c34143676b8ad16e8276642843d5ed8b17a540be58c6bf7e9662896c2f
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.6.3-r4.ebuild 4345 BLAKE2B 3feec303f43241e70bf6f8b54b3166de08d9faf60e50efc684289e83556c91750023b333ebafd2395276cce3bb78f67ed56765664f5eba8dd35e3b9eb0a1315a SHA512 1d0049ff0aaa648819ca363e220a72919b75dfe771c10e216046c9e219abb2075624c8a48e861cdd7e7f564f50326aa9853afb7d14d2906e04c43e098b46228e
 EBUILD apr-1.6.5-r1.ebuild 4292 BLAKE2B 066987f4de62748193a8a0c80721240e5204f75d42fde2ab45e849f07bb1cfcd6fb146dd4a97b3ac036f136bffa23da0b6d0b963182fd55905436c6ae4f6db8a SHA512 f54aa3c2a822470aa95c2d4ef2c0e96988ac3ee5e674c60fc6e0fb012cb9a6de3e9fe695c2a6f53cacfd36809cfb09e75a5d49633b9f054b8274c6ae38814173
-EBUILD apr-1.7.0-r1.ebuild 4200 BLAKE2B c0c22720a17a8c227714b651a9e17f81706c900a19dd79da35639527313f4bb05453616106f3883b1cfb40d26a9a51353acf8ff1e9564d5d822e573f4df89d1e SHA512 df3d7d55b2d933d5327121fb0a6b3f85b8c23892b15c05fb12f8b75ce4651144ff8d81ac7c22c1bbe7c829ae3640310c6684fc4f96cbbc2c4c01b6fa8362e118
+EBUILD apr-1.7.0-r1.ebuild 4255 BLAKE2B 4271e3c59c77b9743a12caa74bbc1f99aff6a2eebc1c92bd727f502a022aa567283ed33f58d3d030dd383665567c48ca3009f2a8a38b1ba145015be9fca7d975 SHA512 b7786b17df6130b2ee272126e40117c6d3532836e3ac24329559082b814a5723337ec84f38b57cb6b7e8e996949956e284dca6adaf08bc8d32c3a809a5216144
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 090739bcb80f..f4a3aa30f6b1 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
 	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
 	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+	"${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
 )
 
 src_prepare() {
diff --git a/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch b/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch
new file mode 100644
index 000000000000..488c3c59321d
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.7.0-autoconf-2.70.patch
@@ -0,0 +1,64 @@
+From 5593f23e8e062da108ed585535e7281b87346ee1 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 25 Nov 2020 09:36:25 +0000
+Subject: [PATCH] build/apr_common.m4: avoid explicit inclusion of
+ '"confdefs.h"'
+
+The failure is observed on `autoconf-2.69d` (soon to be released
+as `autoconf-2.70`). There `int64_t` detection fails as:
+
+```
+$ autoreconf && ./configure
+...
+checking whether int64_t and int use fmt %d... no
+checking whether int64_t and long use fmt %ld... no
+checking whether int64_t and long long use fmt %lld... no
+configure: error: could not determine the string function for int64_t
+```
+
+This happens because `./configure` always stumbles on warning:
+
+```
+configure:3350: gcc -c -g -O2 -Werror  conftest.c >&5
+In file included from conftest.c:31:
+confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror]
+   22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
+      |
+```
+
+It's triggered by double inclusion of `"confdefs.h"` contents:
+explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly
+via `AC_LANG_SOURCE` use.
+
+To fix it and avoid having to define `main()` declaration the change
+uses `AC_LANG_PROGRAM` instead.
+
+Tested on both `autoconf-2.69` and `autoconf-2.69d`.
+
+Bug: https://bugs.gentoo.org/738156
+Bug: https://bugs.gentoo.org/750353
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ build/apr_common.m4 | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/build/apr_common.m4 b/build/apr_common.m4
+index f4e2dfd0a7..6f5782e674 100644
+--- a/build/apr_common.m4
++++ b/build/apr_common.m4
+@@ -504,13 +504,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
+    CFLAGS="$CFLAGS -Werror"
+  fi
+  AC_COMPILE_IFELSE(
+-  [AC_LANG_SOURCE(
+-   [#include "confdefs.h"
+-   ]
+-   [[$1]]
+-   [int main(int argc, const char *const *argv) {]
++  [AC_LANG_PROGRAM(
++   [[$1]],
+    [[$2]]
+-   [   return 0; }]
+   )], [CFLAGS=$apr_save_CFLAGS
+ $3],  [CFLAGS=$apr_save_CFLAGS
+ $4])
diff --git a/dev-libs/avro-c/Manifest b/dev-libs/avro-c/Manifest
index 5cd853b6d1c0..f16311d203c6 100644
--- a/dev-libs/avro-c/Manifest
+++ b/dev-libs/avro-c/Manifest
@@ -1,4 +1,4 @@
 AUX avro-c-1.9.1-fix-libdir.patch 1041 BLAKE2B f6fb235b0e6f4bbf34028168c0822cb1ec320de48e25c58d61b7ae99d8500db21af7fb290fc594a07d1b03e7e13f9321ee2680ad28652fc99d3048701e3d8e8a SHA512 5f936afcedad81f9bd6727e484d0cee3cf3bebcdc111a28b8cd6dc7c48d56ade6ad3d1b4eb96c69c556e4d3c2346a523b12d2ffbcfada864865a618586d3412e
 DIST avro-c-1.9.1.tar.gz 216954 BLAKE2B a1647c8315eaad5af7aabee01b71638261daa82def48227046d05da89ef66e8697d6c31f1a4a7b2b8010e1b471e50e24b85701ad7870e6f1d3495262dfaf00c6 SHA512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904
-EBUILD avro-c-1.9.1.ebuild 495 BLAKE2B b9f267a443eda5c6d491267b375a6971dee3507e4dcaa1fe649b74b64c40fb3d76f405c30d682d5b4ccf3b94c8a91b9a73194c9ec25dbff25b4b730f71c5acaa SHA512 154e8207c4d7aede3353880416decef2937fe48601184ffd14f6d2424894fa0c63b8d36c3552e3625cf76a2aa8fdeae78d23f3d192bb582b0a164020152eba67
+EBUILD avro-c-1.9.1.ebuild 499 BLAKE2B b7bfc290a545cb8d5d0be8fde6c81258520de3bd0a71665da0211ca2e08366b74fe2e75a2b19098f0722b692f3445768af19c08cb1c662fbe7b9781c65b1cda8 SHA512 c785a333692db50d9a4211b437b67c48a79f0c4c81887ba759806f73ba4c0cd7b8006507d618e321f4445ed5e2c3a4a42995bf4896631f94f633ce825ea32664
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-libs/avro-c/avro-c-1.9.1.ebuild b/dev-libs/avro-c/avro-c-1.9.1.ebuild
index 52a09b83a88b..d5f0603a0ff0 100644
--- a/dev-libs/avro-c/avro-c-1.9.1.ebuild
+++ b/dev-libs/avro-c/avro-c-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://archive.apache.org/dist/avro/avro-${PV}/c/avro-c-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	app-arch/snappy
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index e5873c296911..538d2c25774f 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 11204 BLAKE2B 6efb4bab66d80551fb8938481bc6a3a445a47e295186b04a966ee02ac7398a775c9126fde4c867ae209fdf8c792d0b98d36e847b9f2203257fbc39855929ba85 SHA512 f4355ebd9679fd72e56b7acebaa3594aead45a82013bcb8129aff1431b0840bb6388a75a59d05c86334b9b079a674e173bd0f572bff7a2c3cc5cb55ec2c59550
-EBUILD boost-1.74.0-r2.ebuild 11258 BLAKE2B 2d91a2ef267d613e24b3166e72812bc3140cdeafa7101ae271d31b4024da7bb160625cd00d7bcc7719321e09c60b279881c055a06b017aa83090e67fb72f24d1 SHA512 e4793de20af7ec64257a48f6bff57f6eca983b0be92400db20f437dc7d491061131606b8ece04c20bda6bc358d9275683350cdebcc27b510fcfa6161fb47f710
+EBUILD boost-1.74.0-r2.ebuild 11257 BLAKE2B 75662d8265bc9c81c8d3a7834c770ecb16b53284bd9630beb75c7c9265f28b7472ca908b05334c821e1c483dc48ec902627481565f5f2087e382177e59b0ae1f SHA512 d6189d2a195cb8d264b33a6f1925247722660dfccbd631c67131f0b01f54c24d89083fec01a29a79d9ae40b1944c0101c7ccd95e837db64c56388fb64c41c262
 EBUILD boost-1.75.0.ebuild 11089 BLAKE2B 359c8f1e0cc4ce3f2de0e6465fe4d9d3c0e3cbf460b5eb2c82bd5fbe7a69b1ccbdaf87d59b7e8b494878369dacc53ea2cff59e781859899739ba40eb1ddc1dbb SHA512 02cf73e6824779b31684c107791e3d108456cf6e7363a001f5a76d094fb459947dab1db0f2d9bcad95f7616f495b8a92835cfae14cb82a800b9b69ce3af58288
 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 c4e7f5f362eb..1fe8c8e4b500 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/botan/Manifest b/dev-libs/botan/Manifest
index b48928e2350a..e6421982bdb0 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,5 +1,5 @@
 DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
 EBUILD botan-2.16.0.ebuild 3090 BLAKE2B 194ec6964faa72f817898591613feefd26dd8eb9860c40561daf51489b653d6dc65ad9ff65393d36a560d642ee1c0c6d53b308e67c6b0bcb0a3696cb4ab3925e SHA512 31e089ba9f46373c4831966384d3a0dd51ba2c85e20bee5de5f69d789f6270522142d237df78ada68639b86cf8966f45d1e49d55e135743b9b3cf725f8bac257
-EBUILD botan-2.17.3.ebuild 3096 BLAKE2B 1708642bd29b845938675e193b4dbad68b72395116a10ae4eb918c7bda1a693e9659aa11ff46593ddf8ced6c077e98c454e5a0d6ac16f77bc7f4bb685348a0dc SHA512 27d13a9582cbb9b0a923419bfd4b5eabe4126d18bf0c3b226443278aa9e7c742cf409b002e581636e1dbe6437bd5a018dd7829160fe818b220f8fc46c6247989
+EBUILD botan-2.17.3.ebuild 3095 BLAKE2B 301d6a5421153e8c8008e0ef304446874486ac89aeb5352b653feab4cd7ee4004993b00f7c9807d62ce0bd23f7e875456031cc09cbf50aa122dec45fa3c8c9e6 SHA512 93321e2b48084b11913546fea4183e92d1057c8612c456c590c1fb4e25f5c41c22f0195791c4e3dc3e6ba52904dfdf5439291dbcd096332f3aba3e79db743d2c
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.17.3.ebuild b/dev-libs/botan/botan-2.17.3.ebuild
index c15f5000f25c..2fe23e8da1ff 100644
--- a/dev-libs/botan/botan-2.17.3.ebuild
+++ b/dev-libs/botan/botan-2.17.3.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 61a08c204ec6..c887b26ae44c 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,7 +1,3 @@
-DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78839f66723272780345d4b5c5f265c2040a4abc9b473a09e221b50450382dff60103198f72384d28d1ab068e SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e
-DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9
 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
-EBUILD confuse-3.0.ebuild 1134 BLAKE2B 8686e187509fd48ac14142797e47cf43e3bc1a3a12377778fa3cb7375bf3ac4c2a265097550396bef035aae2cff119d170a41ba55737ca565f66612c977c6d1c SHA512 fa3ebabfe6a1d0b6a86870f46c06a2846c163880af11c2c451307a6c6cb8ed1b97332a6a3e4d49722473b73f9f6a06681e7669cf8190d63e5a13a369fac44778
-EBUILD confuse-3.2.2.ebuild 1148 BLAKE2B 078975a59218055b0a6d010f68a3bb69493f63eced78a4916fa6cee875891080bebd99303b000d4936fa3b8f65ea751d445806b9ca3a79644c325201e045d851 SHA512 c775c2c1c132336de8446bd63f2aac8346640f64bb873b360c0b0c77d58c6bb4265ae40f40532fe9d8c0e7d08a9c7cac63af0e8497c33ea02af22bee28993bae
 EBUILD confuse-3.3.ebuild 1148 BLAKE2B 33c7de154ec7e06627fd9c0c6c04003d0d7ca7406ab33556b9de7d75efa3307809c7da82a9bec8cc51e4df601bf70107619c84eda60826fa86fa82c35f83e514 SHA512 789e489c79c406b72d04ab9e11ba8c32cc627cbd0469b1d2dbe828328b9f63988303ea4bec41f98dc0d6770a945d0285396c3186dd005316b9a2cc3624ecb53e
 MISC metadata.xml 403 BLAKE2B 5d262f11d79e80fdec33ec5f50e2d008a2ab9610ef1823a38a6db0a9e211d63200bb33ab2251b46b117ca7f68ab061602eb664cfe8758928696bc260c463c905 SHA512 85ff2055d87b94e9da3afa22885ef494764fcaa686e1487f7a9c87a4f172333d1c9effa28544e2683da507e2b6e52ac0fd1d8662a0cc97a9ce5f462d98d703be
diff --git a/dev-libs/confuse/confuse-3.0.ebuild b/dev-libs/confuse/confuse-3.0.ebuild
deleted file mode 100644
index a58ecfee0a7a..000000000000
--- a/dev-libs/confuse/confuse-3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune multilib-minimal
-
-DESCRIPTION="a configuration file parser library"
-HOMEPAGE="http://www.nongnu.org/confuse/"
-SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-IUSE="nls static-libs"
-
-DEPEND="sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl[${MULTILIB_USEDEP}] )"
-
-DOCS=( AUTHORS )
-
-src_prepare() {
-	eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# examples are normally compiled but not installed. They
-	# fail during a mingw crosscompile.
-	local ECONF_SOURCE=${BUILD_DIR}
-	econf \
-		--enable-shared \
-		--disable-examples \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	doman doc/man/man3/*.3
-	dodoc -r doc/html
-
-	docinto examples
-	dodoc examples/*.{c,conf}
-}
diff --git a/dev-libs/confuse/confuse-3.2.2.ebuild b/dev-libs/confuse/confuse-3.2.2.ebuild
deleted file mode 100644
index cbb76c207adb..000000000000
--- a/dev-libs/confuse/confuse-3.2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-DESCRIPTION="a configuration file parser library"
-HOMEPAGE="https://github.com/martinh/libconfuse"
-SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/2.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-IUSE="nls static-libs"
-
-BDEPEND="
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# examples are normally compiled but not installed. They
-	# fail during a mingw crosscompile.
-	local ECONF_SOURCE=${BUILD_DIR}
-	econf \
-		--enable-shared \
-		--disable-examples \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	doman doc/man/man3/*.3
-	dodoc -r doc/html
-
-	docinto examples
-	dodoc examples/*.{c,conf}
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/d0_blind_id/Manifest b/dev-libs/d0_blind_id/Manifest
index f2e040e3d651..1596689d9462 100644
--- a/dev-libs/d0_blind_id/Manifest
+++ b/dev-libs/d0_blind_id/Manifest
@@ -1,5 +1,6 @@
+AUX d0_blind_id-1.0-slibtool.patch 1564 BLAKE2B 60aa46c04897ac10b57b67cdaf0efcf93468a089d0b0bf735abc0d97af734821d24139825600e20520e6a15359de236a0e010aa2a8d5dffb3c7502662dba6fa8 SHA512 b0c082358bae52efcac9774198a2c8f75d804e9cdb88922a81548c19bbc9b03f1c4cc20c70e5b75eec3ca822d297ba01092d72fc49e4d41023fc384320818a5c
 DIST d0_blind_id-0.5.tar.gz 344460 BLAKE2B 9b77061e35b37bcdc009ea82989b0fe18ca6ddaebfcf7c3a4bd35523ae683fc0f05c3886f1c7904afbb5120a013dab2bbb1031c3c5dba9c435258e0b7fe960e9 SHA512 0a7735269a41108f191c4143b52eff2179889d94239be5be0c2406c6ed789b68e2d545250f9964e97f8c86a0653296bacdbe9b8d9db89a79ca6922d7c1a90162
 DIST d0_blind_id-1.0.tar.gz 49110 BLAKE2B 1977bb9c71d6655e8a84aab9daf5aee470ac3f3e140e7beff3555a41a81baebab5e4e5019b0550594b8c6e8b936706bb9790e5e3171c1348abf3212349d07109 SHA512 dbee0bec44a008a6843ec367211e4cdfa25f6c4577b48d942d19301d5ff885d4fde8d40ea304a114d349d8e90283a50854afb2fb322bf19640842ded025849f2
 EBUILD d0_blind_id-0.5.ebuild 837 BLAKE2B 326a06fb0ae0c2d3743734c9b7c73cba54e52e6d1cdfeb7de7c81a892a9df9072a8807e862e9f1264a1f0a6348338104416c03bf2ff89b34931492926e2f160c SHA512 d3121ad66661a67e15ecbb1775c76dfd50f6ff0247b60947ff8aa767b2bcbbad5acad419192ea777393b6dce10502e0eeca8bc4225a6d918a7aa5daf5044df42
-EBUILD d0_blind_id-1.0.ebuild 990 BLAKE2B 35be5c9c8829c20c09a8ea38fd037c959eba2f20b0df090b6e354ac8c9508a7aa3e499173e1c6b10b690a314025ac2e206ac895c812f0511fe2395485621239e SHA512 5c18e7be28c6508659dcc42d879195cf61f1a9b4d72fb990daef12e50a35847a3307cf8c8ce168d4bd4234c0ae5ba59628bfd62a644ecf1d35f98347719fedad
+EBUILD d0_blind_id-1.0.ebuild 991 BLAKE2B da58c17c2bff8fec435d7050e2e1d7fda1d9db0c7e2c23a93b152073153ed26315354507f6e030a6f85c30ee402feadcc504c077a4235e870afc3a90f933ea3a SHA512 6e943cd9696e8c6a587a5f6dc2e33bf1e601f3d0a8d9b59492028affc71b7b143dafa7bf32212c24a999dc7d4de8ccfc83cbacc91223609bbd37238b9d12695b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
index e6a95402a2c0..013b70c77ca0 100644
--- a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
+++ b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -15,11 +15,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/gmp:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( d0_blind_id.txt )
 
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch"
+)
+
 src_prepare() {
 	default
 
@@ -44,8 +50,5 @@ src_configure() {
 
 src_install() {
 	default
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch b/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch
new file mode 100644
index 000000000000..62ae318315fa
--- /dev/null
+++ b/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch
@@ -0,0 +1,43 @@
+From 0d3d1f2655901776b2fc3e911eb78478412f789a Mon Sep 17 00:00:00 2001
+From: Lyberta <lyberta@lyberta.net>
+Date: Sat, 7 Oct 2017 19:26:40 +0300
+Subject: [PATCH] Fixed version-info.
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d21887d..07338eb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ blind_id_SOURCES = main.c
+ blind_id_LDADD = libd0_blind_id.la
+ 
+ lib_LTLIBRARIES = libd0_blind_id.la
+-# versioninfo:
++# version-info:
+ #   - compatible interface change: c:r:a -> c+1:0:a+1
+ #   - incompatible interface change: c:r:a -> c+1:0:0
+ #   - internal change: c:r:a -> c:r+1:a
+@@ -29,7 +29,7 @@ libd0_blind_id_la_SOURCES += d0_bignum-gmp.c
+ endif
+ endif
+ endif
+-libd0_blind_id_la_LDFLAGS = -versioninfo 7:1:7
++libd0_blind_id_la_LDFLAGS = -version-info 7:1:7
+ libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+ library_includedir = $(includedir)/d0_blind_id
+ library_include_HEADERS = d0_blind_id.h d0.h
+@@ -40,7 +40,7 @@ if ENABLE_RIJNDAEL
+ lib_LTLIBRARIES += libd0_rijndael.la
+ libd0_rijndael_la_SOURCES = d0_rijndael.c \
+                             d0_rijndael.h
+-libd0_rijndael_la_LDFLAGS = -versioninfo 0:0:0
++libd0_rijndael_la_LDFLAGS = -version-info 0:0:0
+ libd0_rijndael_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+ library_include_HEADERS += d0_rijndael.h
+ pkgconfig_HEADERS += d0_rijndael.pc
+-- 
+2.20.1
+
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 3a4b122d5d33..e1046b0986fd 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -9,4 +9,4 @@ EBUILD ding-libs-0.4.0.ebuild 516 BLAKE2B 3efb751ee44e75122af233c127090cf3977a4b
 EBUILD ding-libs-0.5.0.ebuild 568 BLAKE2B f30b0af74f3d5ff23662f5e2448e1d6a482b1f6c1a3983b292704401fa2191836a98b97f75c20c66617e10758b1f2be4769c964dd04a0a848b3e333db95b197b SHA512 a88a8971056083abd78d3d35a0890cb95071a371c8f28a85e864fc00f9a64cc6419eb10a3ca85255ea0e5c55d3eb3ee0b33216a8f93410102a39cea060c4ce5f
 EBUILD ding-libs-0.6.0.ebuild 620 BLAKE2B 2935132f47904c52cc03fffec7e0ef461df517b1a9313ffba53f0cf265c10634087080a1ac1baec03c19c5c0c0f63c0e44aa5f6de79b12cc57f713add2b98c23 SHA512 ba9b6e0e9f462ae22cdfbfb4ddf50c48f52f1c93fb7336351ae4d95addc30cdd5bda38218dbceec90bcac3faafb3980391195d4091381d0267f9766c91df1058
 EBUILD ding-libs-0.6.1.ebuild 825 BLAKE2B 789e20ec00d527df4087230e4707ed24c89ac47399d3c65d358d74c7e68be5bb598c1142d83f7eb6ec092866f97d1733eac92b884f8949b24a1cdf16160a8484 SHA512 b0456b1f28c306c437fd418cc536cef8cb5798febd2e66952101f3cbdf82ce3af34832283d2b460a590d1e6c1a70779b1d6f056431ef0edd5b8a17f7972c43f4
-MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ding-libs/metadata.xml b/dev-libs/ding-libs/metadata.xml
index c5adddd4b3e6..6f49eba8f496 100644
--- a/dev-libs/ding-libs/metadata.xml
+++ b/dev-libs/ding-libs/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/freexl/Manifest b/dev-libs/freexl/Manifest
index 437c8e03a77a..0a69ac86c84b 100644
--- a/dev-libs/freexl/Manifest
+++ b/dev-libs/freexl/Manifest
@@ -1,3 +1,5 @@
 DIST freexl-1.0.5.tar.gz 938994 BLAKE2B a3d2667271f6ab3de61a90f75ba8f7a645c5eddcd7f6d452fbbd59dc211c4676bdef7f7772235f60898de1e0a6d2e4951a3eadf77c4766bf938f5d8465f9de42 SHA512 86d742f58353be1f3ab683899a4d914845250b481acc078c769ef337d0a6ea24d25501a3e7c73b95904c6839ddd35f53e58ad4eee0c3b433caa84db0a8c6462b
-EBUILD freexl-1.0.5.ebuild 533 BLAKE2B 9ae371f5150b06bcb5c7fb1fb03386de20ae859f81d2cc7c0a6e1320a285a420e61bb7c58cd23bc0659dc090ebf2afd72f26b7720ec54a66a21c7b2ee0659bbf SHA512 f4ea7aa381e99476691ebb5385a93f6adf92905f8239e4c1289ff9d0ce1d375185eae8c43317f4086e84f349741c84a136c69f50c02d29a0c41a0ed3b945f3c5
+DIST freexl-1.0.6.tar.gz 941179 BLAKE2B e0b04e66c56d3a2805eed3f86442269843a2ccf7133669b9506a1812562396f2b5bbc04e29c9f829d9df6e627fa31b87fccc5407275ffb205ff498bd47bc4b89 SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6
+EBUILD freexl-1.0.5.ebuild 557 BLAKE2B 3d5a55d682d5571d0d499f8adbadc082049a09febd5b8c75d56029cfa0442355c3515de9cc5faa8f05dab612c0c201857be76cfe486dbc18f7ad75d654d53591 SHA512 796a1b5a51abb07e46d52427f470c44d89affec59c1d7473f65d30abf844f1edb18038cf7e5842bb9b5ecd50102c9ac97678ea707086e054251c9045a1ffa98e
+EBUILD freexl-1.0.6.ebuild 563 BLAKE2B a8c4bf2add3bac02f35624b9bee8c62df012243e8c4bddf84d0d066627e671e8f5f1466c697d517e855f612b11dec4f011f92bbf8ecc5185b3b8bdff41d0f8b3 SHA512 eaffee37be563b4f798a55378e2e64bff139018a71e5c98dfc0ad09ed84d496170002f034f5ea6a44bf28f48d3a398cb5d9e3924554b4ca4fd4f6a122cbc6218
 MISC metadata.xml 269 BLAKE2B d4815f943b682786bd83cbc5840e99f36fc2f1bf175394ef9389228bfa8bd22b1bfbbf763eb9c396338b72b7927b431e73598bb67eaadf1d437c4afa5877c189 SHA512 9877d09d42c801d752617b41c7fb790db8e10c033c02ee9fe9a04fa1c6a8ea06d3baeb4f81d041b57e883d5d9dadb429289faae90d0293c62334ba35549e0276
diff --git a/dev-libs/freexl/freexl-1.0.5.ebuild b/dev-libs/freexl/freexl-1.0.5.ebuild
index 86e702667c81..7726ea2dcb1f 100644
--- a/dev-libs/freexl/freexl-1.0.5.ebuild
+++ b/dev-libs/freexl/freexl-1.0.5.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
@@ -7,7 +7,7 @@ DESCRIPTION="Simple XLS data extraction library"
 HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index"
 SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
 
-LICENSE="MPL-1.1"
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 
diff --git a/dev-libs/freexl/freexl-1.0.6.ebuild b/dev-libs/freexl/freexl-1.0.6.ebuild
new file mode 100644
index 000000000000..0677e5dfba87
--- /dev/null
+++ b/dev-libs/freexl/freexl-1.0.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple XLS data extraction library"
+HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index"
+SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 344bd8628960..5308fa6b514e 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,4 @@
-DIST girara-0.3.4.tar.gz 72981 BLAKE2B 690b8de0e906e43e32b7a1009a04d4bb1d5b029924ea5b85491ec740ba4b4363f8729bd9b8498f1f25309e2eabde6868f41a689ed06dfb6aa36b081676232624 SHA512 1eca68f4f28505d897c2f7cfb8804e67591e8327feb347c66da216d8f764cb0c88028d1c4c162579a882df7db1883b834c97d8488296ea5c0a8f709dfcea1f1a
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
-EBUILD girara-0.3.4.ebuild 1092 BLAKE2B 4799df2f151ed1189ec9595863cf32f753d3855e218d1fa2f4ce4d26538c1397743320f772fa0a9db842b773fb644d7e7654eb8be4c7d8b4e26f1d6b05971cb8 SHA512 91f1a78a23a4685d54d8ece01d4562be77817e3d43b67d0856f32a768c38943399622479cedf39d3791833d6247df8fd144ad94db9a6ce3beaea094270e6656d
-EBUILD girara-0.3.5.ebuild 958 BLAKE2B 8c9f1e35b434b1e3aa68da2afc475470a15c1e705aed9449f327d3aa79355a2c0c7ad93b4697ed9d0e4e2cfb024d99ba3abc17e724acfd0564e620f91c559c83 SHA512 ceeb4f0dfffe372f497af1d452e11d4d418a412742f2e77205a35c81f4d17e166a4a79edbdcca5e2ed83ff12cd62b834b9245e4861aa834bbd1a9d51e0c5ec48
+EBUILD girara-0.3.5.ebuild 957 BLAKE2B 90c9e5fedc9c3c16282fbc18874fa2a9e24dc51a0ba1f2e3a1adf223b75d367304a9862390fabdace5bfb8ac6c499f4a5c75c8e2fe53b2e8577ed8bb4df42ef2 SHA512 34c0367e79967f0fc8d54a701672a3609ae17e74cd5b0ea708e5183292753624bb47881d0c2c409a90112c3f776f9022aa5d95c7f41e1e143927e9330c49a3b9
 EBUILD girara-9999.ebuild 1095 BLAKE2B 698754899258090e0656a5509610de9b1157ce838dfabd7c03ae6163b0082a12fac3ec53efc14214a583e81ded8285fea701c3f41031859f2d95f050f912ff4e SHA512 893ae83c2331343b541c832fbdf281af219ca2ca6172ed7efaf4b558ca1e4f4d0553a29f03d3b405165b4174460bf2d1f876d39a4477437a8ae3cfeb5d45d3c7
 MISC metadata.xml 581 BLAKE2B 25933546f3727c17b48e8bde4136825202d34300d2a3049ceba68afeb7f2b88ea5430240fdbf118229751229c06d31aef3cf28c7e13182d008e56161eff133f2 SHA512 2b6f1590cc60c44d13394afb5c3815c227aff680f94510e5202d2b41614b6854effe32d4ade6ab4b2d36595d36fa636520e88ea514078c23ca881e00d3d7797f
diff --git a/dev-libs/girara/girara-0.3.4.ebuild b/dev-libs/girara/girara-0.3.4.ebuild
deleted file mode 100644
index e77e4d1de042..000000000000
--- a/dev-libs/girara/girara-0.3.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-
-if [[ ${PV} == *999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc libnotify test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2
-	 dev-libs/json-c:=
-	 >=x11-libs/gtk+-3.20:3
-	 >=x11-libs/pango-1.14
-	 libnotify? ( x11-libs/libnotify )"
-
-DEPEND="${RDEPEND}
-	 doc? ( app-doc/doxygen )
-	 test? ( dev-libs/check )"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Djson=enabled
-		-Ddocs=$(usex doc enabled disabled)
-		-Dnotify=$(usex libnotify enabled disabled)
-		)
-		meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/girara/girara-0.3.5.ebuild b/dev-libs/girara/girara-0.3.5.ebuild
index 7962c3a508b0..b16354a30a1f 100644
--- a/dev-libs/girara/girara-0.3.5.ebuild
+++ b/dev-libs/girara/girara-0.3.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 34c54bce4cf1..be5205ed0e76 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +1,7 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
 DIST gjs-1.66.1.tar.xz 439992 BLAKE2B 2b6d25b50fd48ed8b9bb0c594321bd00525e7d6db8b348d7da5c1e10cfd588fccf5030edc93fc31da094da5a0327d4a7b26c26d18ee4284dc1ae767f7721a7b4 SHA512 601d0c645ab1586e7d770f753bf68653816dc631faf89b5e70216320f6b7707e4aaa3507111fb6ff3331f76656050e32e8b1441720bf080de957e03e4565a43f
+DIST gjs-1.66.2.tar.xz 440184 BLAKE2B 8df23470c763d65733c6fb622a1de8b8fed3e16c1ba67883b6ae0e7150a5a30a334735be39f9c68217501b7674fee8bfce6ab704c0742ae639a1bc14cdce4cd8 SHA512 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
 EBUILD gjs-1.66.1.ebuild 1114 BLAKE2B b2324eeaa60bb5a885e782fd5cf7b84534565d7470b153b30e972a5c624b1a83fd71d4eaafd72d01807a2035fb667d6c205c24f0db591c56df6cc043d1542f76 SHA512 9aaa7806c10fb4e27d23bf0c21575054d309dd2ccafdc88023e1543b083b61a53f4a1dd56395e0e53a90be552c51b0da64fdba21ec36a522844b78d4eff764db
+EBUILD gjs-1.66.2.ebuild 1114 BLAKE2B 7b7e0a42125079bb76eb4c4639f051fad029d8034658dddc9a121edb62f85e028eab309c41c24d0cf117d55b87b0e9ec0acc6cac9e199e591b5cf9b1fc1b6c8e SHA512 8c90187141b1f7ca137ede8aed2400852de6abaf375779b60a94e3dc7a36954cdfe2af7f8cf82d01aec52ef086965fe7bb4a2c358180f6ea08ee608dc52a4ecb
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.66.2.ebuild b/dev-libs/gjs/gjs-1.66.2.ebuild
new file mode 100644
index 000000000000..cd936bdbf15a
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.66.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk readline sysprof test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.58.0
+	dev-libs/libffi:=
+	>=dev-libs/gobject-introspection-1.61.2:=
+	dev-lang/spidermonkey:78
+	cairo? ( x11-libs/cairo[X] )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
+	test? ( sys-apps/dbus
+		>=x11-libs/gtk+-3.20:3[introspection] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index ebe84eb6f134..06cf6868c5a8 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,3 +1,5 @@
 DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56
+DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
 EBUILD hyperscan-5.3.0.ebuild 1191 BLAKE2B f0bf124f5646a11ff6c827ad1ededd174608022dfd161f33fb7ff6530859ba36578bbc8fecc473be328fc048b66f5719356a4b78cf5f2d67e278f60bc1cb7d4b SHA512 4a6407daeaae14499cfba022eeb43868e6a3b0dc4ebaab1ba0ed6394b507b037fe8bef1933b6f17d4d02868f08b259c8e66a891d8d4bdc2d159644ceb50294f6
+EBUILD hyperscan-5.4.0.ebuild 1191 BLAKE2B 76aeaab241f170ad365ad094fba85d945ac63e0b8368ec22791f09d33d0d897089c4fd03c09c70a1a708fbf83821382540ae783104ef8b054672f89d2d36c0b6 SHA512 6f7cbfc1bffd13cb6b9405402fdeb985bcd488165004e03f1f2f95585373a6367a1ff422871cd1cf94e3b9e921f429d3c8afd2943162243506cd70e38628a2d3
 MISC metadata.xml 548 BLAKE2B d68c6cd73543c82ec12d2b05651ef2de0a3e402a3a3b28d827e87026f5576a1db23e52fa04021967cd919aeb828bdabc931ccf2e0238294c84c0f3f1d27dbee2 SHA512 5005d5ee96a915866096f63075a5ff76a49474807a63d846151ebbb411fe0c477c3b6883d97438018a69fb78c917b190de8768a44296caf7ca11451b7cbf587a
diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
new file mode 100644
index 000000000000..fcfeb8e7d138
--- /dev/null
+++ b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="High-performance regular expression matching library"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs"
+
+RDEPEND="dev-libs/boost:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ragel
+"
+
+REQUIRED_USE="cpu_flags_x86_ssse3"
+
+src_prepare() {
+	# Respect user -O flags
+	sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die
+
+	# upstream workaround
+	append-cxxflags -Wno-redundant-move
+	cmake_src_prepare
+}
+
+src_configure() {
+	use cpu_flags_x86_ssse3 && append-flags -mssse3
+	use cpu_flags_x86_avx2  && append-flags -mavx2
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
+		-DBUILD_EXAMPLES=OFF
+		-DFAT_RUNTIME=false
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/bin/unit-hyperscan || die
+}
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 60fa35bfce3c..dc99bf30b672 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,8 +1,4 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
-DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
-DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
-EBUILD icu-layoutex-67.1.ebuild 2503 BLAKE2B a81b75b1a20d6f30c58fc4043d8af09c632b2fbce0f478cb37a9d7afe7c984c943f22d649e7d6c7e30d8df093f35a6a938104a5c4152d735bea6be3d566e9efb SHA512 49b4e0034e36a97c9456a9ba78319017082501130b9d2e9ec7e336a96f1f7023d93112f8f3f4caec6994ee2a645b03675feca1194d0dbaa029679cf6ab006ea0
-EBUILD icu-layoutex-68.1.ebuild 2508 BLAKE2B 9e75c5ef13e8930c2c690ca9957f0613a4b738b40769c2cec3f7c0d184c2e6dbcf8d7eb48977b9e4e362013d8d6efe81ced246be054176ef03a5f733519c942c SHA512 bf0d113999c2e0f8b24bdddf604fe75815c1fc6a9aa9ef183b52a6797b27c547168a35d6ddec57d0f0ded491141296e9ed5e3edef48c36026b7be6bb54b69ad9
-EBUILD icu-layoutex-68.2.ebuild 2508 BLAKE2B 9e75c5ef13e8930c2c690ca9957f0613a4b738b40769c2cec3f7c0d184c2e6dbcf8d7eb48977b9e4e362013d8d6efe81ced246be054176ef03a5f733519c942c SHA512 bf0d113999c2e0f8b24bdddf604fe75815c1fc6a9aa9ef183b52a6797b27c547168a35d6ddec57d0f0ded491141296e9ed5e3edef48c36026b7be6bb54b69ad9
+EBUILD icu-layoutex-68.2.ebuild 2503 BLAKE2B 5c5bfd5784eda15dc43f871c4f2a178a4860e2af59bb1a535e3e0029d988c2084567d92e464b084efbbff0c0fa149b69b1e23f0c8ae662f50e44d7f9cf32bb2a SHA512 bdf1ef449aca671bdad889d213183b6e9c02be1b23af916f1db8d3a3f256442bcb770dc809bf881777593743aae6904e30f8b872d74e901b3c31e8b09b2e7037
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
deleted file mode 100644
index a1af526c5f82..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild
deleted file mode 100644
index 62b585924f49..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
index 62b585924f49..1f04fa03da06 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 3d74aa3c8835..7500501700d2 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,10 +1,6 @@
 AUX icu-64.2-darwin.patch 2136 BLAKE2B 3c54a15e351a97f7c423128e493ed158e56191738b988eb449138c7c88f30c9781286a6a490278f1d8dc59b99725370e63757329bdf180604ec4e9d2b47684ce SHA512 69f281d363c8dab769701a6715cd21ec6958376fa7bac3b5eb5b8b3dc011a354fb439905d68e6aad67129eb01b8a306b184b94a86a5401ded1fe0002e8cdaa5b
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
-DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
-DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
-EBUILD icu-67.1.ebuild 3315 BLAKE2B dcb2d548021a1c55939a07f367349a801e2600d1323ccc9ee7c9c00b1a4ae6f5ea4da331c920c06ab906a0b1317beb29eb86765044d002ad2b5c70b650bd569c SHA512 34fd8c7fc822e576c8d3aae1d1b463cde9e8915acca93ce49caf1425934782cd0514b9774dee8a179cf0225052219177801db1b7023663e6797ea7f8f8d44f49
-EBUILD icu-68.1.ebuild 3366 BLAKE2B e6ab7ff08c0d194e374133330212164063864eec77bb458f594ac6f856db83d781c998216e75981ff250ba42b07468f44df67602a6d0814251ba7342bdddd6c9 SHA512 eda409b0a7c3901a21d0ea32dcdf7e8f7d14fef7b9eaf901cd4217ab1935ce88efe4fabed71a997098742ad673dd0fc6c9e21b0f64199c379734abe7dfc5471b
-EBUILD icu-68.2.ebuild 3365 BLAKE2B e5e22de9d9126844338597ef581bc80b840f86813753d9ef0946916e84ffe13f21fe4bc5617cd632ebf95c7edb8bcfe7778420491edc5319388a2dbc0a9e5fc8 SHA512 e04ea79dfb5862e4279e6d19ba4aca5f845ab40a0dec54a8cf81cb1426959dffe72106461ca04a6ab4f821f241f71a0fe42d9d7e4c8020ba4aa59b5b86febaba
+EBUILD icu-68.2.ebuild 3357 BLAKE2B aa921f24f95618a71cb108e071fea15fc55f554d2711247e4b60ef6663fb1db052b8979b8dc7496e9de211e18da16ff9e58e8099f6f783da5a665e5ee73dee57 SHA512 747c30dfa5f5e6ca3b18ac9e28ce3de0ce0d7e33f3fa277aaad030c1f792ad8fee0c0a8fd6a9f7c1d3c9cd6171097679ce44cca8891614d8e1d526a7c884c787
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-67.1.ebuild b/dev-libs/icu/icu-67.1.ebuild
deleted file mode 100644
index 82238a8b671b..000000000000
--- a/dev-libs/icu/icu-67.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://site.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-)
-
-src_prepare() {
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-68.1.ebuild b/dev-libs/icu/icu-68.1.ebuild
deleted file mode 100644
index eb3e9df49f3e..000000000000
--- a/dev-libs/icu/icu-68.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://site.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
-)
-
-src_prepare() {
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-68.2.ebuild b/dev-libs/icu/icu-68.2.ebuild
index 3b071c67bd38..99bd99420a7b 100644
--- a/dev-libs/icu/icu-68.2.ebuild
+++ b/dev-libs/icu/icu-68.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 4421cafe5489..d464485e7251 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
-EBUILD inih-52-r1.ebuild 844 BLAKE2B 5d880d7a1ea62da459a61af8c12c078d2e848f8895f2f79335896b9ac0d79303af56c24eaf0d3c771b6ca032866712ef395134d5db5e53912656a9b2ae68eaa4 SHA512 03206b8707a8ad71e7f6a3fb5d5738030ae526abcd0518e0507cbb9e46db11d863b71c697eb34a1a0b4d38391792a4e29d358219b5e1c68f0d48144e40f11164
+EBUILD inih-52-r1.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
 EBUILD inih-52.ebuild 791 BLAKE2B 09983b3a0fecbc3bc76218f7852778282568682a355c2e9644205b8adb0efc6b4710e5611b08c674359ac828aaf8c7797788601f0eac5ac3b9b5854cc2f9a0c8 SHA512 6da75c3754efd2dcce6e7c24e13ed14880427d6291d2d01e35c15b4d67b1ffb2c2a9d390ed4b0c73e56b1593c1d31ca0ed91914543aa150b2bcc3eaacf8a8ef9
 MISC metadata.xml 505 BLAKE2B 304fa736140ec6ca3461e31f5629e22857ece165c6f16dbe4632211f05d2d4a45c2c9b5f35e858e81ae0d11cbdc87b3fc4977b55c0032cc115b65df43466242f SHA512 09e559083c0457cc38eae5efe344d035fbbbc860ae1ba268462ff821a467712d599c3cf7292d44f9a9f0d99674b0a1d6650e199147403686e859ee20d8fcdba3
diff --git a/dev-libs/inih/inih-52-r1.ebuild b/dev-libs/inih/inih-52-r1.ebuild
index 59b118e7afe5..288ada671b4b 100644
--- a/dev-libs/inih/inih-52-r1.ebuild
+++ b/dev-libs/inih/inih-52-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="inih (INI not invented here) simple .INI file parser"
 HOMEPAGE="https://github.com/benhoyt/inih"
 
 SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 3c729b381bc7..25f03363b9c0 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,6 +1,3 @@
-AUX json-c-0.14-cmake-static-libs.patch 1818 BLAKE2B 4058bdcf64d59510e4f7dbbf5a1aa2d36d5c3f3b094c999a09afd5739dc8e837a08fd39aeabee72cc9845a11e3923c1271b51a5273bc8850a1a75e1e832ff094 SHA512 23c8fb64ca5c7e97ab060d5e984c264fb9ff508fa08dd99c362a52fbd281c488c5d84e0426ea386c87afc87cf0d0d68ab3618d86a599f9be6e4fec1c158b75a2
-AUX json-c-0.14-object-limitation.patch 8789 BLAKE2B 39e307143dd439cf5eafebc86851c98cb09ab45ad33f4e30b7d1f88a4d22feebbe9a472d8b856de15d9a5f66f5b3b1a507958a5594967ac1e44b130ef62f91de SHA512 6a3ad442ae56082f6c76dc53aa9d9d5eb77743a33f1ed28fc49df6e445932f5809d094feca8d1f4cf90f6fe6516e902de99c481bab0527e2fa382ab008dbdd7c
-AUX json-c-0.14-security-fix.patch 4830 BLAKE2B a8df7709bd2924946b038ed724a2e764c3786b8a35ad6b4e5736561901fd7c24f46f0f48b7dfb1b21395fa0fbda24e2bbbfd81d50f9c8de52908022c766df744 SHA512 3a3c31890ef7c1d6cca4f2bcd1b76602165471ab03d55c85da8c821e82e1985fa33ebbc35fa63350158fba5ba517f45f0a895f0624da97bb6f7caab0e4eec7b6
 DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
 EBUILD json-c-0.15.ebuild 1085 BLAKE2B 8bea9975427aef1949cd491bb742c3c76d0d2ec2cba6aad7960d13b79bff0a6572ca8921700f3f2313ddfb6af4977e742f1b4d03701e54f560393595e9a57552 SHA512 15d69aff34c431107940a7fe6bd0604749230ace47df22f616bd430ad8ec44f5f5ea40edb36449977064c1132e268427e04138fe002567722733c3201f0f7290
 EBUILD json-c-9999.ebuild 1015 BLAKE2B 4d5baa21396b2dba874146c9d8bba5bfbbd69174f7a5fa0a2f2f298c1a7118a72ba3a9f73470b697b20e6fb922dc84933b7aceaf471c2ce6ac20dd0d701b0a15 SHA512 28b3443e3b9bc50d0bb36c6fe1b98d68cc00899f5facbeb421c2e98178255d9d61e105731837ff21cd05f725095b34963121dc09e1147ec08480d30ca8fe4aaa
diff --git a/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch b/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch
deleted file mode 100644
index 3913fc320bca..000000000000
--- a/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba692ff..fc2edff 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,6 +65,7 @@ include(GNUInstallDirs)
- include(CMakePackageConfigHelpers)
- 
- option(BUILD_SHARED_LIBS  "Default to building shared libraries" ON)
-+option(BUILD_STATIC_LIBS  "Default to building static libraries" OFF)
- 
- # Generate a release merge and test it to verify the correctness of republishing the package.
- ADD_CUSTOM_TARGET(distcheck
-@@ -383,7 +384,7 @@ add_library(${PROJECT_NAME}
- set_target_properties(${PROJECT_NAME} PROPERTIES
-     VERSION 5.0.0
-     SOVERSION 5)
--
-+list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
- # If json-c is used as subroject it set to target correct interface -I flags and allow
- # to build external target without extra include_directories(...)
- target_include_directories(${PROJECT_NAME}
-@@ -392,7 +393,33 @@ target_include_directories(${PROJECT_NAME}
-         $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
- )
- 
--install(TARGETS ${PROJECT_NAME}
-+# Allow to build static and shared libraries at the same time
-+if (BUILD_STATIC_LIBS)
-+    set(STATIC_LIB ${PROJECT_NAME}-static)
-+    add_library(${STATIC_LIB} STATIC
-+        ${JSON_C_SOURCES}
-+        ${JSON_C_HEADERS}
-+    )
-+
-+    # rename the static library
-+    set_target_properties(${STATIC_LIB} PROPERTIES
-+        OUTPUT_NAME ${PROJECT_NAME}
-+    )
-+    list(APPEND CMAKE_TARGETS ${STATIC_LIB})
-+endif ()
-+
-+# Always create new install dirs with 0755 permissions, regardless of umask
-+set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
-+	OWNER_READ
-+	OWNER_WRITE
-+	OWNER_EXECUTE
-+	GROUP_READ
-+	GROUP_EXECUTE
-+	WORLD_READ
-+	WORLD_EXECUTE
-+   )
-+
-+install(TARGETS ${CMAKE_TARGETS}
-     EXPORT ${PROJECT_NAME}-targets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/dev-libs/json-c/files/json-c-0.14-object-limitation.patch b/dev-libs/json-c/files/json-c-0.14-object-limitation.patch
deleted file mode 100644
index ebd7ca805065..000000000000
--- a/dev-libs/json-c/files/json-c-0.14-object-limitation.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 519dfe1591d85432986f9762d41d1a883198c157 Mon Sep 17 00:00:00 2001
-From: Eric Haszlakiewicz <erh+git@nimenees.com>
-Date: Sun, 10 May 2020 03:32:19 +0000
-Subject: [PATCH 01/13] Issue #599: Fix the backwards check in
- lh_table_insert_w_hash() that was preventing adding more than 11 objects. Add
- a test to check for this too.
-
----
- linkhash.c           |  2 +-
- tests/test4.c        | 29 +++++++++++++++++++++++++++++
- tests/test4.expected |  1 +
- 3 files changed, 31 insertions(+), 1 deletion(-)
-
-diff --git a/linkhash.c b/linkhash.c
-index 51e90b1..f930efd 100644
---- a/linkhash.c
-+++ b/linkhash.c
-@@ -582,7 +582,7 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
- 
- 	if (t->count >= t->size * LH_LOAD_FACTOR) {
- 		/* Avoid signed integer overflow with large tables. */
--		int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
-+		int new_size = (t->size > INT_MAX / 2) ? INT_MAX : (t->size * 2);
- 		if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
- 			return -1;
- 	}
-diff --git a/tests/test4.c b/tests/test4.c
-index bd964ec..fd2f3be 100644
---- a/tests/test4.c
-+++ b/tests/test4.c
-@@ -3,8 +3,10 @@
-  */
- 
- #include "config.h"
-+#include <assert.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "json_inttypes.h"
- #include "json_object.h"
-@@ -24,6 +26,30 @@ void print_hex(const char *s)
- 	putchar('\n');
- }
- 
-+static void test_lot_of_adds(void);
-+static void test_lot_of_adds()
-+{
-+	int ii;
-+	char key[50];
-+	json_object *jobj = json_object_new_object();
-+	assert(jobj != NULL);
-+	for (ii = 0; ii < 500; ii++)
-+	{
-+		snprintf(key, sizeof(key), "k%d", ii);
-+		json_object *iobj = json_object_new_int(ii);
-+		assert(iobj != NULL);
-+		if (json_object_object_add(jobj, key, iobj))
-+		{
-+			fprintf(stderr, "FAILED to add object #%d\n", ii);
-+			abort();
-+		}
-+	}
-+	printf("%s\n", json_object_to_json_string(jobj));
-+	assert(json_object_object_length(jobj) == 500);
-+	json_object_put(jobj);
-+}
-+
-+
- int main(void)
- {
- 	const char *input = "\"\\ud840\\udd26,\\ud840\\udd27,\\ud800\\udd26,\\ud800\\udd27\"";
-@@ -52,5 +78,8 @@ int main(void)
- 		retval = 1;
- 	}
- 	json_object_put(parse_result);
-+
-+	test_lot_of_adds();
-+
- 	return retval;
- }
-diff --git a/tests/test4.expected b/tests/test4.expected
-index 68d4336..cb27440 100644
---- a/tests/test4.expected
-+++ b/tests/test4.expected
-@@ -1,3 +1,4 @@
- input: "\ud840\udd26,\ud840\udd27,\ud800\udd26,\ud800\udd27"
- JSON parse result is correct: 𠄦,𠄧,𐄦,𐄧
- PASS
-+{ "k0": 0, "k1": 1, "k2": 2, "k3": 3, "k4": 4, "k5": 5, "k6": 6, "k7": 7, "k8": 8, "k9": 9, "k10": 10, "k11": 11, "k12": 12, "k13": 13, "k14": 14, "k15": 15, "k16": 16, "k17": 17, "k18": 18, "k19": 19, "k20": 20, "k21": 21, "k22": 22, "k23": 23, "k24": 24, "k25": 25, "k26": 26, "k27": 27, "k28": 28, "k29": 29, "k30": 30, "k31": 31, "k32": 32, "k33": 33, "k34": 34, "k35": 35, "k36": 36, "k37": 37, "k38": 38, "k39": 39, "k40": 40, "k41": 41, "k42": 42, "k43": 43, "k44": 44, "k45": 45, "k46": 46, "k47": 47, "k48": 48, "k49": 49, "k50": 50, "k51": 51, "k52": 52, "k53": 53, "k54": 54, "k55": 55, "k56": 56, "k57": 57, "k58": 58, "k59": 59, "k60": 60, "k61": 61, "k62": 62, "k63": 63, "k64": 64, "k65": 65, "k66": 66, "k67": 67, "k68": 68, "k69": 69, "k70": 70, "k71": 71, "k72": 72, "k73": 73, "k74": 74, "k75": 75, "k76": 76, "k77": 77, "k78": 78, "k79": 79, "k80": 80, "k81": 81, "k82": 82, "k83": 83, "k84": 84, "k85": 85, "k86": 86, "k87": 87, "k88": 88, "k89": 89, "k90": 90, "k91": 91, "k92": 92, "k93": 93, "k94": 94, "k95": 95, "k96": 96, "k97": 97, "k98": 98, "k99": 99, "k100": 100, "k101": 101, "k102": 102, "k103": 103, "k104": 104, "k105": 105, "k106": 106, "k107": 107, "k108": 108, "k109": 109, "k110": 110, "k111": 111, "k112": 112, "k113": 113, "k114": 114, "k115": 115, "k116": 116, "k117": 117, "k118": 118, "k119": 119, "k120": 120, "k121": 121, "k122": 122, "k123": 123, "k124": 124, "k125": 125, "k126": 126, "k127": 127, "k128": 128, "k129": 129, "k130": 130, "k131": 131, "k132": 132, "k133": 133, "k134": 134, "k135": 135, "k136": 136, "k137": 137, "k138": 138, "k139": 139, "k140": 140, "k141": 141, "k142": 142, "k143": 143, "k144": 144, "k145": 145, "k146": 146, "k147": 147, "k148": 148, "k149": 149, "k150": 150, "k151": 151, "k152": 152, "k153": 153, "k154": 154, "k155": 155, "k156": 156, "k157": 157, "k158": 158, "k159": 159, "k160": 160, "k161": 161, "k162": 162, "k163": 163, "k164": 164, "k165": 165, "k166": 166, "k167": 167, "k168": 168, "k169": 169, "k170": 170, "k171": 171, "k172": 172, "k173": 173, "k174": 174, "k175": 175, "k176": 176, "k177": 177, "k178": 178, "k179": 179, "k180": 180, "k181": 181, "k182": 182, "k183": 183, "k184": 184, "k185": 185, "k186": 186, "k187": 187, "k188": 188, "k189": 189, "k190": 190, "k191": 191, "k192": 192, "k193": 193, "k194": 194, "k195": 195, "k196": 196, "k197": 197, "k198": 198, "k199": 199, "k200": 200, "k201": 201, "k202": 202, "k203": 203, "k204": 204, "k205": 205, "k206": 206, "k207": 207, "k208": 208, "k209": 209, "k210": 210, "k211": 211, "k212": 212, "k213": 213, "k214": 214, "k215": 215, "k216": 216, "k217": 217, "k218": 218, "k219": 219, "k220": 220, "k221": 221, "k222": 222, "k223": 223, "k224": 224, "k225": 225, "k226": 226, "k227": 227, "k228": 228, "k229": 229, "k230": 230, "k231": 231, "k232": 232, "k233": 233, "k234": 234, "k235": 235, "k236": 236, "k237": 237, "k238": 238, "k239": 239, "k240": 240, "k241": 241, "k242": 242, "k243": 243, "k244": 244, "k245": 245, "k246": 246, "k247": 247, "k248": 248, "k249": 249, "k250": 250, "k251": 251, "k252": 252, "k253": 253, "k254": 254, "k255": 255, "k256": 256, "k257": 257, "k258": 258, "k259": 259, "k260": 260, "k261": 261, "k262": 262, "k263": 263, "k264": 264, "k265": 265, "k266": 266, "k267": 267, "k268": 268, "k269": 269, "k270": 270, "k271": 271, "k272": 272, "k273": 273, "k274": 274, "k275": 275, "k276": 276, "k277": 277, "k278": 278, "k279": 279, "k280": 280, "k281": 281, "k282": 282, "k283": 283, "k284": 284, "k285": 285, "k286": 286, "k287": 287, "k288": 288, "k289": 289, "k290": 290, "k291": 291, "k292": 292, "k293": 293, "k294": 294, "k295": 295, "k296": 296, "k297": 297, "k298": 298, "k299": 299, "k300": 300, "k301": 301, "k302": 302, "k303": 303, "k304": 304, "k305": 305, "k306": 306, "k307": 307, "k308": 308, "k309": 309, "k310": 310, "k311": 311, "k312": 312, "k313": 313, "k314": 314, "k315": 315, "k316": 316, "k317": 317, "k318": 318, "k319": 319, "k320": 320, "k321": 321, "k322": 322, "k323": 323, "k324": 324, "k325": 325, "k326": 326, "k327": 327, "k328": 328, "k329": 329, "k330": 330, "k331": 331, "k332": 332, "k333": 333, "k334": 334, "k335": 335, "k336": 336, "k337": 337, "k338": 338, "k339": 339, "k340": 340, "k341": 341, "k342": 342, "k343": 343, "k344": 344, "k345": 345, "k346": 346, "k347": 347, "k348": 348, "k349": 349, "k350": 350, "k351": 351, "k352": 352, "k353": 353, "k354": 354, "k355": 355, "k356": 356, "k357": 357, "k358": 358, "k359": 359, "k360": 360, "k361": 361, "k362": 362, "k363": 363, "k364": 364, "k365": 365, "k366": 366, "k367": 367, "k368": 368, "k369": 369, "k370": 370, "k371": 371, "k372": 372, "k373": 373, "k374": 374, "k375": 375, "k376": 376, "k377": 377, "k378": 378, "k379": 379, "k380": 380, "k381": 381, "k382": 382, "k383": 383, "k384": 384, "k385": 385, "k386": 386, "k387": 387, "k388": 388, "k389": 389, "k390": 390, "k391": 391, "k392": 392, "k393": 393, "k394": 394, "k395": 395, "k396": 396, "k397": 397, "k398": 398, "k399": 399, "k400": 400, "k401": 401, "k402": 402, "k403": 403, "k404": 404, "k405": 405, "k406": 406, "k407": 407, "k408": 408, "k409": 409, "k410": 410, "k411": 411, "k412": 412, "k413": 413, "k414": 414, "k415": 415, "k416": 416, "k417": 417, "k418": 418, "k419": 419, "k420": 420, "k421": 421, "k422": 422, "k423": 423, "k424": 424, "k425": 425, "k426": 426, "k427": 427, "k428": 428, "k429": 429, "k430": 430, "k431": 431, "k432": 432, "k433": 433, "k434": 434, "k435": 435, "k436": 436, "k437": 437, "k438": 438, "k439": 439, "k440": 440, "k441": 441, "k442": 442, "k443": 443, "k444": 444, "k445": 445, "k446": 446, "k447": 447, "k448": 448, "k449": 449, "k450": 450, "k451": 451, "k452": 452, "k453": 453, "k454": 454, "k455": 455, "k456": 456, "k457": 457, "k458": 458, "k459": 459, "k460": 460, "k461": 461, "k462": 462, "k463": 463, "k464": 464, "k465": 465, "k466": 466, "k467": 467, "k468": 468, "k469": 469, "k470": 470, "k471": 471, "k472": 472, "k473": 473, "k474": 474, "k475": 475, "k476": 476, "k477": 477, "k478": 478, "k479": 479, "k480": 480, "k481": 481, "k482": 482, "k483": 483, "k484": 484, "k485": 485, "k486": 486, "k487": 487, "k488": 488, "k489": 489, "k490": 490, "k491": 491, "k492": 492, "k493": 493, "k494": 494, "k495": 495, "k496": 496, "k497": 497, "k498": 498, "k499": 499 }
--- 
-2.26.2
-
diff --git a/dev-libs/json-c/files/json-c-0.14-security-fix.patch b/dev-libs/json-c/files/json-c-0.14-security-fix.patch
deleted file mode 100644
index 69a0bc754716..000000000000
--- a/dev-libs/json-c/files/json-c-0.14-security-fix.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 099016b7e8d70a6d5dd814e788bba08d33d48426 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Mon, 4 May 2020 19:41:16 +0200
-Subject: [PATCH 1/3] Protect array_list_del_idx against size_t overflow.
-
-If the assignment of stop overflows due to idx and count being
-larger than SIZE_T_MAX in sum, out of boundary access could happen.
-
-It takes invalid usage of this function for this to happen, but
-I decided to add this check so array_list_del_idx is as safe against
-bad usage as the other arraylist functions.
----
- arraylist.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arraylist.c b/arraylist.c
-index 12ad8af6d3..e5524aca75 100644
---- a/arraylist.c
-+++ b/arraylist.c
-@@ -136,6 +136,9 @@ int array_list_del_idx(struct array_list *arr, size_t idx, size_t count)
- {
- 	size_t i, stop;
- 
-+	/* Avoid overflow in calculation with large indices. */
-+	if (idx > SIZE_T_MAX - count)
-+		return -1;
- 	stop = idx + count;
- 	if (idx >= arr->length || stop > arr->length)
- 		return -1;
-
-From 77d935b7ae7871a1940cd827e850e6063044ec45 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Mon, 4 May 2020 19:46:45 +0200
-Subject: [PATCH 2/3] Prevent division by zero in linkhash.
-
-If a linkhash with a size of zero is created, then modulo operations
-are prone to division by zero operations.
-
-Purely protective measure against bad usage.
----
- linkhash.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/linkhash.c b/linkhash.c
-index 7ea58c0abf..f05cc38030 100644
---- a/linkhash.c
-+++ b/linkhash.c
-@@ -12,6 +12,7 @@
- 
- #include "config.h"
- 
-+#include <assert.h>
- #include <limits.h>
- #include <stdarg.h>
- #include <stddef.h>
-@@ -499,6 +500,8 @@ struct lh_table *lh_table_new(int size, lh_entry_free_fn *free_fn, lh_hash_fn *h
- 	int i;
- 	struct lh_table *t;
- 
-+	/* Allocate space for elements to avoid divisions by zero. */
-+	assert(size > 0);
- 	t = (struct lh_table *)calloc(1, sizeof(struct lh_table));
- 	if (!t)
- 		return NULL;
-
-From d07b91014986900a3a75f306d302e13e005e9d67 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Mon, 4 May 2020 19:47:25 +0200
-Subject: [PATCH 3/3] Fix integer overflows.
-
-The data structures linkhash and printbuf are limited to 2 GB in size
-due to a signed integer being used to track their current size.
-
-If too much data is added, then size variable can overflow, which is
-an undefined behaviour in C programming language.
-
-Assuming that a signed int overflow just leads to a negative value,
-like it happens on many sytems (Linux i686/amd64 with gcc), then
-printbuf is vulnerable to an out of boundary write on 64 bit systems.
----
- linkhash.c |  7 +++++--
- printbuf.c | 19 ++++++++++++++++---
- 2 files changed, 21 insertions(+), 5 deletions(-)
-
-diff --git a/linkhash.c b/linkhash.c
-index f05cc38030..51e90b13a2 100644
---- a/linkhash.c
-+++ b/linkhash.c
-@@ -580,9 +580,12 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
- {
- 	unsigned long n;
- 
--	if (t->count >= t->size * LH_LOAD_FACTOR)
--		if (lh_table_resize(t, t->size * 2) != 0)
-+	if (t->count >= t->size * LH_LOAD_FACTOR) {
-+		/* Avoid signed integer overflow with large tables. */
-+		int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
-+		if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
- 			return -1;
-+	}
- 
- 	n = h % t->size;
- 
-diff --git a/printbuf.c b/printbuf.c
-index 976c12dde5..00822fac4f 100644
---- a/printbuf.c
-+++ b/printbuf.c
-@@ -15,6 +15,7 @@
- 
- #include "config.h"
- 
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -65,10 +66,16 @@ static int printbuf_extend(struct printbuf *p, int min_size)
- 
- 	if (p->size >= min_size)
- 		return 0;
--
--	new_size = p->size * 2;
--	if (new_size < min_size + 8)
-+	/* Prevent signed integer overflows with large buffers. */
-+	if (min_size > INT_MAX - 8)
-+		return -1;
-+	if (p->size > INT_MAX / 2)
- 		new_size = min_size + 8;
-+	else {
-+		new_size = p->size * 2;
-+		if (new_size < min_size + 8)
-+			new_size = min_size + 8;
-+	}
- #ifdef PRINTBUF_DEBUG
- 	MC_DEBUG("printbuf_memappend: realloc "
- 	         "bpos=%d min_size=%d old_size=%d new_size=%d\n",
-@@ -83,6 +90,9 @@ static int printbuf_extend(struct printbuf *p, int min_size)
- 
- int printbuf_memappend(struct printbuf *p, const char *buf, int size)
- {
-+	/* Prevent signed integer overflows with large buffers. */
-+	if (size > INT_MAX - p->bpos - 1)
-+		return -1;
- 	if (p->size <= p->bpos + size + 1)
- 	{
- 		if (printbuf_extend(p, p->bpos + size + 1) < 0)
-@@ -100,6 +110,9 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len)
- 
- 	if (offset == -1)
- 		offset = pb->bpos;
-+	/* Prevent signed integer overflows with large buffers. */
-+	if (len > INT_MAX - offset)
-+		return -1;
- 	size_needed = offset + len;
- 	if (pb->size < size_needed)
- 	{
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 29ecfcea58bc..ebb2693f1364 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,3 +1,5 @@
 DIST kdiagram-2.7.0.tar.xz 681384 BLAKE2B 0736525293200873cd10f8752b76b8589324e5e1fa9a89c6e3a1c30fc8d82fdf627cb5043eac5633858574a027c9f3ec98549c69718636c8a65cd4199acd7c9e SHA512 d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d
+DIST kdiagram-2.8.0.tar.xz 691044 BLAKE2B c7b3a4ba992192b34d8cda90bb50a495cb88f8456ca1109140841fd885b710ce1193868be148c25f813c2d26dd7365999bdd8572e66163f0d5d1a169afc3e448 SHA512 d981bce4feeb65038772125e5af1c096537ec87991fdb93d9a91dd5c9f089b1001647c8a63b209683a67b2d7b3aadeb7dd6279261eefaf6b6e046d0ab72723ec
 EBUILD kdiagram-2.7.0.ebuild 832 BLAKE2B 3387718914baf3dc319847459b5674ac8a8d3e93c2a027da009beaf47bc6551d1749f62647caca93feda84d722ac5fba0528b85d217e41761589992f82062cd1 SHA512 a2cdd3a8e297d8253dda98ab8f4812b083dfe03e4e8f5f0e76c04b5110d1dad9f251a6be1db2a2751f881d3f6cb6ab7c5e95a12238eb5c10fe6353004dc1739a
+EBUILD kdiagram-2.8.0.ebuild 863 BLAKE2B 04a039bc46d173c7e1ae64604354c766760984eb3887a1e39a8ff0c8f6a031ef7b5e80d94f55f481c9cc4272408b9159a96b9c73b3202247899b0fffe0c932e9 SHA512 12481f98888c9a5f56982bc27b8b906ff16457ca794da439b70d2d433410e4e7dbbaea04ce0f330e6171a139c041864a35e6a9803f6d57abfd660b0ea2dcdaec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.8.0.ebuild b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild
new file mode 100644
index 000000000000..f0bc2ecf78f3
--- /dev/null
+++ b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="true"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="graphics"
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
+HOMEPAGE="https://api.kde.org/kdiagram/index.html
+https://www.kdab.com/development-resources/qt-tools/kd-chart/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO CHECK
+SLOT="5"
+
+REQUIRED_USE="test? ( examples )"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QTMIN}:5
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 2747ce874fe4..ba1da002b05f 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,5 @@
 DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
 EBUILD keybinder-0.3.1-r201.ebuild 817 BLAKE2B 500039225abe33bc54414b89a56766fb76faf23aa8c29ab9ba8caea99a41b794fe98ea2f5b9432a82a9e0fc360e74f2e69fc3770860ee7a8251ab852cfda9ee4 SHA512 5df86cd1082364f1fae52d92800d5c5e1449cf72bcd7384c2c14e11cd8b571fde0b5561360f86213675f0cc1f53d3376ee21cf2a427cf2907d237f10e369946b
-EBUILD keybinder-0.3.2-r300.ebuild 1073 BLAKE2B a7201d3f21433e4b269cb62d99b5f3738541d8499da5a2a5d20ebfd45a87dd00b630e6d05d8f31e620f0092b32fd4c2dc6eb87a21f6900ff16a5cd4017df722c SHA512 8474b7abfaa53072e284d92b311783c1ce8effe12f74cc45c5d42a9e7392fb856eb1ef77580ed11ad2f09c7b935193ba84d7130c48e03f9a27ad136878f989d5
+EBUILD keybinder-0.3.2-r300.ebuild 1077 BLAKE2B 9cab94a818634862846cace83ccfbe75194a84a574c2e85e22c61d5a7a394cb71304c208f663487c95ee074280f311babfbe74ebe4109240154fb2fcf0d220af SHA512 a23945953fa2f08d916e132f0e52129dabd294f21be6003544b6c9bd4a42272b70d9f793b7ebdc033df0ff02a4e0bb1ac4b2415e0eca5754d2c8cc9fa2b12f17
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
index bf14d929fcf1..dae197934270 100644
--- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P=${PN}-3.0-${PV}
 DESCRIPTION="A library for registering global keyboard shortcuts"
 HOMEPAGE="https://github.com/kupferlauncher/keybinder"
 SRC_URI="https://github.com/kupferlauncher/keybinder/releases/download/${PN}-3.0-v${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="3"
@@ -16,12 +17,10 @@ IUSE="+introspection"
 RDEPEND="x11-libs/gtk+:3[X]
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXrender
+	x11-libs/libXrender"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	introspection? ( dev-libs/gobject-introspection )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	local myconf=(
@@ -39,7 +38,7 @@ src_install() {
 pkg_preinst() {
 	# remove old symlink as otherwise the files will be installed
 	# in the wrong directory
-	if [[ -h ${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0 ]]; then
-		rm "${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0" || die
+	if [[ -h ${EROOT}/usr/share/gtk-doc/html/keybinder-3.0 ]]; then
+		rm "${EROOT}/usr/share/gtk-doc/html/keybinder-3.0" || die
 	fi
 }
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index aac2cf127c40..54ca1916e55b 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -2,9 +2,7 @@ AUX 1.12.2-shared_nowide.patch 4647 BLAKE2B 602e72f4265a803b715b8605c1dee3ccec9c
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
 DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
-DIST leatherman-1.12.3.tar.gz 816018 BLAKE2B 6245284856613b99df2ce412e497ba69fe1a016a82ca5ea7f78ba591dc287e2daef051214b303c1cc463efb537354a01ad6c57688f244382b3843b8bfdad6f3e SHA512 83f785ba7c69032e2c9c7f2fb07aa5c100ed9e1a81c88ece19d7a96647b9a46927b99fd7144c08d697863e44553f00adf6bc4964f45e900809827956c0949b36
 DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
 EBUILD leatherman-1.12.2.ebuild 1329 BLAKE2B b182be7c996de4512b7b0861ef56e9465fc797890b483b9d168d2cf3fb2059ad7de01b6bdd94fdff8e63b1cab2fb544f71fed9442d8aa9e43ca1876babee05aa SHA512 438ec777192a6fa0bb1ac13e3312cd463b968f6747f3277b7d157a995a666bcd560772d47dbb4a07057f3cc6d8f848df33bf86ac472044c7d502e102b94aca9a
-EBUILD leatherman-1.12.3.ebuild 1332 BLAKE2B ef44d85818f9602a06e77e6a252ee88fae8dad1f5dd36c546efddc48c824d99f7e5bc4caeceb08b5be4496743cb52a76951e20a72e2f93f699079db1b7fb0d88 SHA512 a52e48a284895fe447e2783fa302f4b64eadaa69025699193d69dcb1db8c27dcb48b7b1dbc69f55cd9ec1cf454cbfffeee2d9075d9b1aa2271e6048d24b1fb6a
-EBUILD leatherman-1.12.4.ebuild 1334 BLAKE2B 40cf1da626e9e0b83b91c76d432fa7793456406335f8029cafc96010a396d2e880b40dd6515daa7ab5e74955562d517415907fd8764c2daccf7b5f3d8a89053f SHA512 d99e688e02e91b83edffd89b08f722ea43b1b927545f24a994e380450f257a555c35587a0d8834fbcaa8941e9c826283a4877d61d8767c203fe66a5d589253c4
+EBUILD leatherman-1.12.4.ebuild 1332 BLAKE2B 5f942d7a5e371eddf3312d28202ec9d4fdb93a9c524ec76081915641d776085dcfd77d66d13693369e94b3e57ffc7a62b1b9f1175ebfd02fade4b256323a45b8 SHA512 a49db9d2f88f8834e8641e67d005e1116bc02fa3c1dee06e97bca0b05f598c6283d0ac2ccfb46fd3f344f687a332950b498ecc11d84bc7aa0b514b8d234d0c47
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.12.3.ebuild b/dev-libs/leatherman/leatherman-1.12.3.ebuild
deleted file mode 100644
index c7ed781d77ee..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.73:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.12.4.ebuild b/dev-libs/leatherman/leatherman-1.12.4.ebuild
index 75314013d9e0..75654f08f0ec 100644
--- a/dev-libs/leatherman/leatherman-1.12.4.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.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
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libbase58/Manifest b/dev-libs/libbase58/Manifest
index 6dfbc9053545..8cda1ebf17d6 100644
--- a/dev-libs/libbase58/Manifest
+++ b/dev-libs/libbase58/Manifest
@@ -1,4 +1,4 @@
 DIST libbase58-0.1.4.tar.gz 6718 BLAKE2B d192499920a11f95037a46eb02b19ea5cbedefb14541c22a7c72568a69f4ccc0ed9223883fffd3337f12b718f3e39f11888c95a87b1fec481829989bd73dc741 SHA512 9b36fd7308a1a5486d77cb9baeeac49669a2c823998ff0885fee0757d6fca374f796b743e69af087e20a58b95556faf6c48106e034c09879937d96dae5fc7ac9
-EBUILD libbase58-0.1.4-r1.ebuild 1321 BLAKE2B 86feda0a11a1f7964ab39092be08a26afc51c16854e688faf0ed103e1f609663452fab56a2243f1d6636879a52d9f385d5f84ae4f9fb55cb1ce6882bf9b56baf SHA512 5cbb5289d381c926cf4ad21316cc960772f8e6c547267888ea18ff8d836edd0ac2fde746c0899c295e5814f610930cc2dcbc9d1e118ccfec4ea71cfc7dead783
+EBUILD libbase58-0.1.4-r1.ebuild 1320 BLAKE2B 0133aad6697023b82efac4246b710e8be8261acec736d84207d4f9db669cdc1518ce48cd2d46599c074967397495359d6a56bc3f906c9f266a3ac34f95b00c35 SHA512 805064dcec7ffdef9421196e1afe1d972f773c7a3e788567e1d326e3c14c639b04449657d45cf2939b4d0410250b40e923890b358d353204b22804df4b4c8e99
 EBUILD libbase58-0.1.4.ebuild 559 BLAKE2B 9194cf1bf7f8f6e5b065f5043efaabfee32e6de8f7d743c45189e9149224b677ef6e310649d1c5b17fd53d715882035514426d5b417ae786d8840b4bd91acab2 SHA512 9d7718bf1cb20eb8208adff9bb65e44ef32ca0804ce403a8868c4ad47b333ca50498d84a758bc0f4c06070a2120ed0896b30106911e9cd8c7d8dcd3e511916f0
 MISC metadata.xml 546 BLAKE2B 82f8c4af155cefd55772b9bb93f62ca3ac7bebe9ce51519066ee9439293933490d279a6f0da794d1b39fc7eb1a8bf04ccd911685a11f262549957fcc2bdca476 SHA512 2944ee72c2a86666eba6ad64046c1d607b816ab8f2a0c1f3cc38805ebd4c95f9169afc4438a523298ac0a0038c2d9ea702571fb407fb7bf87d8e8fcb3b2ea052
diff --git a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
index 375b6956313a..e849059b854e 100644
--- a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
+++ b/dev-libs/libbase58/libbase58-0.1.4-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
@@ -25,7 +25,7 @@ src_prepare() {
 	eapply_user
 	eautoreconf
 
-	# NOTE: Needed because test suite uses srcdir instead of builddir to set PATH and for 
+	# NOTE: Needed because test suite uses srcdir instead of builddir to set PATH and for
 	# multilib support.
 	multilib_copy_sources
 }
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index 74ea478b3d58..485469e795e2 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 1360 BLAKE2B dffbb62f33b520a77a96bc3496bc2eb42cac38999d1d2da743b8faff93d7e1638ce023ad65d749e658e66502ac01f7cbf613cce3f20bf8bc5859b13dd2237bef SHA512 b149a4ccb15e81f023df0cf99e25f2510cb13dd1c2235e2cac8807b695de087961505366b134eb3f3f4da84a43c7a46c4c8e4ebfd20d6b60d1a23bb3391e9435
+EBUILD libcbor-0.8.0.ebuild 1364 BLAKE2B cbf1b5bd2f9700bf4d3d243a6d28aa0da24002a387b04b87e0820e88697c98319bb1bc0bfa6d4c314d10261c9094d7b7977ea080c26be3a22ea6d859c072750c SHA512 ba7b1ad054595106fad5ae9b79f37c80ba8ba4e6aeb18df6fe83c1c34be97a3baa593511ab19a050685e93dc14512b45dd64c6ed425fce25ee751af5b5c746ac
 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 a62fb30caa60..22bdb9b768d6 100644
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index f6cf11f1e6d7..a4c27707dfd7 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,6 +1,6 @@
 AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
-EBUILD libdnet-1.14-r1.ebuild 1484 BLAKE2B b1590fce22cfa777bceb5f6e795862fc6516fce3800ed00fbee91ce1926d18faffb5b2e385a98f6942c0e1e8ec92e95af53ee7f9c3e01e3d7643ce36c4b6326c SHA512 15fc2146d759a143b281936bc7e1c3c1e71e1959dc4354a924f9aafae8bda8b2e140234c0f23aa88c007c4ba5d12a08fabb0806998a1d8c44eb699548b8e91fd
-EBUILD libdnet-1.14-r2.ebuild 1555 BLAKE2B bec848308e89e072cc5f787a54855b280e05c5c8ec94ded0ac8eb6f58bfa2f45878a4c8477fe624c428183e8a680a70a7eb602a644ad5670a54b77db00c5fbea SHA512 4cbd8d00bb5bc8178f921184b4a19f47d0129f4c8561c89464b20afa39beeab002fb5ff79faaa4ffb92f3089ee186c6ec2373c25934bc7f8d6b0a9927289a77c
+EBUILD libdnet-1.14-r1.ebuild 1507 BLAKE2B eb9ee645e730d556f4d98a7594d6b77a49cbfa3917770a7718c58e89f215bcb44e8bacacc7b3b3cd45ece51ab40ae66683858e83ca5041352d8c96c5d99f64e2 SHA512 114246816a9eefe03680226b112b8c78db9b5971e6bc630f8cba2782086c6e9d12a410432fc791c340c8dd0f9e72c695b71921fdeb837125cee42d19ba7bd9bf
+EBUILD libdnet-1.14-r2.ebuild 1557 BLAKE2B e567b6c3738ee0a42a9d17600a86e26849d089e33b5b08dba10b8ff52d1262155d619ad9fe61ba6f9699263387d6fcc4d384471b068e289cc21158a821cca84a SHA512 0c012a8f5d91c1f32dd085f2e22e3214831cfa5d74c5920eea90fb4d745e72957f954d26e9cd49b4ed0d3519998603dd09eb651dfd885f441a26bd5ce435b856
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
index 3d34dd007371..58293f3bd059 100644
--- a/dev-libs/libdnet/libdnet-1.14-r1.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 AT_M4DIR="config"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1
 
 DESCRIPTION="simplified, portable interface to several low-level networking routines"
 HOMEPAGE="https://github.com/ofalk/libdnet"
 SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
-LICENSE="LGPL-2"
+S="${WORKDIR}/${PN}-${P}"
 
+LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="python static-libs test"
-
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	${DEPEND}
-"
-RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
 DOCS=( README.md THANKS TODO )
-S=${WORKDIR}/${PN}-${P}
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.14-ndisc.patch
 	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
@@ -48,7 +47,7 @@ src_prepare() {
 	eautoreconf
 
 	if use python; then
-		cd python
+		cd python || die
 		distutils-r1_src_prepare
 	fi
 }
@@ -62,7 +61,7 @@ src_configure() {
 src_compile() {
 	default
 	if use python; then
-		cd python
+		cd python || die
 		distutils-r1_src_compile
 	fi
 }
@@ -70,9 +69,9 @@ src_compile() {
 src_install() {
 	default
 	if use python; then
-		cd python
+		cd python || die
 		unset DOCS
 		distutils-r1_src_install
 	fi
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libdnet/libdnet-1.14-r2.ebuild b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
index 2938cfe88b82..f6b3a828e42c 100644
--- a/dev-libs/libdnet/libdnet-1.14-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 AT_M4DIR="config"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1
 
diff --git a/dev-libs/libdnsres/Manifest b/dev-libs/libdnsres/Manifest
index cf076a56ab17..acb569c41f2b 100644
--- a/dev-libs/libdnsres/Manifest
+++ b/dev-libs/libdnsres/Manifest
@@ -1,5 +1,4 @@
 AUX libdnsres-0.1a-autotools.patch 887 BLAKE2B 5141d50a6e55f1ed49471dab5ab328352731e271514e37a40d65cffd0e7f1b9024155ff5be1e181950a2b355e618645e041c7c84fd7f574c96d0565f22d101db SHA512 f482017f43bb7bd7050c6246d7d48e4126f33c63fd7b0bf83ba12f9ddbfbdfbdf67d7ac5b6e55668edb462c8af8d5402f4b57cfc1a2aa8e4bb75440d2c02b11d
 DIST libdnsres-0.1a.tar.gz 360583 BLAKE2B b2b3befaf3910b46e826c17ec36bb90271b334a58ef5d02bd69ad0aa8643e2fe8ab4a1f86b59e4fbd1d41ef2c01ea01995b07b68922740fc86bee3d207bcc65d SHA512 d6b1c248a99eeaea3524ee8af01dd31ba507179a69ffb313a167611792084d5efc99fe6462a63480932faa3493b01c3c43fc7575dab6aaade885583bee006f67
-EBUILD libdnsres-0.1a-r2.ebuild 568 BLAKE2B b40135288d0292a597e889576f0a282e58782f5da79b845a618d2710b86ff5c938b51c34d36cce6709fc30c9ad496a89d61efe71eccc1699a9ad41c3843404d9 SHA512 c2148ee736a8dffba14ada064dcc2664f782c201c40f4295c1cbaec9e978218ee5003f6976646755985cf379c1ab6f42f78273cabe90323fd40ae03176097c23
-EBUILD libdnsres-0.1a-r3.ebuild 724 BLAKE2B db22d8f5918385653bc1102ba9af157ad00888535ba30304e33332bed01db78045abb9edfb3ec7072b763230a85b29d9b80156ed2292fe9acf48aa31f2ac8ed5 SHA512 5f9a1c9a1f891dc4afba99314f14fc394962a31fd8e6eff9c2123a0a2076a1b76b2a843ef5ac2db9583fe2852c6734a24050e107f34087d4ce74bfea1d3ce5c0
+EBUILD libdnsres-0.1a-r3.ebuild 721 BLAKE2B ad8f42115ac31afcd49276f86de6ef034cb747ae6db884257aa5fe613895bf529557fe666ee37c10c269342bc5ce6b61bd1da24db7e7607a0b4634df65acabad SHA512 82016a6f97ba2ee207fc66b51631e4ea4dfbeb1a8109bad1e2c953371e3bb80a401460f3929cedd28990658d9f59f66e5fa5a75b77d28601fc8c106cb348cc87
 MISC metadata.xml 821 BLAKE2B fe11fa4932033b3bdbe6f7b55495aca6a1ff5d745fa65654d42ac0dc3b5992a7cf91cc705113b4a2c3ea04c0384589cd4f75c2c4d496b834db664313be30f711 SHA512 cbb9306da8e15d166cdd09e0bf6e8a07030a12d45bda18d56f45b18e439c6e199963189047fe846dd59b33408de6a101ecb1a7c251cfb5dc5c34cc313a741134
diff --git a/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild b/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild
deleted file mode 100644
index 2811d24833bf..000000000000
--- a/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A non-blocking DNS resolver library"
-HOMEPAGE="https://www.monkey.org/~provos/libdnsres/"
-SRC_URI="https://www.monkey.org/~provos/${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-DEPEND="dev-libs/libevent"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-autotools.patch"
-	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
-}
diff --git a/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild b/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild
index 99fa34502800..2ecf5403264a 100644
--- a/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild
+++ b/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.monkey.org/~provos/${P}.tar.gz"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="static-libs"
 
 DEPEND="dev-libs/libevent"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index effcc7f46d8b..83dc42dc0f00 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,7 +1,9 @@
 DIST libebml-1.3.10.tar.xz 69488 BLAKE2B 0133ec041cd2f2aad9e8870d56c4ec8f3f3cbf745cbdbc2470f02f94152b8a236626d804bf8c42c00c6a49cc5e7d691394cffe0a888f26100ff67bd03a6ae2d7 SHA512 c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49
 DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085ba8d97d2f133e3f5da292527f0f31fc5aa3978c21f82262698877a76670b4b120e915573d339751234c4450c7 SHA512 a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e
 DIST libebml-1.4.0.tar.xz 69944 BLAKE2B 240c18d53ec73cc42b4cbed507e95ecc5ada0bd65e826b3f2e930bf6d4055097606b920c433ee5786112894ea6ad0eac229e784501ba14563274b7605dab01f5 SHA512 db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230
+DIST libebml-1.4.1.tar.xz 70096 BLAKE2B 9b4ae80bcc2184f018c25f1a644acdf9e79c5ebc6576a5b91ccd93286c0cab2d99a80e3d2aefcbc6210724d9e05229c9ea19e0def85ba28f7e1aa059ba52925d SHA512 ddde4975546ba4214cd22db37992c2b5130a731da1b34e171cca8d7f39d981b9643a193d06be1a1e156b316e51419d1eb4c1cfe40511a52b245152e69a507e4b
 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
 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
new file mode 100644
index 000000000000..78a7706a34dc
--- /dev/null
+++ b/dev-libs/libebml/libebml-1.4.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Extensible binary format library (kinda like XML)"
+HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
+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"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=YES
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libee/Manifest b/dev-libs/libee/Manifest
index cfc2ffb099bb..b142fef30558 100644
--- a/dev-libs/libee/Manifest
+++ b/dev-libs/libee/Manifest
@@ -1,3 +1,3 @@
 DIST libee-0.4.1.tar.gz 357116 BLAKE2B 121f7cbdea1978889b6fcc24bfabee0c64276bf060265578e7b8067d217ee6371dc6e49b7ac733aeb0abe57bcc1df1552029831bd7a6bc6b42431d3166f90037 SHA512 810cbca8077c975b045b6761de22642708b3555aa8959c17e6be3f3865612642176762ca4def09274a6291256608f11b5833bfaaa25ba0d66f71d0dee6f594d4
 EBUILD libee-0.4.1.ebuild 640 BLAKE2B e6ef5dfd7b87ab0f43bdca4ca591a145b5d5e72003338f62ffb7d6cbd86b4155116ec9aaae749534a6b4363d3a18ac69e60fed46cd857fb74bc4c7457b39f0b9 SHA512 e6309f5ea159a198ff2549fd7ab2cdc8db35c1367a580c9395b1353825e77abe1071441e7eec8a5fb6ae7c654540ea06a4b56f8162ee21e0438b124002077fb7
-MISC metadata.xml 325 BLAKE2B 8ff60b6615474ad4ba1def5ef9a89cb98f6e3a54dbb6d45cc3c2b0c6ea815ec71c7d04fb08c9af4cc116b95197dd28c49c9e65b5f43be636751bd1d1abeb909a SHA512 0118c80631e3be45293d46bf16ca279033edd35365dc332f155880fc328a7310272da11ada63de212283d77c7f051bda648520a4b9c0600f67675da4015d14a7
+MISC metadata.xml 247 BLAKE2B a2bcf5e739389b86b06c14dcceedec9b4e5cf32b1bc54b42bda3a77462fdefd0aca09d9e2bd0304fb7f7f1bf5d4ae62101c7e562d64492bd6a8a939807f3409b SHA512 0698b4825e20138ea6cb2d37a83fae01de2729b103c5954cfdaa2f36fb7f52d63807580d8739765b9c256fb49c3635592c3e568c4990f3c21676e1d3899a509b
diff --git a/dev-libs/libee/metadata.xml b/dev-libs/libee/metadata.xml
index 6393d294e803..50302c87e65a 100644
--- a/dev-libs/libee/metadata.xml
+++ b/dev-libs/libee/metadata.xml
@@ -5,7 +5,4 @@
 	<email>whissi@gentoo.org</email>
 	<name>Thomas Deutschmann</name>
 </maintainer>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/liberasurecode/Manifest b/dev-libs/liberasurecode/Manifest
index 9c71b79bc39d..870b6d6f4dbd 100644
--- a/dev-libs/liberasurecode/Manifest
+++ b/dev-libs/liberasurecode/Manifest
@@ -1,5 +1,3 @@
-DIST liberasurecode-1.6.1.tar.gz 209761 BLAKE2B 94c26cd49e3181a02908c5379dec69da4e37501c7c0123e63d368c3c19b72f344f2246bfabfa5e7e0aee547f6a746ca5aa1f72ff4370c975425d68abe00c07ed SHA512 7d0fa00b12bc561272573f4425bdecab3c2f0f40914f50adfd471b464232047de70036f4cfbda5f93f843afbfc60ecc0afb40705bb772453c4956565083bb2d0
 DIST liberasurecode-1.6.2.tar.gz 210331 BLAKE2B 174141a26872ce1cb57feaeed071f8b0740810a73ec4683e2661f908fc0d58264a01ed87e7a71185f0607cbd23ebfe0141154e082dd96478712f776b764a2631 SHA512 027def96275eac67b32b2e3e7144f3042acbcafe5b27b353eb5944e73b55d34931a11324018f131b2acb381007cc79e31a5afd7390fdc517ed30ee592d6f90d5
-EBUILD liberasurecode-1.6.1.ebuild 800 BLAKE2B 82bd50037625ee3c7996499f8deef9d2a50616fd1e2449c2ecb4332aae83a1e0f131270b0902fe1bac99a8b664362c23b34a759633ce04ce2a84958e88ea291f SHA512 adacdf535eba63f5e187634b95e3d0b4f0e4875a756ce8dd81c832693d24d9581f395351165ece4684c3b960fb804e57838a14ec8f341ef861a2fe56f8f8693e
 EBUILD liberasurecode-1.6.2.ebuild 800 BLAKE2B 82bd50037625ee3c7996499f8deef9d2a50616fd1e2449c2ecb4332aae83a1e0f131270b0902fe1bac99a8b664362c23b34a759633ce04ce2a84958e88ea291f SHA512 adacdf535eba63f5e187634b95e3d0b4f0e4875a756ce8dd81c832693d24d9581f395351165ece4684c3b960fb804e57838a14ec8f341ef861a2fe56f8f8693e
 MISC metadata.xml 464 BLAKE2B ca354debebf2db1768ff8cd28d88b0edeb6a57d47fad34837d04e6ad21f59e37204c85b63df08dbee14d3eae342db561a785bf00ecb2d908fc5c0112a72baa6d SHA512 1b94d0071d7670f163e28193c066b6a9f39a086051aba5e6291c0f31d56465e6cbf48798adf6fc90e08fd56121063d909bcd4aeec58547539ec72dde4210b197
diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild
deleted file mode 100644
index 04ffe4e54cdf..000000000000
--- a/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune multilib toolchain-funcs
-
-DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends."
-HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview"
-SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="sys-devel/autoconf
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--htmldir=/usr/share/doc/${PF} \
-		--disable-werror \
-		$(use_enable doc doxygen) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index a71a2df46d3c..665fe6337f1e 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -1,3 +1,3 @@
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
 EBUILD libestr-0.1.11.ebuild 725 BLAKE2B bc5b1d5478fb10f3c1bb8adab2d4eb69c82b95431a147eedbb7b1c65b262fa59d35221095f0f3f5a8212c96ffb50501e648ae6e44fcbe0badeadc479e606372f SHA512 bf44bf03be423b00bf154df8df420f0b79b1a6e8c8e6f8c367a7c6b0d8c56770c42ce2e3da94b051525b652fe25a48ad65f7aba7a9cd9c9dc339e3778523f784
-MISC metadata.xml 563 BLAKE2B fb15f2cda9e02291c5a88dc7ac002a69d4504ca2e0d496962986846ff089628064e5334688d9806bb9e3478073e8b6fecdad7ca227723c8e4b8f4c7c83ac0aa3 SHA512 4ebbbbddedbb2ee70c52c73b23ef83c0920756ead3e14d8a75afd5bc994bdeaa63a6e9255083b74bdd80da8367650544c92763e299f3f6d49c930b2f92e7c478
+MISC metadata.xml 453 BLAKE2B 5cb51e8fa066c1507a082ac7b2529f336869457e2bbee6782de3e73d97741530ce7f3d469ccd2675e86f20e03dbd9d5dbc6644725271514852d56b3beb495c87 SHA512 ef679508232cdb8cc9e7f70ed3808fadbab48325bb328539259f22b9af4fb621141fff0671ad4043cca95ca49fd84309120a8fce545e158d68aa36f4a8fbd486
diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml
index ac4e1be046fa..d170345c1f46 100644
--- a/dev-libs/libestr/metadata.xml
+++ b/dev-libs/libestr/metadata.xml
@@ -5,10 +5,6 @@
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/rsyslog/libestr/issues</bugs-to>
 		<remote-id type="github">rsyslog/libestr</remote-id>
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 06fe7e1facde..0cd518fb64d3 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,6 +1,4 @@
 AUX libev-4.25-pc.patch 1237 BLAKE2B 6f07e9a8614f136dc44c099a49aafc57e78d107820f23319a9d498d7e6919c01d0e77cb0649e84913d8453341191f48ab6c1b71138c11005400e1936a2efd6e2 SHA512 4cb83f6ab869028a023f1dbc5be4d29b7bd5a703ce12e0cfa54305682e83a5e4a357c19b95dc1b8236e9dc2fe5e2647f42547983a1a3cff3eaf8049b297306bc
-DIST libev-4.31.tar.gz 565540 BLAKE2B 59df831f4cfc9a615234d8d5b845a687ea41cc27aea84698e213bfacb79d8f9862ff776c2bf3888495cc303daf3b9073a1f660eaedb1437ebaa6d678c8ef0873 SHA512 c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18
 DIST libev-4.33.tar.gz 569527 BLAKE2B 8a6cae25ffde10b24a5bbf084f6a8559af326b37acdbdf47dda34b7f0c7955f3ebd26958594444a574cfa3e2b4011e4be93ad2bd994ffd4c094bf36620e67ba5 SHA512 c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b
-EBUILD libev-4.31.ebuild 1115 BLAKE2B 7a3f6741829cf0f2b7493ca45fc05c83a8fecea39281f2248af752aeea6f5b26a056b5b4c0ee8212952a25c4e23be2002af3c3ca53a8ff6c0f2953ccd564dc21 SHA512 5ad0a8e1fd871d212d2925e7ac8bdbebfb4f673da40346c72768876c4c592c0e80486d589a5f7615c4626e8495fb287eb6c9dc86c1109a6c08b8d673042de4b7
 EBUILD libev-4.33.ebuild 1022 BLAKE2B b9855ec8b68f6f01610941f9fae592343f3f745c161bbaf33d8a4af00b914fc66821b4310db4b9903f4288fd973f7e5eb98373e85c7766885938227747ad6496 SHA512 9c211867e69c3d8805a7c873972a8162e1105922ec61f92bea2cb9f096178677335b1127a892a050f0f3dd47b5e7dc01ee632d8281ff43185c653ec168c3df21
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.31.ebuild b/dev-libs/libev/libev-4.31.ebuild
deleted file mode 100644
index 1fddcfefdde2..000000000000
--- a/dev-libs/libev/libev-4.31.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="A high-performance event loop/event model with lots of feature"
-HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
-SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
-	http://dist.schmorp.de/libev/Attic/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="elibc_glibc static-libs"
-
-# Bug #283558
-DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changes README )
-
-# bug #411847
-PATCHES=( "${FILESDIR}/${PN}-4.25-pc.patch" )
-
-src_prepare() {
-	default
-	sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-maintainer-mode \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -type f -delete || die
-	fi
-	einstalldocs
-}
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 9cbf1edcec59..e1b1cc1671b4 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 926 BLAKE2B 01119027dab909094c4de51c0fb379172cc8ba108fca3e5d5545ee4d3122d54b850b52fdfc782262ac51a24d9455ebd531de63d2f492b4bc8dcf8e1020659b6f SHA512 8ca20903bcb8b2f39865580bebc282b71d6fdc62db780102140576d99f6959e5121f88fc6bd1e874b8a0dfe83c2c6cbae3613c41a17cbf8debd20e07b143c97a
+EBUILD libfido2-1.5.0-r1.ebuild 930 BLAKE2B cf13a87979df2b351e4ee731c6faca845c3ab3c579461bd559d69d352b8755b7a1c68cc775270adab7318e99bccde68284e485112662379745d60f1d1e4b9732 SHA512 c1b66d54635ab61e99fbbfa7c91299c89eb26deec4749fe51aae1c7cf851ce02f562db4c7ff6ab5c4cd222d517deac1e69bc1841f50bbf0b653d225bb2a1daff
 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 a45c99bd27b1..e836ac168b5d 100644
--- a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index c3f8a06ebaed..fee25162031b 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -2,6 +2,8 @@ AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
+DIST libgcrypt-1.9.0.tar.bz2 3183699 BLAKE2B 6969d8dc8e3b5f0a1816c007b78bbf2e2a6f50f8f4505535294d87de6eb54dc4f0e3d0bbe95bab43feb070538a2956801f28d745a233880e769e24fb9061e02f SHA512 cdfb812f387e4bac598fe5701eafb284ee326cce6b20fce08b92262e371e0d95a1ab529dfa3232255869e27787c102aa817f7a70bd5fbbf8d490025a01e40429
 EBUILD libgcrypt-1.8.6.ebuild 2305 BLAKE2B 54b27480c598a2c43a618208ea3c36adb458d471cfa5ec74bb118cfe8047342a5bcd0515c42e7b7379f9f689f2f967147672ba3fc70d811a044d75582fee2085 SHA512 ce11a1cb68d57067b0365ece1f837bea23f3b421646fdc98675a8cc8afbaf3aa8aecfe05bac6e0099a3b22e7045aba16b2d26016c1be5370f44927f882e6a6a8
 EBUILD libgcrypt-1.8.7.ebuild 2314 BLAKE2B 75f2be613a43bac7d4aad315dbc557814be8c1e06a841433ab0e4eb3d90c15236df92b9e9412fe2c59e5f5578681ff4712637aaa2232ff4ad02053bc7e1fe216 SHA512 c8cd40b09d2c2f328e3b8dd8ee151336a3578d5cd23d5e650948f944731e8d5fe6e74ac6a26d3623514bfa981ed9fb57cde3b841c44816736ec7f1d7b03a46bc
+EBUILD libgcrypt-1.9.0.ebuild 2310 BLAKE2B 38536a3f44725fb1590bfdcdb6511a8c8d281ea726cdbf6ef38b520a74381db8ac6931e2547c783d6a32041fd3c56fa14941d57dcfd08faee8c22a5fdee0522a SHA512 f9b5d6914b5971c95bbec95f6c74d574959d386b1f3b80efd8315511c855ab19fde2c7185087e3f109e07ca90380f711f7c7ae180bece4ea8a023ed1c6298091
 MISC metadata.xml 425 BLAKE2B c695b3057b3db22d3daf36a70b3d6000b55dc9c7fd4ca3a6274dde8a03c15976152bb7c44e6c4f01c11a98122f646c9660fd6d9e8d5b36041b02d63b27c97d0d SHA512 5d7c60f28eb813fc9f758cc6aaa07fb3a1e3ebe77ce89dba2f8fc56907a6d17affa252e92a2c2edd302ffa83d8d54f64f1b002411c418aae8e9cd3de19458c14
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild
new file mode 100644
index 000000000000..0dda6fc59ce2
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		--enable-noexecstack
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		$(use_enable o-flag-munging O-flag-munging)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index 7ef73257b266..15057f473d39 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,5 +1,5 @@
 DIST libgpiod-1.1.1.tar.xz 302672 BLAKE2B 71c624f923118b7c50970beb737f2c813d1470a34f95798f9ce821211e16f15e2a3fd42d0054e25529ddc9846725c0935d915784f22d2509b844a0bac61b66b6 SHA512 a1d902ce8e1c94d5550ade2fb4889ebe28b86523505b92ab907f58c8e6903eaf07ce16278126989462956b879f591b42ddd50fbc4537c1b5af459f23a4dfc12f
 DIST libgpiod-1.4.1.tar.xz 314936 BLAKE2B 8949c4a96f69a83a479f5951e6f1eb8fee56db700e72320131c365a5d736a48700fb42b7ecc2b676cec54887eaa650075f45ec1f0b803de914958cefd3863db8 SHA512 2a9c58a46fb3c2e2dd15cc4ba52f589b44e5ae4547226eeb68a8e5bea6292d38aaf0889cc639e0979e12e129bb944bb42d9258f10292f59d074660e7c2d56d04
-EBUILD libgpiod-1.1.1.ebuild 755 BLAKE2B bfdfa328997d74ebc185549bedc6c8311d05904141a123e1aa7d1e701d10e0cb18d308fb196ef01ad6d2a8db4b82bb196bc1776a16f6135edc94b0975b0eb972 SHA512 9055950c40a6878e36082387dd6ddcd460ad8c0fe14cc258f391d68e555244c74493441ae845a81a6d1c707ea950063478a4408cd8f6be323fa5decfa9bd3b52
+EBUILD libgpiod-1.1.1.ebuild 745 BLAKE2B 16302de3b0b62f5c84d24590f82dfa55a299b23d282cc5c98e50976e56ea3bb8a1a503d47bbc375b940b04a4684ab97a07d8a03889dc10d3e946a0e0f832f2b9 SHA512 67b61b49911d95cc9a07f5acfd75c84d38ede56a1a4deaac41942dc0704c3c6e515f30130b341ec4fc9463b122882852356f91f290580a44dd5647b564d849bd
 EBUILD libgpiod-1.4.1.ebuild 1174 BLAKE2B ae3c9b4aa9a1b7be5760622542e774e5ee3edc3b3bc27b1dac76b5894d25004681c2f4f63bbe01514f94d00e88a61d8e7fb428545fc6b44d158f57781ffd7c69 SHA512 f50de223950d38b7c4bc587686a9a8d26f2e28bbe8251a162899d398f6410cb54418d172e49946a36526a2cfba205d0e5a24dc4d3114bb67f39e2faa497ec286
 MISC metadata.xml 343 BLAKE2B fc70cc41ae2770c509013c4d1a5d8aaa441b6d52d1259b9e2f5cb2e8928e146f5451e399d1345901e88b1b488095990e8c9f9b296b43b38f91b38a22b3507c90 SHA512 051b47fa59f992bf8347e89d17eecf645d4a20457ac1d9db931982c9efa4a61d777df4e215a790d518ac77b2baa7497862fc724fbd581dccfa404bfd232d749b
diff --git a/dev-libs/libgpiod/libgpiod-1.1.1.ebuild b/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
index 3435a33062ce..a933e767983e 100644
--- a/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.1.1.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=6
@@ -7,7 +7,7 @@ inherit multilib multilib-minimal
 
 DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
 HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
-SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.1.1.tar.xz"
+SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 5e751a861d1e..33c31a16e4a4 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -2,5 +2,7 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
 AUX libical-3.0.8-icu-68.patch 1630 BLAKE2B 9622dac19255518e5a4d1876d6c27613f0d765cd7968ce148e42cf3cb13cbd3439d6d802352101a4b3a07f4a8f82b7e151f2239fbe8d792ab536707db75347dd SHA512 98b0b685676e7aa54e49050ec8adab4bb6cd3827fcd3977c156d841a527268cb47b3227852036f4bb195931ae8295fa6761bc96f4d4042f059193ab6f75aa27a
 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 2331 BLAKE2B f6e81653753042d4972d6cb79a887c430b7f8d5c46b06dc3d351f30e715b2e54231cb06f86d36d653b5bf730916f2196f8766b068cfa84eec8da257f193b9e6b SHA512 275f3a0a521c4225f14f680018968690443e51a33533f4b769557d23e9c76ca7e3cbcb740444955752b5f0bd7b3c8dd91f0eb0515a20ad73f57a76604be08503
+EBUILD libical-3.0.9.ebuild 2265 BLAKE2B 0042ba8853fa0736c8d4db5badd0a8c7e5d8b7b4d91ab2f7368541a95368241cf3b1fc1a600e7989eebd490d091017f52add482bfe15b7b7a042f859c0fdfb81 SHA512 f9d7306fc2c907e7e50be4dc38a4f1a99ff32e8829f909daf3e68752254de41cbbd6fd57afb0d9c2393893a8093bd734febaea7b4832be81e310ee96940c663d
 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
new file mode 100644
index 000000000000..9ab9acb8a1be
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="berkdb doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	introspection? ( dev-libs/gobject-introspection )
+	test? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
+"
+COMMON_DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/timezone-data
+"
+
+DOCS=(
+	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DICAL_GLIB=$(usex glib)
+		-DGOBJECT_INTROSPECTION=$(usex introspection)
+		-DSHARED_ONLY=$(usex !static-libs)
+		-DLIBICAL_BUILD_TESTING=$(usex test)
+		-DICAL_GLIB_VAPI=$(usex vala)
+	)
+	if use vala; then
+		mycmakeargs+=(
+			-DVALAC="${VALAC}"
+			-DVAPIGEN="${VAPIGEN}"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile docs
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 2dd672231692..9a3cc9329736 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -2,6 +2,8 @@ AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef
 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 1403 BLAKE2B 95f1152cdf7bde258b549d08646f2de4f85c97af540f70b79e381143ecba366765fcc2971c9f5f983d435ffc47e6084a39bb9e13a75e0104f45f0af43c394904 SHA512 e4c17f8feab615a290f4495d03f24ca7a6a2371643476634165fc7db69abaa57185487f8477ddece2f60ec8e54cd2e000166e170320590dd1a3ce75b2bb0c73f
 EBUILD libjcat-0.1.4.ebuild 1504 BLAKE2B f33fc66ee9966ff558c850486215578cd4c978386116e1d90e09ec0a4da7afd2f7a3f2918c8836c5390c13fbe615f01733a221781d342fbea06e2c261384b993 SHA512 eac1a3a2d01bab6e6a960c7ae4f968d08a0ca2fc6705fe4742c1b1383673991c97d0e582460f37f9a075ec8f50e21f5e83dce49443cb34c8942b137b11477aee
+EBUILD libjcat-0.1.5.ebuild 1448 BLAKE2B 01972a7d383b2077148d84e41bbd35697295cdc3c67d6efd27e78747fd2fc4082e0ce0605775222768c942e772dbf70beceddae88425c7e08958bc3c612e240c SHA512 dc037c6cd8ff41d40ba9e39ce6b98c56766684e9cae4569834d3ea7887a60a8ae7e175b964cb01abce4d3899eeaee89e02d068d907b7af865041bce56117e0ca
 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
new file mode 100644
index 000000000000..39c78a2315e6
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="xml"
+
+inherit meson python-any-r1 vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files "
+HOMEPAGE="https://github.com/hughsie/libjcat"
+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"
+IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	pkcs7? ( net-libs/gnutls )
+	vala? ( dev-lang/vala:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	gtk-doc? ( dev-util/gtk-doc )
+	man? ( sys-apps/help2man )
+	test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	xdg_environment_reset
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gpg)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use pkcs7)
+		$(meson_use test tests)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 7a11337338a5..4a8428f11be7 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,3 +1,3 @@
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
 EBUILD liblognorm-2.0.6.ebuild 1521 BLAKE2B 82fd6c76b213a4b25da93b4861f5ec3031cea456a475c0b05bbbe68030488999ef6837b09d9fbf998c53e93844fb077e894b6787cd062c8baec8c5a6272861e6 SHA512 6b29928192b90f1105d38327e6ed33e5441f6a5c7bcefc5f65752379a8aec5016c5caed4e05dac91628be09b88d459133bdd48c4eeb5e24768d2cb3d0fb900fa
-MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
+MISC metadata.xml 472 BLAKE2B e24cba421828553b07e63523915569f3d14267154fec093e0efd8aa7d7ccf374de0fc11d7e97760e40fc84702ef7e3b59c4a25ca79ad3c5dea8ecc00b7fb387a SHA512 6396b38b17ae624fb4836c838119a40784a5473debeec8c933997aacd40b97e224a361892b5f20e9fc173c85e20d45a9721fcae485357d6775dad68a822339ab
diff --git a/dev-libs/liblognorm/metadata.xml b/dev-libs/liblognorm/metadata.xml
index a1c7f71484f8..8295fa140c03 100644
--- a/dev-libs/liblognorm/metadata.xml
+++ b/dev-libs/liblognorm/metadata.xml
@@ -5,10 +5,6 @@
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
 	<slots>
 		<subslots>Reflect ABI of liblognorm.so.</subslots>
 	</slots>
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index e2b4c7400cf0..d7c7f9caa14b 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -6,6 +6,6 @@ DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e5134
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
 EBUILD libnl-1.1.4-r1.ebuild 1143 BLAKE2B b6c7360702f8650059cfa0fac3d940f6f1ac5d19a3fe1015b5503413985678dc11d103bb44ff54c6baeda28a988ff0b6b589410585b3f06ecc6918a1a20798f1 SHA512 b0325f64a8aeabb950e1e18c2252be1df3e83903eac265d0e66b96f366ead7604971af680a4c4fef85f5474eb0f1a1e0c123566ee71e99456702bca5bfaae261
 EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
-EBUILD libnl-3.5.0.ebuild 2388 BLAKE2B bd9f4dc4c521c7da0196259f9339c201ec47f5d6e77f22df1905adec346456c1100ca604b5356d565278a36f941a0d8ab8b177bd748528f0939ec54ae5a7396a SHA512 fbffd9ec3a895c710f1d7661d12f3017d54bc25f1b1e38226dbbb94d14859fab776d1c7c21aa9607235f7455409800b9fad018061539be8244c8411f66d116c9
-EBUILD libnl-99999999.ebuild 2429 BLAKE2B 2eca6e27b7712ffd35e72df536ddf2740ef67f4af222d55f8db5fdcb4ac9046ff7545207869b71754d17e9302e0f3c8f59a61bb5f54ecd4d26bfb8319975a647 SHA512 72d03036db53aefcc25ff84ec27dc1f83f5f703f2f80196c45ab0d60a164f088c5a1bfe024404620739ae7b1e2270ee9b27db6ca8b4960f3b3eef73d7eb7f736
+EBUILD libnl-3.5.0.ebuild 2381 BLAKE2B 0704e6bb948dc7792df4f1251cf6e97a324edfd599c69b303fea407e14bc97cfd7471e69a0180841057cd498adcb320b5b53bb08ba386f7cc64940dad3572b62 SHA512 e1b27ca4792496bb2ae3c85c6ccd1366f2d40f3b2d1624ff0d7efa6531b34cdc6b1fd6754b6efc1c96fc89f485bde71b10b372d0dbd2481f9101e1b3d758fe0f
+EBUILD libnl-99999999.ebuild 2426 BLAKE2B 5c9e8ba540ee94771bfe6dccab74e259e4846370894661acdb5b9246679e1daf7c4d7896fb6b68785e7cefd17a4fe86c6800dfaf5607a925f2f50eefd491c7d9 SHA512 5e8871f5fe5296e6f3018993a6e2c5f91d16b9d50d74a8ab05371fc409d5fbe3747410619a807fbffecf69b085bede1b63a0f31a8a3dd062f6e01aa4f91d81b0
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index b59acf1f18f4..e94fa798a8f1 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.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_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1 libtool multilib-minimal
 
@@ -13,34 +13,25 @@ LIBNL_DIR=${LIBNL_DIR//./_}
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
 HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
-SRC_URI="
-	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
-"
+SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
+S="${WORKDIR}/${LIBNL_P}"
+
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+debug static-libs python +threads utils"
 
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	${RDEPEND}
 	python? ( dev-lang/swig )
 	sys-devel/bison
 	sys-devel/flex
 "
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-DOCS=(
-	ChangeLog
-)
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-S=${WORKDIR}/${LIBNL_P}
+DOCS=( ChangeLog )
 
 MULTILIB_WRAPPED_HEADERS=(
 	# we do not install CLI stuff for non-native
@@ -103,5 +94,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index cf078de887a5..b90a505c18e7 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -1,38 +1,33 @@
-# 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_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1 git-r3 multilib-minimal
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
 HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
 EGIT_REPO_URI="https://github.com/thom311/libnl"
+
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS=""
 IUSE="+debug static-libs python +threads utils"
 
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	python? ( dev-lang/swig )
 "
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-DOCS=(
-	ChangeLog
-)
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( ChangeLog )
+
 MULTILIB_WRAPPED_HEADERS=(
 	# we do not install CLI stuff for non-native
 	/usr/include/libnl3/netlink/cli/addr.h
@@ -48,6 +43,7 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libnl3/netlink/cli/tc.h
 	/usr/include/libnl3/netlink/cli/utils.h
 )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-99999999-2to3.patch
 )
@@ -107,5 +103,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index b694616d4e42..ed2a0d9a2966 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,5 @@
 DIST libqtxdg-3.5.0.tar.xz 73248 BLAKE2B 0e587e640abda9cdf55cbeac270382386be2bc26b291bb9f655d845acb381b7f65048d213039a6e7ae9cc5d03fa29911bc2277140524d73f0e005745759a39b6 SHA512 014407a3dc869dd324c3840d54c0aa4565a2f69f147b172548458dee69d33474d9c2ebf50112d1ef7e36ed0aea0fb055f8e03901314230a6c55a84808bd52653
 DIST libqtxdg-3.6.0.tar.xz 76028 BLAKE2B 138f0f8bf9889c7f6aa0d4016c52d4c7745a9f3b34b53babba5d0be457485157d66884395488d4e978ba953332696b977bb60c1d04b6b0a53086ab7f3b0b4492 SHA512 8574bb6834c0a44c983e906c3d84fb5cfd6e2f40ec2ac70f4998ec5fe213aeb0d4439ff294f56c1988cb9d1b311c4e074906ba66b21d24190a911d0e643d1a16
 EBUILD libqtxdg-3.5.0.ebuild 971 BLAKE2B ba8dcbe7eb4f8441654230ebe921ceb6e22a23fa70e825746eb32a4dd4b9326d4f4e37bfa65f1648377118d5aeac767fa73fb1d814d326a9955110e77b41ca86 SHA512 f28619a05a2a9dd692e5bb9cac66ffd7bc91807c54f7fab2e70ae49f9f64adf7e11b6823ba3b5b89f593d91905fcc48381b298e55ee7390964ab48468ce9b8b2
-EBUILD libqtxdg-3.6.0.ebuild 973 BLAKE2B 4005ae0958da2945c734fe55d764206fba52eaa9aaf8e1acd068b0884e524d789cac40f8299429e0057b3e401ccc635b34728185a23ae380fe9820e8005e4022 SHA512 b9266c040e68c033e4a0dd44f22fd074d17adec1d7ec1a298bf3d244b8547eb61942f679c53a665d12c3c8b171ca6f5b0e4012ff09939ecbcbd744f001028221
+EBUILD libqtxdg-3.6.0.ebuild 972 BLAKE2B afbe0d1dd70c92b27ccc8703c1e9200908de918c87efb18499cdde8b17731b6fccbd1c8eea166da5c0ef695a28b365efa8f50bc0cdeee99bdc2793917e9721a6 SHA512 1ccde1807b38010476ad74bc1e5b51cf0017a9d63c91dd791f062d0c6c9e92ed068b07c359725f38e2edcecb53184d2d6d64d581a35691a510da639d12d6314f
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild
index 1ba3a1afd409..e19dcfdaa137 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.6.0.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 55e0f2f9a022..7e7e93196421 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,3 +1,3 @@
 DIST libretls-3.3.1.tar.gz 431233 BLAKE2B b935cae7bdd2e2338099dbc830e2773198d5d4ed12df80b89291d0eb8ae68549e36413c79ba1373d8bce8fd857c4a291fbd9bce30c819cc182bd5b68ac7b9527 SHA512 ddb4eb7c2c7e9cbb36ced17424ea0e08863488e6b3e18cd462ccc52b2eca685b5299f79ed6ba58ad4da2d742b61fa4857109a19137a1ee4c6cfdb48463080f4a
-EBUILD libretls-3.3.1-r1.ebuild 644 BLAKE2B e1ea03a77574bb68e56b1af5dacb61ec543392fe75c7440e81bfac6df7903c0a068086238456eeb3f0fa226f7f287efbbcd2be0c607e9c2cee54395d5e99afa8 SHA512 a3e7bd80b16b4ebe575e4c6ed6c02e2ef9ac872a7f2e6b796204de84bf6ba8beda6d1728cf1ff44ad46d9ce35bef430984ef0fbb8035704c2a40c91dae583905
+EBUILD libretls-3.3.1-r1.ebuild 674 BLAKE2B 050bec311e70765e2adda7f26083ebb39056b79388f865cce02751d5df7a12bbb6f1b77c33928331261e879e04c2f9cab32d64b6d28c96a96813a93944527a20 SHA512 a9f9282ec7fb93b1879d0c4e9a64e05c4d68d01974fc1f1b465abdde19654f3b33d79fa41d8b13061bac69a722d7add02d167c7a381311008f51957f146e47cd
 MISC metadata.xml 360 BLAKE2B 5cc82f43a10ff14c4f5a8defdd77defdc89b74370d49775b3fa25226ff25303f3ad276a91f90f44bb1a58f4a29ea4936a9f3bf455c16190de039e407442bf596 SHA512 c250f62e9f43df69fda74d9a276f4ec7f314522ee3a7b32cee360339bebbf7c6bf63008b433e45fcc441d01d6a363f8447a38edca9243eede7e1b6146e7b3c70
diff --git a/dev-libs/libretls/libretls-3.3.1-r1.ebuild b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
index c649feda793e..2c0169fa8b56 100644
--- a/dev-libs/libretls/libretls-3.3.1-r1.ebuild
+++ b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index 2db725d4be3e..52a0e09eb4bd 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,9 +1,3 @@
-DIST libsecp256k1-v0.0.0_pre20161213.tgz 147557 BLAKE2B 078cb90c078722e2eb3b5645f9692d737c99ebfe04db5a96dcfb57bb750b31c009cd3ae46f793bb1789239be9689f6e695a5b03477eecea84f2c657d0cc7442c SHA512 f4d16fae972364fd04bfcfbaca1edde4410a7367a936f76c1e93b85ac3c9c45da58785f604a4fc14cdfb4d7a23395d2d274957ad83118e15a236dfff0d0f57dd
-DIST libsecp256k1-v0.1_pre20170928.tgz 150935 BLAKE2B f8b3408a33f36186c07cf931a8183a7a241e6418a846f4c3b248cf87e7a8b33a5a92368aa30310efadb066792eebead7fb48b4f4d902e7c8e9b4209717d7b8c0 SHA512 f480c76ba04b3d731c65227e156eb726b27da92f5dcfbd9b0a34c62e97f9b6dfd5c3fae3180b59244d0c9845fdf624b05f29e097f3ac0032ab15cebc4bf00660
 DIST libsecp256k1-v0.1_pre20190401.tgz 166663 BLAKE2B 68c9fc3fda6af56452f32edeae5dcb5a92f68bc3fb39a397c532951c6392347df14ea0347bbe05cab43158512e0d9f5ea87bd8f69bece1b04440860ebb8065ee SHA512 8c4945e93cb5ff241482ba4426b25162a7ae3b26860edc10c91d06b1c396887202ad971f4d38e035828352531b87fc29087a12b675e43da44f23c9ea3b6c0cc8
-DIST secp256k1-v0.0.0_pre20151118.tgz 125884 BLAKE2B 7a4fc950006138d04d8d3da35db24be0c568e25202c16f34f94555fde1297fba839fd114a003b5510693de3386de22166c6f1294726fe381ae5b565cb9866a75 SHA512 3cc0a4973acf7936a7c6dc0abc37ee43ecd69e835069ed40765595d36ca597b43837b5d6f90499455599de03abfc775d7c9d019d26216b79b03dd6dc53a73e19
-EBUILD libsecp256k1-0.0.0_pre20151118.ebuild 1387 BLAKE2B 8cd207c8547e7ca9098072bb793e27e340a9898c47ef90c62bfca5201831a7404f3fa3691d53360c1316cdb378a018e95439cfffc3540a3d91f24514ec47e100 SHA512 8ce20517b338647743f06ecfbf2ffe4f681955e1f9fa4bb5650dd69d6645f495c7035d125f1a0c9d5b8af9e46fc66a8f652f3ab7ccd4b719d8ce5133ff5c30ce
-EBUILD libsecp256k1-0.0.0_pre20161213.ebuild 1551 BLAKE2B 389dcae1dfa6f1f1fe5dddb1948deda3f6d73d7d2144bf2ebbab1589d9e872ad7c0579e54868c60c436bcaf24496e8e5efd49f357f22a06027ce7c127665e5ba SHA512 93270a2b843211feeb8821e6f7c7d009b4ed563b3c8fc6076c75ec841017968570bb031e99f3b8564e6681a872111cb6cb5e277b525b7c60839018d5b1f40197
-EBUILD libsecp256k1-0.1_pre20170928.ebuild 1589 BLAKE2B 05817723585615dcc740d329e994459fb79a8e7f0da83d9cfbc8323f16a08617bfcfa2dbe9ec224f4f2acd01f30d0d5cc3f0c3e88c5de0546754626fd8fd03e1 SHA512 2b9b370c3cf5439e00043b7b559e7a11941511acd2c66ab93fe68b5f875546306b90c2280eec69888898973277fef53ff8361840e099e7662a1f508e3cee3ffb
 EBUILD libsecp256k1-0.1_pre20190401.ebuild 1577 BLAKE2B f1472ea251a7f43a7c6a96aabcfcf34481d55b1f43afaca01293326c1d19cb0debf9d9a258250b6f045060d4827ada3b6f0644f2029e1d37ef7349833136dbc1 SHA512 ac2c63c0db252ca605ce4d2f99de32a66ffd24d6658eb23692d5380f02507e754b2135c5de562dcc98c689c32eea8edb85b6976ab3cb5c9814088f3e9cf5e8ac
-MISC metadata.xml 945 BLAKE2B 7a69755c3d1c70ed97958a6597821b2d35175bdb8a396bccef731a9da250a4b8b4a14fb9f28df076b265db72f96cf5d75c3892449bc7bc3f320c69d5d8e79c19 SHA512 f90780064a7b48ef4d9ad70fb20f61ee2ff62508c396bd79f157d2790becacd833d035cc9bd7719aec29acd0b4a30b37426106196f1e229f86bb6eb5c2abb8df
+MISC metadata.xml 881 BLAKE2B 77c78b7dd03d160442456bc92efa22e57fbc71178eabd4c42ec419c164b78ed6001100d6d5f7c2214623ff35c07f6fb853a595e403151d1b085279af1c1ccd77 SHA512 a05019f1bc8e838278aa92bbcc9a07a230a0b32ec2af64b8f3383bfa1eb611ff6d6fb4b99ae704a6a6364a8f208fd6edaba31b4edefe39602af994593cdb8633
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
deleted file mode 100644
index af6109a499dd..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/secp256k1"
-COMMITHASH="6c527eceee7f5105c33c98dfae24ffeffd71f7cf"
-SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm doc ecdh endomorphism experimental gmp libressl +recovery schnorr test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( amd64 )
-	ecdh? ( experimental )
-	schnorr? ( experimental )
-"
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-benchmark \
-		$(use_enable test tests) \
-		$(use_enable ecdh module-ecdh) \
-		$(use_enable endomorphism)  \
-		--with-asm=$(usex asm auto no) \
-		--with-bignum=$(usex gmp gmp no) \
-		$(use_enable recovery module-recovery) \
-		$(use_enable schnorr module-schnorr) \
-		--disable-static
-}
-
-src_install() {
-	if use doc; then
-		dodoc README.md
-	fi
-
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
deleted file mode 100644
index a413717963df..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/secp256k1"
-COMMITHASH="8225239f490f79842a5a3b82ad6cc8aa11d5208e"
-SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	ecdh? ( experimental )
-	java? ( ecdh )
-	test-openssl? ( test )
-"
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( virtual/jdk )
-	test-openssl? ( dev-libs/openssl:0 )
-"
-
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-src_prepare() {
-	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 java jni) \
-		$(use_enable test tests) \
-		$(use_enable test-openssl openssl-tests) \
-		$(use_enable ecdh module-ecdh) \
-		$(use_enable endomorphism)  \
-		--with-asm=$asm_opt \
-		--with-bignum=$(usex gmp gmp no) \
-		$(use_enable recovery module-recovery) \
-		--disable-static
-}
-
-src_install() {
-	dodoc README.md
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
deleted file mode 100644
index b8f02347f60a..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-COMMITHASH="7a78f60598a6aeb635ef227ead50fb44a209c363"
-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 endomorphism experimental gmp java +recovery test test-openssl"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	ecdh? ( experimental )
-	java? ( ecdh )
-	test-openssl? ( test )
-"
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( virtual/jdk )
-	test-openssl? ( dev-libs/openssl:0 )
-"
-
-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 java jni) \
-		$(use_enable test tests) \
-		$(use_enable test-openssl openssl-tests) \
-		$(use_enable ecdh module-ecdh) \
-		$(use_enable endomorphism)  \
-		--with-asm=$asm_opt \
-		--with-bignum=$(usex gmp gmp no) \
-		$(use_enable recovery module-recovery) \
-		--disable-static
-}
-
-src_install() {
-	dodoc README.md
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index 10e5b2a45bfe..c5a0de90e4c1 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -15,7 +15,6 @@
     <flag name="endomorphism">Enable endomorphism</flag>
     <flag name="experimental">Allow experimental USE flags</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>
   </use>
   <upstream>
diff --git a/dev-libs/libserdes/Manifest b/dev-libs/libserdes/Manifest
index 7dc9f8780730..0f5a563d112f 100644
--- a/dev-libs/libserdes/Manifest
+++ b/dev-libs/libserdes/Manifest
@@ -1,3 +1,3 @@
 DIST libserdes-5.4.0.tar.gz 62331 BLAKE2B 01f06004e1af2374a9d5d039b9d0a8d53bc1e61bfd4bcc6ae1a4794553903140b73373d7e9d8799069df7369219c579b30b06dab07cbb860b4d42d2cc7e9c0a1 SHA512 3ecddf59c069a4d9ff2b8e718f700e897cad762d0858e34bb4a6a63030226b7e6fe8956431149b59678240d590a2a04f026d49c2052a22f2694fe61037f2e1f4
-EBUILD libserdes-5.4.0.ebuild 471 BLAKE2B 367cadd4237c3ed031e34c5a90c4f8bb5ac5655f196ea16447d74a7b248f47451dc1cabdec8ccadab9a471279affe2f12d3e88dab1d2fbfecca957f127d59115 SHA512 1d11d7b568dcc06997aa8d35c10c16dbbf3d64da2f89af704d5b1cc7353260c6c03d6508773446dbc857217abc2ba25910f7ce8b7842f426895c49409a81884d
+EBUILD libserdes-5.4.0.ebuild 470 BLAKE2B 56bed1a6433eaaf224b31ed18408c2f1f8147eae2c4301e1203b2c22a70a0f08d11881d84ec6277ff8fe77624073db19bdaf35ef56439fa8bd27046de6027eb0 SHA512 3c0a60684912bb2d6bd3a6f8de9b45857dcf3ca0e3f2f4003ecb797c3680f8923aa25bd9e3a0dc4b6b2b06c6da916718139b086c20b9effcfc414dbfd1d5eab2
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-libs/libserdes/libserdes-5.4.0.ebuild b/dev-libs/libserdes/libserdes-5.4.0.ebuild
index 6ad4b367cff7..de284b4ea594 100644
--- a/dev-libs/libserdes/libserdes-5.4.0.ebuild
+++ b/dev-libs/libserdes/libserdes-5.4.0.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 @@ SRC_URI="https://github.com/confluentinc/libserdes/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	dev-libs/jansson
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 97ca89ba4cee..314127892549 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -2,7 +2,9 @@ AUX libsigc++-1.2.7-fix-install.patch 457 BLAKE2B 70e53fc5931a8f11390da226297edf
 DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
+DIST libsigc++-2.10.6.tar.xz 4791016 BLAKE2B c50283da7eb3ec1b595514ac805c5fe0b4f7687ec77478c7c703ce8915ea72e065f4e7cbe53fb90c13b81d266df74cade8f5a5c0ff2dcc3880e852f02508eaf9 SHA512 7dd57c061defe323de5721d187145dcf63346311d8993eb6346a33789f26c8509c1bf5a73d55776cc5ebe85fb14d54107553a652dd42f452aed6aed20047b549
 EBUILD libsigc++-1.2.7.ebuild 1021 BLAKE2B 2065eece99aaa2b32cdc436f1937e4094c6625aedab1edd462e407a1cf3c1f4468075728be277611ceedf872adf6ed92ccad1d23e6c17f9088a9657e6408ab3f SHA512 f5683c55d985c4240e948b933e7d758f25dca68a75e3db88b5e65d16dc1061dcce3251a3016318cbe6c0ce911973c03a1f951982a45e9f471b1ac79f324952c4
 EBUILD libsigc++-2.10.1.ebuild 1585 BLAKE2B 2e7d16b0fb2a5db23d70d37c7e12eb5b19f40d308ea7141e82915f21ce2fad6b6ae059c5642d1d7e0c82f2e7fb5a5145eb22af25e60d0fd28bbdb4aec35b9fde SHA512 d44134fedf1092686305546f4795db93107b1982d5cbfcd7a21aec02e5e356f50f1f1f4579a5561788c5d9790284065b69cdfdd2704e6c167f866e184fdd4c76
 EBUILD libsigc++-2.10.3.ebuild 1584 BLAKE2B 3c1d71f2ca4107173b5d9ac89a9ccced9caca4ad9e4a30a7a21b23ba096124cf32ca7822841e987bc1775e6874e5e37ae938ddda57fd683886ce70c4c5f87544 SHA512 723c25c68909befa473004081b6c0830d05d652bbfba005faec021df5c6599234bcd9b874033edbcf064245fb299ba7f556115578f938ce5c2a0f96e3a6f93f5
+EBUILD libsigc++-2.10.6.ebuild 1384 BLAKE2B 04c117e9167bd6cfcc22837c2b85bba7768daecfe4ed1c54247e94e072aedb87d7fa5eab6d4f675a67cb457d3dabdd06d204439c9f92ba0242112f22a31f56eb SHA512 aed2014594c5f24b5175bc1f456ba45358d03e66fd3d6f215917cefd81d468ba7317aacafefa14965a64f9feba2c668124a746b3b8d087cfd07c55d6e05db1b9
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
new file mode 100644
index 000000000000..444e6596071e
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic gnome.org meson multilib-minimal
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
+BDEPEND="sys-devel/m4
+	doc? ( app-doc/doxygen[dot] )"
+
+multilib_src_configure() {
+	filter-flags -fno-exceptions #84263
+
+	local -a emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dbenchmark=$(usex test true false)
+		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		-Dbuild-examples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
+	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+	if use doc; then
+		docinto examples
+		dodoc examples/*.cc
+	fi
+}
diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest
index f8b0c6d04ce7..8faf644edab0 100644
--- a/dev-libs/libslz/Manifest
+++ b/dev-libs/libslz/Manifest
@@ -1,3 +1,5 @@
 DIST libslz-1.1.0.tar.bz2 229577 BLAKE2B d05b619d0b7b76c2777285ecaf976b75565b50c77e00a1ce042f5a28ab8d527788a75d28d70357a32ea9a98267ae621d5a6e4613e4a7e4f52767e68c77765bb3 SHA512 064e2e8e7091adf863653981e5b677bdb9e64901f61cf3b68f098cf7957a4c32e19cec7d41b8dab61098017119d6ea562350c7fbfa10b5e922f52ac0d6066948
+DIST libslz-1.2.0.tar.bz2 230567 BLAKE2B cf8a21fe0c23ae003830bfae3bd5ae172df4e88f63b0d5c1394c316e9d69c570b544d2c2db76cddd1e320d68119d7ae39352f9932673fb41e06ded030ebc5078 SHA512 811876f3893c0a0c273518fcf6d5a827a86513033e2048dbb541ca32286171c408f124495c4454ce7811e3c52ffb6a7bfcbb08af5b7f56a670c2c1cb2c5cd496
 EBUILD libslz-1.1.0.ebuild 1171 BLAKE2B 198e5fca5067778136ff7a2b50b990879186b073095906e4ac134922386780822f5d6a6d52b8f9122f3a793944c19ce560ac77c24b429f50be1f28607b7d89fb SHA512 4d2e6f3c7b54edd926e9bbe275e999314fb3e7ab577abad77126ae88fbf477b6c2d98a0282d00cdc435228271cd8928eece3cb56a069fccd3d7fd69636a9feb4
+EBUILD libslz-1.2.0.ebuild 1175 BLAKE2B bfe8a7e5cd3d96b435a680a6b041fe4f8902bf99238d82ad4ffac2c26af06f4fdd094b7070c12d92809c5c86068f7f9da08f0aad9e7d48fdf9998833dfd0de4e SHA512 e15a12f2f40ad17b8bf5031f0158c827e2584b171403b454635ce38e23ce47b7238c760ca9e1df3298f227c93e105cb9a01b3337bfa17673e75523f90b5e4f0f
 MISC metadata.xml 1176 BLAKE2B 912f2785a4418e9dda2014a1c7d9d8a47be8d38ceda9b56c45b5ac9ad05f5b0aa0793891d8436823ee1bb3a14f7f1239b15daa4ba1ee6dcf35c42a95e1b910bb SHA512 fd49087a1691173da56b6669a410d0db911b999fce1fba2536832ff13a8b4c7a304410fa5ba0f87b7587bdffab216b620ca5b8549936cbf21375139a402b771d
diff --git a/dev-libs/libslz/libslz-1.2.0.ebuild b/dev-libs/libslz/libslz-1.2.0.ebuild
new file mode 100644
index 000000000000..be90a23d2bc6
--- /dev/null
+++ b/dev-libs/libslz/libslz-1.2.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="stateless, zlib-compatible, and very fast compression library"
+HOMEPAGE="http://1wt.eu/projects/libslz"
+SRC_URI="http://git.1wt.eu/web?p=${PN}.git;a=snapshot;h=v${PV};sf=tbz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="static-libs tools"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	local -a opts=(
+		CC="$(tc-getCC)" \
+		OPT_CFLAGS="${CFLAGS}" \
+		USR_LFLAGS="${LDFLAGS}" \
+		shared \
+		$(usex static-libs static '')
+	)
+
+	if multilib_is_native_abi ; then
+		opts+=(
+			$(usex tools tools '')
+		)
+	fi
+
+	emake "${opts[@]}"
+}
+
+multilib_src_install() {
+	local -a opts=(
+		STRIP=":" \
+		DESTDIR="${ED}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install-headers
+		install-shared \
+		$(usex static-libs install-static '')
+	)
+
+	if multilib_is_native_abi ; then
+		einstalldocs
+
+		opts+=(
+			$(usex tools install-tools '')
+		)
+	fi
+
+	emake "${opts[@]}"
+}
diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest
index 7c4a803b2104..680e79219f38 100644
--- a/dev-libs/libstroke/Manifest
+++ b/dev-libs/libstroke/Manifest
@@ -3,4 +3,4 @@ AUX libstroke-0.5.1-m4_syntax.patch 1100 BLAKE2B c86fed17159d3179bbb538c1c467fa5
 AUX libstroke-0.5.1-no_gtk1.patch 1046 BLAKE2B feaaa0206f74bc1206ed464ec3f29c76e2f51c83f78c6821d2184b833e1718638b11757ab3f8cef9464884dc11a3158fccb9f1f9fd166f50ee83f556b447b25d SHA512 96004186c51e617fa53f1bbaef5f58c6572c5acf0a6acf2d9e7be618c443fccff5feb8dd7bf77a9a435b8c5b334e1babb3cbd739e71ec6d7fe7feda1c66607f8
 DIST libstroke-0.5.1.tar.gz 174270 BLAKE2B ce642aff20f731ed8dc6aedfcdca0370e4e9789bdf1fd7d4157745ea7375d5e5f9c7a2f00739d886ff348c00ada36c3bef0ce68f18d9b0dd52eabcc086776334 SHA512 03431d4cd39174aadb6cfd00a1c487d34ae9cf4b1db9e9d01d563f2a661f01979f474b87099fd2bfb0e54653416a1b9dea988367674a3cc6134e16b62810a0c7
 EBUILD libstroke-0.5.1-r1.ebuild 741 BLAKE2B 13a400777d866642d5e15407324fed25f9fba69b698c4fd1639f2e878ce6bb862b5d2625f836cc651287d33114b134dcb84d954f2b887f76c53b03968d88a4dd SHA512 6e82b79427f8db3f8c7353e4a37ff6a924e2c097d72512729d64a97748349d0a048124e80a2dcef8bce59031612f169a653b8970ddb2b7f6f707edbef7772306
-MISC metadata.xml 261 BLAKE2B ed5cc49462c9e948e13f3455fbf209661aa04522f3753db7c674bca0528d7a384beefcbdfc5fcc0542dd08361d7953c06cbd19753bfe4dca2ff649ebc283bbd7 SHA512 318bd063baaa5dd560bcfdb87ab4d60edfb4dddf69884a84ef084a38399cf2ba84e69b432c816cce8e15d3dea253f395f41a1a654017a6eef30478ab8961cb51
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libstroke/metadata.xml b/dev-libs/libstroke/metadata.xml
index 674563478fea..6f49eba8f496 100644
--- a/dev-libs/libstroke/metadata.xml
+++ b/dev-libs/libstroke/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">     
-  <email>calchan@gentoo.org</email>      
-  <name>Denis Dupeyron</name>    
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 285a9f8d1c5f..02d5a9762d92 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-r1.ebuild 2763 BLAKE2B bb49b056a32601b2d33f45a002c0ec8d4b6ba52ecc43802319db255b6bcac6479754fdc0684b6eb64d800772ad24db6289249760f171a9fdc1c10084bddf3bc5 SHA512 9457670fb5b7fa032c42b6605424f0b1aeafb0525896ac7e3f0edd19f1cbdebbc037c1fce2fbd5091d66f4782f0fc7c2d830c7b3b8122382ff999a6a1aa0b367
+EBUILD libtomcrypt-1.18.2-r2.ebuild 2783 BLAKE2B c44830f763bf001206da8a8931b6a94b3cb1a3b644c13457787f08fd856e9f9d1663e26ca879533463b25684321595d1963dbb65e6f481b8b6e18dfb48b0a712 SHA512 4ef91f6d20961466f84f2b42d932b139ec16719a3e6d4cab53e9f5d080bc9af48501ea2902a642194f2666a0608bbf1d189ce8b91e92a9a88be99a8b67643379
 MISC metadata.xml 643 BLAKE2B e66df23ddfeb04650dfa8c4cbd7d6e6a1816164fd0cac86dba9990610b672957c5ff7b6e83a17f8b6c19f75d1f50a1b448b8b618058510b8d6f54259ad451822 SHA512 7517fc02844cd6b9a9801b371c2c8faf9626dded317ad610af234cd89078221be021acb9da66f9078bb4b754a5e2f1b5efcbca2ccb1ef5c58afd8cf925e7a44e
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r1.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
index ddbf24c826a7..aabf12d29620 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r1.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@@ -29,6 +29,7 @@ DEPEND="
 	libtommath? ( dev-libs/libtommath:= )
 	tomsfastmath? ( dev-libs/tomsfastmath:= )
 "
+RDEPEND="${DEPEND}"
 
 mymake() {
 	# Standard boilerplate
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 04dff08c9cc2..aa0a10193abe 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,7 +1,5 @@
 DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
-DIST libxmlb-0.2.0.tar.gz 97521 BLAKE2B 7a47164503b5b682e2bb9d877622a7dcad06d40bf87d6a7cf9e21898d8444e610ba3985d6be8cf65068f0637ee44ef8678610315be2795476b2f5ccaacb098ea SHA512 cff4245a47a942dd37675921ba753858a3ee0572500a1cd7291d2a063fa7fa9d9157c167bf33694e4e0204504d7e88fbfd2873c4b9851247d6cdb338c2d587a8
 DIST libxmlb-0.2.1.tar.gz 98284 BLAKE2B b9bf02560a231837d7837b43f01d8f78c54a80319379a7bfa191f8303b77c35e82d1e2bb57722f1bfe56224d96bd1513cef702a0375eb85a137bff8ca3104c5c SHA512 4e082f036eb62626d1724ac5093ad625f9259e9e81aa40d5ca0589a3a72dadd669c0718ff64dcae094973b6c282b6c8f8ce7212b7e47211f320035bb639ec59d
-EBUILD libxmlb-0.1.15.ebuild 1228 BLAKE2B 8cfdb11b371d1c9b710147e5963003e47d48006b137b183ce8995a85d565df9fe681555000c366b4e944979400eb3306c903eacbf460b2615c52a4731b3a4611 SHA512 ae8f7237ca068cea6e17feb6aa0182a593d6d49a61cfd5a5b4a90aa013d4cb64109f983a728867450c4798aefce2dd1eaf0873c25bda356e431f770ead431a08
-EBUILD libxmlb-0.2.0.ebuild 1253 BLAKE2B 13704d38962eec15866858cc6de0044b5a2fafea7a8779b4944b7aff23b01ac092cb481bb1d84376fefeb984320c01ef023bb441afc97697422cec2eed7f6257 SHA512 d51b93170189a70b6de957a23241d2a58966a23845c7d02e76de26550e2ffd8c1ae9fe0cb8ef68a976dacdaa0fa8279a0863daaeafacac9232a93693d5c982ee
-EBUILD libxmlb-0.2.1.ebuild 1260 BLAKE2B 25c67b3396fdcea722a2263f25c4be5c5912f443edd717adc6646879e698b178b2188e38bfb58cca63040538854bf62c00a84b45e55c0da0fd7022ed86f9d873 SHA512 8710006775f27af03c84e5f0b950e76df91f2ca6b1e64f4ac048ea89dda764dbbfa727de1696283af501a145eef0198f363b0c97c018da43b7291fe5b397c065
+EBUILD libxmlb-0.1.15.ebuild 1205 BLAKE2B 6ae7459288a60acb506e4bb387f66a6527c15939fd5414688b85f50d9c5f2a7f49d3440779648b5e41f1cd27d35df1b86696fac793e0bce52d668d9a69af6c35 SHA512 40197234eac844929649c54b196db7a2a2a434d123819e6eecf1cdfbbbdc61a6a712220027a0d3c4feb821c83f9b10ab915e9525a082b81dcf431bd2c12628d2
+EBUILD libxmlb-0.2.1.ebuild 1237 BLAKE2B 71b492613dd2c3224a415d4ff2ba7149567b5ae9e4f1a10c1b9ea808cdeb6df165076d9a8a1e467f16aabb493f5c5a2b7428f2433ba220930e5ee894d27c896f SHA512 ea4db4ce81be03989daaf0d386518189199a244c702df6ef76fbc706221b6b80f44ada0de73a2387c5f3f4c5b471ef03ec8704d32cda123e53fda2beef5afb46
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
index 68409989938f..80a864311d25 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.15.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_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit meson python-any-r1
 
@@ -31,11 +31,11 @@ DEPEND="
 "
 
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-util/meson-0.47.0
 	virtual/pkgconfig
 	introspection? (
 		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-		${PYTHON_DEPS}
 	)
 "
 
@@ -44,7 +44,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/dev-libs/libxmlb/libxmlb-0.2.0.ebuild b/dev-libs/libxmlb/libxmlb-0.2.0.ebuild
deleted file mode 100644
index eef8b51f8641..000000000000
--- a/dev-libs/libxmlb/libxmlb-0.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit meson python-any-r1
-
-DESCRIPTION="Library to help create and query binary XML blobs"
-HOMEPAGE="https://github.com/hughsie/libxmlb"
-SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # libxmlb.so version
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc introspection stemmer test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/util-linux
-	stemmer? ( dev-libs/snowball-stemmer )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-"
-
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-		${PYTHON_DEPS}
-	)
-"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgtkdoc="$(usex doc true false)"
-		-Dintrospection="$(usex introspection true false)"
-		-Dstemmer="$(usex stemmer true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
index 30f41ec4d836..03845174fc31 100644
--- a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.2.1.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_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit meson python-any-r1
 
@@ -31,11 +31,11 @@ DEPEND="
 "
 
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-util/meson-0.47.0
 	virtual/pkgconfig
 	introspection? (
 		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-		${PYTHON_DEPS}
 	)
 "
 
@@ -44,7 +44,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index f68a6a722123..5f3fc5313555 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 1000 BLAKE2B 2a2fdc1e9558898baec960c6e13630ec0d3904782afb87ee66ed8c557b69599a5121eae8dbfd291fe7e93c7acdb944bab248899dd4c2e6ecc1f774c95443748e SHA512 3dbbcafa20df6d3c47380d406f75ea7b14ce9dca135310a6aeb27f1e354f223bdf72f59bad2e0902db950a2c2357f4cf794ffacadc3ca585948ac0de9514a734
+EBUILD libyaml-0.2.5.ebuild 994 BLAKE2B d753a20762fbbc8e835895bc890ec57dad1a2865e0415310f2fe7ead374478cbf537f7486d71117eb57effe4649236ce8c40fae9ab824bf7d90b6118ab60b2e5 SHA512 9b36ae233fce50bac991cbcc103e676d888610098f635afe0ba3b666e0950e5ad7f098df12d96e110730786c5a737fabbe7e04c1741bafd9b37b3d7289520c3b
 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 a06f6338b29e..89e8378ce0bb 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/nss/Manifest b/dev-libs/nss/Manifest
index 8e01e5e01099..7cce0aeffa90 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,12 +3,11 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.53-fix-building-on-ppc.patch 1206 BLAKE2B e6189802769197b290fd332ee2b7d074c0bacf47313998117734dafd1eb6a536db19bc8a329944d9fad51a6f9f90f81d98181272e0068bf852fea7ca928d2713 SHA512 859162070aa3c5e6e8be259f5e6648d37a5194a02958310f8caf56ff772dcaa4ebb26e4d754c99608fc7a45b641c5088cccd9e2c7d9c92c5ccc85c6b47320720
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 AUX nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch 8546 BLAKE2B 25c222f44f714226364dbda760989e7e255ab93a79121238ccce2962c346c37971a8440e8cc16ac5555f78c15b7a1b72e7311a7b7257b254fefe7e9a75d94924 SHA512 79fff678895a5643b34c42a0b0d34299b1b63c19baf0bbeb43fcee6b7f01bb24baf7047261b16e913d39fe9e69a637c7dc2bba0fec9ceedd43fa4f5dcc99f38f
-AUX nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch 4053 BLAKE2B d4a9a30c8cbea3b37d8d72cf87c55485cd12caa3f68daaf9bcfd06e945386191549e3cab6a5c637b7e6ea598bba3c0f2cb86bdf51cae9d860bbb614b896402a5 SHA512 5af11e79e4f395e7037aa50d33db7f4fd2fecfdfe33c38865dcf1bad9de731e6d0d859720e8684b5d5ea194c1e86360428a98553fe5115a069ddd1fc95f4cb84
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
-DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
+DIST nss-3.60.1.tar.gz 82036869 BLAKE2B 71f4ab4ee41a05b05493bb43bd0ebaa6258122ddf6bc82af565121ec32f72ae0f187ac2383501ed8e228b32b796f75a89538c76f737530215b3c6448ef1242a3 SHA512 ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5
 DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD nss-3.58-r2.ebuild 9247 BLAKE2B 2c8dbc38e7581f41b24b086f4ecd622e8f25c86cfe739b2f870c6ba85d14ee58a3cb355cf13bdaa19d4a63ce16233592ebd2feec604263e4ee3a6ed40e5a7300 SHA512 e51811324812f83dc3ebd1cefd39a5a6f097c845fc1de5a89f2ad2091faafb05b44a1beca97f8430b55b8bd0cb86582dde4b77384839751bdd6b0e00638d0c4d
-EBUILD nss-3.59-r1.ebuild 9261 BLAKE2B d55319b75af75bade8b7436b3ba7e277fa84dd6cddceb7ec6243e1d69db32e124301a3860950fc39807c5aa5d745c9e8428b7bfcb384e6069f64a6e25a61b7bf SHA512 8f1fe0993c20ddc054226f70087d40e4191b28590a86490e369bc7772bae7b4d2a1afda9e1fe9f3ed0f9f62a5d44dd94f02cc2b200904dce764160e015dec148
-EBUILD nss-3.60.ebuild 9132 BLAKE2B 4393458b13b6623aacfe3e42cf959fb1c3db2c25785e38a3daadf4fb6a0ee26ebe9a5a012972542c683c54c343575f5cb77275d8acb61119cb17c3029e87a5bf SHA512 9fe34df067abc9bd255a1c06822a029237d3c20d4443ff15e940c6eb3db68aad66acacd6924bf44070e71812da9b383367ac097558568adda7a067451447e104
+EBUILD nss-3.58-r2.ebuild 9258 BLAKE2B 7a13994368b71fb33774476bc9fa0cbcc7c5d508818f0c2583a4dab276651ddb2a68fbaafecd8323defb597f9e2c4f3cfc27a1c53c6d313b8d6bd170b125d2aa SHA512 98790c6a951414a2bddea810b8611cb5040d2c4ac915e8a0f1327bb7693bbb023785cffaedfc1e1fda4bde7d9ca9f5828350939b4ffd1a3a536bde61d14fd012
+EBUILD nss-3.60.1.ebuild 9143 BLAKE2B 777c9ac48a0ff3d69dc95cddf680d8a044ddb749b122eb9711a119c073b62968971ca5f4f109c3f237c2365781875fb4927a778c755630448f236ab1a4a84c3b SHA512 da03ac79e91317200be2bb5b77fa5f9808ac07d0655cd38b55f72343b4e0ccd419e46be2b2021348569f531e2f1074dd2761e402f883f4c97af9326e9950ff67
+EBUILD nss-3.60.ebuild 9143 BLAKE2B 777c9ac48a0ff3d69dc95cddf680d8a044ddb749b122eb9711a119c073b62968971ca5f4f109c3f237c2365781875fb4927a778c755630448f236ab1a4a84c3b SHA512 da03ac79e91317200be2bb5b77fa5f9808ac07d0655cd38b55f72343b4e0ccd419e46be2b2021348569f531e2f1074dd2761e402f883f4c97af9326e9950ff67
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch b/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
deleted file mode 100644
index be4ebfe47961..000000000000
--- a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-
-# HG changeset patch
-# User Kevin Jacobs <kjacobs@mozilla.com>
-# Date 1606813429 0
-# Node ID 19585ccc7a1f0f4e9a8d2b9c5ceeb408ea90acb9
-# Parent  f1e48fbead3d9e69500d7aedc1ef6e4bf334f41e
-Bug 1679290 - Don't hold slot lock when taking session lock r=bbeurdouche
-
-[[ https://hg.mozilla.org/projects/nss/rev/0ed11a5835ac1556ff978362cd61069d48f4c5db | 0ed11a5835ac1556ff978362cd61069d48f4c5db ]] fixed a number of race conditions related to NSSSlot member accesses. Unfortunately the locking order that was imposed by that patch has been found to cause problems for at least one PKCS11 module, libnsspem.
-
-This patch drops nested locking in favor of unlocking/re-locking. While this isn't perfect, the original problem in bug 1663661 was that `slot->token` could become NULL, which we can easily check after reacquiring.
-
-Differential Revision: https://phabricator.services.mozilla.com/D98247
-
-diff --git a/lib/dev/devslot.c b/lib/dev/devslot.c
---- a/lib/dev/devslot.c
-+++ b/lib/dev/devslot.c
-@@ -183,25 +183,32 @@ nssSlot_IsTokenPresent(
-     if ((slot->ckFlags & CKF_TOKEN_PRESENT) == 0) {
-         if (!slot->token) {
-             /* token was never present */
-             isPresent = PR_FALSE;
-             goto done; /* slot lock held */
-         }
-         session = nssToken_GetDefaultSession(slot->token);
-         if (session) {
-+            nssSlot_ExitMonitor(slot);
-             nssSession_EnterMonitor(session);
-             /* token is not present */
-             if (session->handle != CK_INVALID_HANDLE) {
-                 /* session is valid, close and invalidate it */
-                 CKAPI(epv)
-                     ->C_CloseSession(session->handle);
-                 session->handle = CK_INVALID_HANDLE;
-             }
-             nssSession_ExitMonitor(session);
-+            nssSlot_EnterMonitor(slot);
-+            if (!slot->token) {
-+                /* Check token presence after re-acquiring lock */
-+                isPresent = PR_FALSE;
-+                goto done; /* slot lock held */
-+            }
-         }
-         if (slot->token->base.name[0] != 0) {
-             /* notify the high-level cache that the token is removed */
-             slot->token->base.name[0] = 0; /* XXX */
-             nssToken_NotifyCertsNotVisible(slot->token);
-         }
-         slot->token->base.name[0] = 0; /* XXX */
-         /* clear the token cache */
-@@ -218,34 +225,41 @@ nssSlot_IsTokenPresent(
-     }
- 
-     /* token is present, use the session info to determine if the card
-      * has been removed and reinserted.
-      */
-     session = nssToken_GetDefaultSession(slot->token);
-     if (session) {
-         PRBool tokenRemoved;
-+        nssSlot_ExitMonitor(slot);
-         nssSession_EnterMonitor(session);
-         if (session->handle != CK_INVALID_HANDLE) {
-             CK_SESSION_INFO sessionInfo;
-             ckrv = CKAPI(epv)->C_GetSessionInfo(session->handle, &sessionInfo);
-             if (ckrv != CKR_OK) {
-                 /* session is screwy, close and invalidate it */
-                 CKAPI(epv)
-                     ->C_CloseSession(session->handle);
-                 session->handle = CK_INVALID_HANDLE;
-             }
-         }
-         tokenRemoved = (session->handle == CK_INVALID_HANDLE);
-         nssSession_ExitMonitor(session);
-+        nssSlot_EnterMonitor(slot);
-         /* token not removed, finished */
-         if (!tokenRemoved) {
-             isPresent = PR_TRUE;
-             goto done; /* slot lock held */
-         }
-+        if (!slot->token) {
-+            /* Check token presence after re-acquiring lock */
-+            isPresent = PR_FALSE;
-+            goto done; /* slot lock held */
-+        }
-     }
-     /* the token has been removed, and reinserted, or the slot contains
-      * a token it doesn't recognize. invalidate all the old
-      * information we had on this token, if we can't refresh, clear
-      * the present flag */
-     nssToken_NotifyCertsNotVisible(slot->token);
-     nssToken_Remove(slot->token);
-     /* token has been removed, need to refresh with new session */
-
diff --git a/dev-libs/nss/nss-3.58-r2.ebuild b/dev-libs/nss/nss-3.58-r2.ebuild
index ddd6a22d512c..f7bb97581f3b 100644
--- a/dev-libs/nss/nss-3.58-r2.ebuild
+++ b/dev-libs/nss/nss-3.58-r2.ebuild
@@ -9,7 +9,7 @@ NSPR_VER="4.29"
 RTM_NAME="NSS_${PV//./_}_RTM"
 
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
 	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
 
diff --git a/dev-libs/nss/nss-3.59-r1.ebuild b/dev-libs/nss/nss-3.60.1.ebuild
index 88811b3a5675..7ac46a177d7a 100644
--- a/dev-libs/nss/nss-3.59-r1.ebuild
+++ b/dev-libs/nss/nss-3.60.1.ebuild
@@ -9,7 +9,7 @@ NSPR_VER="4.29"
 RTM_NAME="NSS_${PV//./_}_RTM"
 
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
 	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
 
@@ -39,8 +39,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
-	"${FILESDIR}/${PN}-3.59-dont-hold-slot-lock-when-taking-session-lock.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/nss/nss-3.60.ebuild b/dev-libs/nss/nss-3.60.ebuild
index 314e496305cb..7ac46a177d7a 100644
--- a/dev-libs/nss/nss-3.60.ebuild
+++ b/dev-libs/nss/nss-3.60.ebuild
@@ -9,7 +9,7 @@ NSPR_VER="4.29"
 RTM_NAME="NSS_${PV//./_}_RTM"
 
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
 	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
 
diff --git a/dev-libs/onigmo/Manifest b/dev-libs/onigmo/Manifest
index 66ce046af7f2..ce11fcb27c65 100644
--- a/dev-libs/onigmo/Manifest
+++ b/dev-libs/onigmo/Manifest
@@ -1,5 +1,5 @@
 DIST onigmo-6.1.3.tar.gz 822127 BLAKE2B b2f020ba37c039022ee4ad0840006b7d84bd5c2b24975d3cc34a625379c478cdfacbb7247d5f2315da2e56beaa74fec5390140d4a3f0c29c66906d78d7207b8b SHA512 13ee0e97e5e7ea2a379cdfd8bab121ee116fc07495c6b3131621f6cd9b1748897e5e2c7dcf43845794b2ad4adef3b4076daf06f51aaf965e32cbac5d7bace1e6
 DIST onigmo-6.2.0.tar.gz 844935 BLAKE2B 768918af337be0bbe9fd9c9f15a630ce0a74f081832ef84ba13e48f4e6ed692ff1250e20272c039d95bb4d9b847bfaac829addd7de3f50780b7620b1f105406c SHA512 651ab8c64d8b8c0d56e1549809030be79a751b9d1c06af6527f8cf6014fba1bafea593d572e1cf766099a10fb4e6506ca683ef48131f47471348b5cbd35a1a77
 EBUILD onigmo-6.1.3.ebuild 869 BLAKE2B e7cf04de463ef485df5f79c1ef3a3d9fdd82b1592511d67778b91e6a2cdfa20fb6304c1bd58fc954da6cd1fb69b08b899e2ad0e68153df73ab3c0212764fc12f SHA512 85f5a083ac4843c81a62a781d55f23e857c6c7675e7f33742c2544fa3e0ce783cd2c1844375fbf8e33c4f518ca999dacc07caadccc22512773d93b711c75e37a
-EBUILD onigmo-6.2.0.ebuild 871 BLAKE2B 3d52efc6d54a1f66ea9d9e927fcb19bccaeeb753a29fcf8d31fb57f87a2cfddddefac002516cb55c86b3b726ddb3832058c9f20a208efb1f0a66fc5d3eb4cad2 SHA512 b006179fa4f2b2ec957f546471fe994fb5b3946152066c33677a1898fb81eb19629e68354d8303dfdb323e8218b3ae999ce58ba7caf7e26dd3f870868d48cde0
+EBUILD onigmo-6.2.0.ebuild 869 BLAKE2B 0e10f53f852c3685d51210ee50785ca0cdb9a4eb2a266e5007518275758a85384459e304e1e2d96c84c06a39c9ac86e139cb8c4fd89d45bf54097281f8661678 SHA512 86683ba757b9c648b692c59273ad1d412d28a759599d39339ee3d4a24445c64e73552ad6d0819f63fc5d75176b2e9d30c0e5f4fcb0de292b302f17c05ac4c637
 MISC metadata.xml 577 BLAKE2B cd1e0bd09e8b4a1f71dcde39b47a7dd78308786c8b9424111eddb3a6ba6b50181e6af722605db9cded62076434410325a795181a4adaaf2d837bcd74128dfee7 SHA512 7c1e07ac10f864fbc74ffdd4706792eb5978cc28449536900ab2c870d23e52f24c5de215b766238d0629cf4ef3cad77622f37e468b5295e57ec42f5912a54ac6
diff --git a/dev-libs/onigmo/onigmo-6.2.0.ebuild b/dev-libs/onigmo/onigmo-6.2.0.ebuild
index 43b020ab66c9..21ef5b828dbc 100644
--- a/dev-libs/onigmo/onigmo-6.2.0.ebuild
+++ b/dev-libs/onigmo/onigmo-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt )
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 966e428f00fd..5ec18c208a6c 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -2,5 +2,5 @@ AUX opensc-0.20.0-gcc10.patch 1132 BLAKE2B 1afde2a2a92c85a1435bf6b2f4cf9d44fec83
 DIST opensc-0.20.0.tar.gz 2140645 BLAKE2B 298a6d9c8a9682899cae201ba7edd464a2e3d947f6d97672727bedc47f6b529cb1495a8bc335f83cdb42b0c0077de0fd7ff9f3f8f506b543b1970cb6557b762e SHA512 71f71fa6062410e63c6c60f5b2d10d1d855cc6cc815ef0e42e42a1ddd25bbd52fc396c1e495ef54610f3243996dec84dacc8007b186deb670ed645b04ee6eda5
 DIST opensc-0.21.0.tar.gz 2210878 BLAKE2B 22b63ca59cb721cdbbda755fa90f5b46fd9e5b6d7768cddbfeaffd58d68adcb145d6d604b334cf778608be9ee5fc98109f98d131d2536e61f79705aa3dbafa6c SHA512 3511b0a04a96e62011c48667e3fd36a1611fe67a89f7626ff056c9c3614f8cabc91c9924a6ca7a8ea50076a128e3967277a0dd624b4fa27c62cefee9fab22646
 EBUILD opensc-0.20.0.ebuild 1689 BLAKE2B 30c0f97f196c780a3097a43ad1f6dc1a57d36fb13ef09a8e409d0798e90399cd1aeb35362f59930e9276983f8329e4d9fc0d3edecb962b003fb545aef1a4b4a1 SHA512 af135d3d845694ccf8e09f460312919f502c321b9bac1adcaf90d3aa9edf8ccea94612413dced2b224465eb8b90c617b5a8a3306081176ef0fe1f3043c3c060b
-EBUILD opensc-0.21.0.ebuild 1649 BLAKE2B 992b6aae079207a72a17091ca907f10263390e93454f7cb348066ad9e2bf6c2b2112a4c0638f9a5f8bbb6fc012d6883729eca9756d00bdd00d1aeee0c49e1345 SHA512 34e3046ab37c3909b9f751b1bdcf7f79cabfe7588bf73de1972854157045651f332eb9bc4284b3918d622bebca9f21a3bcb01d31fa00f6b6ebe5892183f62df2
+EBUILD opensc-0.21.0.ebuild 1644 BLAKE2B da7e509d5adef201397ce549151289f690621c85a4e6b0d93b7f62b3994a251f397a3853d71197dfab103e2e5538924ccce0ac1e99964ccac5d453a46f9fd85a SHA512 3e6da8d3d5eabab456f0033e761d7d017170301551c68c3e4b24520feb24f2624e5725a7b077c61335939b207624f26f554f149b6402f0a9ef304beeda6be938
 MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/opensc-0.21.0.ebuild b/dev-libs/opensc/opensc-0.21.0.ebuild
index 732336d18a8d..720d1aa3832e 100644
--- a/dev-libs/opensc/opensc-0.21.0.ebuild
+++ b/dev-libs/opensc/opensc-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86"
 IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 7d69399db46d..df67fbf8da48 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -14,6 +14,6 @@ DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf181191
 EBUILD protobuf-3.12.2.ebuild 3009 BLAKE2B 8fa16af3fa8a044e4855a3c97de40762ae4e68e3c7dad59bf490d87c1685cd1f12adfc4919df70236fa2fc200c5e5b8e7089ed5735211336a93014f0c49493ef SHA512 305056f299b34c4adbd9b05d402f7561625a1e232abd64fb6d44ccc90e5eadd1f30c72ac629e6c9976e9f384b639ba645763a85472b2cecbd1574858c5958cf2
 EBUILD protobuf-3.12.4.ebuild 3205 BLAKE2B 5d41dab953c7a0230df22500c99caa1ef843600fa17940d77567da33ee0c0fc68062e69fc816d480670e97fbfaa101c274c03c4d005aa87ae6f2f182cdd257bf SHA512 e33502f6f03bb899fada09a8bc3565b1e1d0994b85984ab69a0acf39c9139ebee6cb0c625ed97d6f781def4efec1497dd36e24d4a86bec6652dadb90fed27cfa
 EBUILD protobuf-3.13.0.ebuild 3199 BLAKE2B d79383364ae304ea0a4682e9d9d92b673ab524820262b8e8fbc303594ca9079961d6964222d1d2beba4733f97a9e74e4df48e8f907f1ffb1e46901f986b93625 SHA512 22f2acef4cadb511040ff2f6421c2e5efe4e0d5983ffaa111edde7d0737b82817dea34dc640c7c97a45c10678c2e0ffd7061c90031b2bcf8adaedebb0efd4027
-EBUILD protobuf-3.14.0.ebuild 3008 BLAKE2B 4ae080f55e63280885d1fdebfc507882fa689d1e7547823f0cf670034eaa64776cbb6600b25ce1830ca04bc829da716ddfad9fe589e20520c76ddd658f822a53 SHA512 593d0aa0fa8241b9f559336e20d1043c3e4b67e49a944cfc24b7949f3d967ee5f886074c929a2c3570b978dc83ab82453749de58793022d0b4797dfa7fa129e7
+EBUILD protobuf-3.14.0.ebuild 3006 BLAKE2B 64ab4621b80dd359326a4e0274714aff7a22c90c8058755b47457ac8a614b471a540e889bf46721cedfb92e8993d06cd85f5f7b1582b6e0ee27d11ac9ee293f3 SHA512 8db1ee750084ec411a1e649a9e6ac142983d3e84bdb7b639de09410e1e81361fdbe2377a9e6e49e3276484862674ec404d3cd659c158219276b44b2a3903d24d
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B d57420114a77e371e0d1b8aa311ab56f9e44df7c3eb1c6d32dd15b04e840d1e4b61c178317f596616804d740e1c903c7fc8a423f72d1a63b16d62f2fb4b393ae SHA512 e0457cc8e279393eae5f8a6b8ac194688e27e6fc89ec0a54e9c266f86f7bdf5ce83b024002954e30386600b9abd4d4758347652f5087f4a81a67103271883b4e
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild
index d1e71d4e5020..98be55cc45e7 100644
--- a/dev-libs/protobuf/protobuf-3.14.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.14.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index e086fa0e9547..273ac10d16e2 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -3,6 +3,6 @@ DIST pugixml-1.11.3.tar.gz 386244 BLAKE2B 1c83b0e0c1f464d3ef2efc19decc425bac14b5
 DIST pugixml-1.11.4.tar.gz 386229 BLAKE2B 93d9c537f10e3a12297e4d6a39f2866bd5c9678c6aff83e20fb79b6587191b6586b1fe4d9dd995a7be05cc9281cd9910fae3eddf6b2eac216873e918a5cf3231 SHA512 c83f57ef2492eee359d979597fb5089b8eca547bb9d41cfbb6bcf43d59fe75e6780b0f31dd593145ec9888c065153aba52702667e2de213fa080cd51e9e13a38
 EBUILD pugixml-1.10.ebuild 571 BLAKE2B 882d1cf798f1b6f033d26204059fef59169588d7f939620f8a61dbbfe582d9c6888bc9918b657841cef5eba110dee6a977dab63a5a2c731ceb2d9a329635d447 SHA512 eefcb601ccfe5aa7c529ab220a1e21faaf3fdf4dfbac06f847e268ec6b784d7f6d3962d57d53b92c0645d735529d7f8ed56009ddbcecedc0f640b5f5f20420ef
 EBUILD pugixml-1.11.3.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
-EBUILD pugixml-1.11.4.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
+EBUILD pugixml-1.11.4.ebuild 571 BLAKE2B 1d1dd0242255764d0332985fe220b2ac84b69bcbb716becd717aaa777ff3dfbe5abad4437beac25dd5e3e21dda4ffb8c4fc9c863f981dfaff79c64de1ab5fc20 SHA512 f2daeaf1b726589fb908754540aa0fddb3ab516636800b4fccbe6523f2331f48e62fd6cafff76efce3b8b9b384f833ad13bfbb65a3d3c1489af16a159afe5c30
 EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.11.4.ebuild b/dev-libs/pugixml/pugixml-1.11.4.ebuild
index 0750359ebd79..1d132cd4eb53 100644
--- a/dev-libs/pugixml/pugixml-1.11.4.ebuild
+++ b/dev-libs/pugixml/pugixml-1.11.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/rlog/Manifest b/dev-libs/rlog/Manifest
index 94a39d7153b1..ad2aa73eba69 100644
--- a/dev-libs/rlog/Manifest
+++ b/dev-libs/rlog/Manifest
@@ -1,5 +1,6 @@
 AUX rlog-1.3.7-gcc-4.3.patch 203 BLAKE2B 805bae9fa8ab6f9d069056cd8c0c2df96f5b50994a7f14cc4f4e1efbd69ff1be433edcd200dadc986462ed9d8cc0caacfd515dd1480638d48a9156a3aeebd4a1 SHA512 e3d07bcd0aad871c5cbda75335cd20f598bbe25401ee5a6fb735f0d0f5a37946c78c9eb8190fa8ae31351704c2e0806b89d06db56d225d7e6f477a2a9b78ae1d
+AUX rlog-1.4-autoconf-2.70.patch 4845 BLAKE2B 3bbbec363089a3da1d10419aa18f41fd20949b14e730bd4fe24001568031e6a2de955445903e24368239ae4c69b81bff9d6794d73fa617c317b392d54d74a01d SHA512 4c2fe7803a2048cd7e808de6711da69c107f66b7711e8b60b713d092ba56019307ea5f399f70e4729c312d7676997babb9980080b2026389df30db76aa0de59a
 AUX rlog-1.4-fix-build-system.patch 1283 BLAKE2B 2e7d38de9be902224dd82ade699ed9aedb56cdbf9ea272373e74d541c126c4edf2a5814cd078e4309887c8f732c3731ed035bf3018ebfbee55adc3f74328198d SHA512 e956ae108f61d8e71379d0b2722e670d52d9954713725629309f91176f419b9a188578e4e3381992ad4bbf577fb2b747d8680ad01b5e92864f4c6be721095b4f
 DIST rlog-1.4.tar.gz 640641 BLAKE2B ff17c9cefb20045a95d69954dd6d1756a342a5a97b640e8a286db98e5e55d1cb05da48a5df7ba1ad4b5f23678cfefd677cbf6f9f45ab647373858a2ddf25881e SHA512 a0af9afd6c5329ec4269a7778c3236b9e0b438cba65ed0a6f9cd7e802d196b7908eed5ab663f52905869cacffc7f1964b20ab2a53b37dbe65f1c8a9226cc423e
-EBUILD rlog-1.4.ebuild 578 BLAKE2B 2468285a3a8bcc744e48b78f9553c814dd0f20471c604ed84f338d82af57e904521335cf74f6288baa6a3eca7923cfc0ab7c3a47ff8f66986acdc3846dd6c208 SHA512 8854dea14986aa02096672f162ebb653fc486b2af2369e2a47ebff5674ae6f360ec2d5c4131dc8f7202221fc0f372a9589bb64c3a866fb3cf46bbbbfa77b588d
+EBUILD rlog-1.4.ebuild 624 BLAKE2B 4fd43ccc0cf22f6807827ab8a3cdcf0b1e2a48a3b05894a3df4b064dc6587f0c3c1a346f8a85e9a2bd0cf81b67aa42c489dab34a5ff3c48cec621a70480bd5fd SHA512 23f926379118f571ed09c594e4ad9eb1eb32ae008c59cde730f942850abf515685238f1558d73c7142a51b96149015e584fd95169da9dc612622f9cae6bb8107
 MISC metadata.xml 241 BLAKE2B d2fb5a8dd2362e8f7e35773ec2cba521024c9c707ee575cd4f88175ea7a485e4b3ba15c849292276fde6616067a03e13513e1aef73a0dc1e9d92c01b80ea4178 SHA512 619305d12905676e8b9becfcda5d3f843c14c89060fe6a2260aa4563cc98e9966ef48e4a896625274abbfb47c146c69f9c98b83e0c5cf1010e718c30440a837f
diff --git a/dev-libs/rlog/files/rlog-1.4-autoconf-2.70.patch b/dev-libs/rlog/files/rlog-1.4-autoconf-2.70.patch
new file mode 100644
index 000000000000..f8e07813786d
--- /dev/null
+++ b/dev-libs/rlog/files/rlog-1.4-autoconf-2.70.patch
@@ -0,0 +1,160 @@
+--- rlog-1.4/configure.ac
++++ rlog-1.4/configure.ac
+@@ -64,15 +64,15 @@
+ ACX_PTHREAD
+ 
+ AC_ARG_ENABLE(printffp,
+-    AS_HELP_STRING([--disable-printffp],
+-	    [disables printf attribute on function pointers]),
+-    with_printffp=$enableval,with_printffp="test")
++    [AS_HELP_STRING([--disable-printffp],
++	    [disables printf attribute on function pointers])],
++    [with_printffp=$enableval], [with_printffp="test"])
+ 
+-if test "x$with_printffp" = "xtest"; then
++AS_IF([test "x$with_printffp" = "xtest"], [
+ 
+     # check if we can use printf attribute on a function..
+     AC_MSG_CHECKING(if __printf__ attribute can apply to function pointers)
+-    AC_COMPILE_IFELSE( [[
++    AC_COMPILE_IFELSE([
+ 	    void testfunc(const char *format, ...)
+ 	    { }
+ 	    void (*funcProto)(const char *, ...) 
+@@ -85,28 +85,28 @@
+ 
+ 		return 0;
+ 	    }
+-	 ]],
++	 ], [
+ 	with_printffp="yes",
+-	with_printffp="no")
++	with_printffp="no"])
+ 
+     AC_MSG_RESULT($with_printffp)
+-fi
++])
+ 
+-if test "x$with_printffp" = "xyes"; then
++AS_IF([test "x$with_printffp" = "xyes"], [
+     HAVE_PRINTF_FP_PROTOTYPE="1"
+-else
++], [
+     HAVE_PRINTF_FP_PROTOTYPE="0"
+-fi
++])
+ AC_SUBST(HAVE_PRINTF_FP_PROTOTYPE)
+ 
+ AC_ARG_ENABLE(vararg,
+-    AS_HELP_STRING([--disable-vararg],
+-	    [don't use vararg macros even if the compiler supports them]),
+-    enable_vararg=$enableval)
+-if test "x$enable_vararg" != "xno"; then
++    [AS_HELP_STRING([--disable-vararg],
++	    [don't use vararg macros even if the compiler supports them])],
++    [enable_vararg=$enableval])
++AS_IF([test "x$enable_vararg" != "xno"], [
+     # check if the compiler understands __VA_ARGS__ 
+ AC_MSG_CHECKING(if compiler has C99 variadac macro)
+-AC_COMPILE_IFELSE( [[
++AC_COMPILE_IFELSE([
+ #include <stdio.h>
+ 
+ #define PRINT(FMT, ...) printf( FMT, __VA_ARGS__ )
+@@ -115,7 +115,7 @@
+ {
+     PRINT("hello %s", "world");
+     return 0;
+-} ]], [C99_VARIADAC_MACROS="1" 
++} ], [C99_VARIADAC_MACROS="1" 
+        AC_MSG_RESULT(yes)], 
+     [C99_VARIADAC_MACROS="0"
+      AC_MSG_RESULT(no)])
+@@ -123,7 +123,7 @@
+ 
+ # check if the compiler understands pre-c99 variadac macros
+ AC_MSG_CHECKING(if compiler has pre-C99 variadac macro)
+-AC_COMPILE_IFELSE( [[
++AC_COMPILE_IFELSE([
+ #include <stdio.h>
+ 
+ #define PRINT(FMT, ARGS...) printf( FMT, ##ARGS )
+@@ -132,15 +132,15 @@
+ {
+     PRINT("hello %s", "world");
+     return 0;
+-} ]], [PREC99_VARIADAC_MACROS="1" 
++} ], [PREC99_VARIADAC_MACROS="1" 
+        AC_MSG_RESULT(yes)], 
+     [PREC99_VARIADAC_MACROS="0"
+      AC_MSG_RESULT(no)])
+-else
++], [
+ dnl vararg support disabled
+     C99_VARIADAC_MACROS=0
+     PREC99_VARIADAC_MACROS=0
+-fi # enable_vararg
++]) # enable_vararg
+ 
+ AC_SUBST(C99_VARIADAC_MACROS)
+ AC_SUBST(PREC99_VARIADAC_MACROS)
+@@ -148,42 +148,42 @@
+ 
+ # check if the computer has hardware cycle counter
+ AC_ARG_ENABLE(rdtsc,
+-    AS_HELP_STRING([--enable-rdtsc],
+-	    [use rdtsc for benchmarking rlog in test programs]),
+-    with_rdtsc=$enableval,with_rdtsc="no")
+-if test "x$with_rdtsc" = "xyes"; then
++    [AS_HELP_STRING([--enable-rdtsc],
++	    [use rdtsc for benchmarking rlog in test programs])],
++    [with_rdtsc=$enableval], [with_rdtsc="no"])
++AS_IF([test "x$with_rdtsc" = "xyes"], [
+     AC_DEFINE([USE_RDTSC], [1], [Define to use RDTSC calls for benchmark test])
+-else
++], [
+     AC_DEFINE([USE_RDTSC], [0], [Define to use RDTSC calls for benchmark test])
+-fi
++])
+ 
+ AC_ARG_ENABLE(valgrind,
+-    AS_HELP_STRING([--disable-valgrind],
+-		   [disables valgrind support code.]),
+-    with_valgrind=$enableval, with_valgrind="yes" )
++    [AS_HELP_STRING([--disable-valgrind],
++		   [disables valgrind support code.])],
++    [with_valgrind=$enableval], [with_valgrind="yes"])
+ USE_VALGRIND="0"
+-if test "x$with_valgrind" = "xyes"; then
+-    AC_CHECK_HEADER([valgrind/valgrind.h],
++AS_IF([test "x$with_valgrind" = "xyes"], [
++    AC_CHECK_HEADER([valgrind/valgrind.h], [
+ 	AC_CHECK_DECLS([VALGRIND_PRINTF_BACKTRACE],
+-	    USE_VALGRIND="1",,[#include <valgrind/valgrind.h>]))
+-fi
++	    [USE_VALGRIND="1"],,[#include <valgrind/valgrind.h>])])
++])
+ AC_SUBST(USE_VALGRIND)
+ 
+ 
+ # allow documentation build to be disabled manually
+ AC_ARG_ENABLE(docs,
+-    AS_HELP_STRING([--disable-docs],[disable documentation build]),
+-    build_docs=$enableval, build_docs="yes")
++    [AS_HELP_STRING([--disable-docs],[disable documentation build])],
++    [build_docs=$enableval], [build_docs="yes"])
+ 
+ # check for tools necessary to build documentation
+ AC_PATH_PROG(DOXYGEN, doxygen, [no])
+ AC_PATH_PROG(LATEX, latex, [no])
+ AC_PATH_PROG(PDFLATEX, pdflatex, [no])
+ 
+-AM_CONDITIONAL(BUILD_DOCS, test "x$build_docs" = "xyes" \
++AM_CONDITIONAL([BUILD_DOCS], [test "x$build_docs" = "xyes" \
+ 			     -a "x$DOXYGEN" != "xno" \
+ 			     -a "x$LATEX" != "xno" \
+-			     -a "x$PDFLATEX" != "xno" )
++			     -a "x$PDFLATEX" != "xno"])
+ 
+ AC_CHECK_FUNCS(localtime_r)
+ 
diff --git a/dev-libs/rlog/rlog-1.4.ebuild b/dev-libs/rlog/rlog-1.4.ebuild
index 386f5c328d21..1f58e0626556 100644
--- a/dev-libs/rlog/rlog-1.4.ebuild
+++ b/dev-libs/rlog/rlog-1.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -17,6 +17,7 @@ IUSE=""
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.7-gcc-4.3.patch
 	"${FILESDIR}"/${PN}-1.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.4-autoconf-2.70.patch
 )
 
 src_prepare() {
@@ -28,5 +29,5 @@ src_install() {
 	default
 
 	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 3f44b12ff209..7932d45eb75b 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -10,5 +10,5 @@ DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a
 EBUILD rocclr-3.10.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-3.8.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-3.9.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
-EBUILD rocclr-4.0.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
+EBUILD rocclr-4.0.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
 MISC metadata.xml 497 BLAKE2B f21bb8a043e512036294e7af578c86aec248b4d8fd76bbb2c86026d7c1c8cc4e0bdd1725685ea3ff861dc2a63708b740fa45c7e19b95589de0fd6fac4391b3e8 SHA512 5275f1799db5d847e09eae59d624ecf40134513a3c9c370a6ad05ea0808b7f456eae32a37c1501e156d26d155a8f692d4f661757c0a2f0b436cc46666930850d
diff --git a/dev-libs/rocclr/rocclr-4.0.0.ebuild b/dev-libs/rocclr/rocclr-4.0.0.ebuild
index ffa5203065d2..14d12c5c2f5d 100644
--- a/dev-libs/rocclr/rocclr-4.0.0.ebuild
+++ b/dev-libs/rocclr/rocclr-4.0.0.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
@@ -31,7 +31,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_COMGR_LIBRARY=YES
 		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
 	cmake_src_configure
 }
@@ -40,5 +40,5 @@ src_install() {
 	cmake_src_install
 
 	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
 }
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 555f92a5dd57..293b35a21069 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,7 +1,9 @@
 DIST rocksdb-6.14.5.tar.gz 6396476 BLAKE2B c5fc6e9e306ad428285d2c42958804ff403e14fc6b0c2f1231f49197a98937c0703422e1c14f357fb2b3c138fc038ce46c57cce1d184e4babec3c094b00e5180 SHA512 76e4a5b8a7061e42e9d010d04204429a446c857b29a199456db1f207a4849bedc98c7368346b87fa3a69ee5a3d68abedc943248b960273194a9e71634c767258
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 DIST rocksdb-6.15.2.tar.gz 6499824 BLAKE2B e0fa1dd2c7a7b03e561690c6ac16b15bfafeb27ce226765a591c365b4c2f665138170e0b37f3c65990d6a78a63dbab1f78b875c4a81ca63df46d9118aab34c00 SHA512 1471776a87f1136a7276fbc4c53a1b69ca40110adf49ac459d6f641c1ef8a75482cff3c9b89482ff4edaa186c9a6d0285d38c544c6abf2931508359cfe4cf1a9
+DIST rocksdb-6.15.4.tar.gz 6499986 BLAKE2B ab0d34f4e8a0b99f695380cc07c886ca292bc0ab3cf34d0b2bc6b6c24e42cb6f1b134997f13843d312964e25a66d62be615d19e005ac1e230172925552ca7bcb SHA512 2c8c7c031f368d329826d00f4e507b532b58dcfc6c75b792a027923b5d916c2a43fb2d4e336d3a6d047a90c0280fb80f0cad3311779d6c5e0d74bcd002cbb246
 EBUILD rocksdb-6.14.5.ebuild 1131 BLAKE2B d9c9e434bf00f96c522ef7c7969e6a6f0cc340ea89d20116d7fd387a138437fd6017863254a5c28109655e8afbc96950dee0a8d8346036e7b2072effcdce720f SHA512 607163c646486d3706e376f838c19f236a49d5ada63a4a2479c589fbd91f11e03fc2f34dae70bb24c8963eacbc80ad09458b964f29a8a6cd1eecec7c7eb2a9f7
 EBUILD rocksdb-6.14.6.ebuild 1135 BLAKE2B 37312256839a7bed793f2051579a6756e5a5996350fbc827b3aa2ee9f9202c9f2459c7d005172cdeb7e7c2d105c8ff38fdf6eaf8b73659f1a3df1d75c0529204 SHA512 51ef260e5b176bbfebf40273c4c44d6ec6f3a84434b68058a12b9be18333a8b82bd8903401adf4a2d0d3f80683d5f38680a6311743e5aa328bc75c1801da1df8
 EBUILD rocksdb-6.15.2.ebuild 1135 BLAKE2B 37312256839a7bed793f2051579a6756e5a5996350fbc827b3aa2ee9f9202c9f2459c7d005172cdeb7e7c2d105c8ff38fdf6eaf8b73659f1a3df1d75c0529204 SHA512 51ef260e5b176bbfebf40273c4c44d6ec6f3a84434b68058a12b9be18333a8b82bd8903401adf4a2d0d3f80683d5f38680a6311743e5aa328bc75c1801da1df8
+EBUILD rocksdb-6.15.4.ebuild 1136 BLAKE2B 4adb963c7f85e3f666ac72c51fea0fc0878e092f2db7727f76b01926c4729c6bff78f12e43ce8d75a771604d7c1c47c815587c3fb2cdbb6398bcd590d165c5ae SHA512 4577f5b87913f31e4ea88b8e4f89332d34afdf5a820d508cb21fa1e788c627fe2f157832eca745db387523d5853571569ac2dfda4ae8fb5371fcc482d81e9cb6
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/rocksdb/rocksdb-6.15.4.ebuild b/dev-libs/rocksdb/rocksdb-6.15.4.ebuild
new file mode 100644
index 000000000000..82c631ca50fe
--- /dev/null
+++ b/dev-libs/rocksdb/rocksdb-6.15.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Embeddable, persistent key-value store for fast storage"
+HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	dev-python/zstandard:=
+	sys-libs/zlib:=
+	jemalloc? ( dev-libs/jemalloc:= )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gflags
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DFAIL_ON_WARNINGS=OFF
+		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DPORTABLE=ON
+		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
+		-DWITH_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 6034ddf96623..61e183758dc3 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -11,5 +11,5 @@ DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a
 EBUILD rocm-opencl-runtime-3.10.0.ebuild 1991 BLAKE2B 02a1c528bf0e7f6af7859fa2d61c9902401ccc7f669fa2f1cf4fd0fc34c754dc75ae900ccb495f583f464030628617c14ee0c5179fefdbf77ce66a7544523de5 SHA512 bcf6e76c6fa5627d8f6db89221bf3cd6502207a85f742a0cdc0fd72564f8943c44c80debe7fdefb1587cf5ba18c824facddf4f01733fc3d515f06965be0e825a
 EBUILD rocm-opencl-runtime-3.8.0.ebuild 1990 BLAKE2B cc2505fab0d3b8c7f3cb811830adc6e5c29a6c936bd285fe4efdd2aa7ca23270835776e83fd779bbb38fdd12a58c325c6f77fa4da11bb1bdb658ff01c7d85421 SHA512 128038aae836ee3ac0835b479a1268d3a261f575a127e0c0f515d78c50c900856d37353f46e90e320202bbf5917c8380e1551b09cccb6259840eebbfc069d114
 EBUILD rocm-opencl-runtime-3.9.0.ebuild 1990 BLAKE2B ae0db60899859a06173de28df69df907a874e26e83961fe35773b5fe09fa9edf55ccf079da04cb014d422622185fcd4c3dfb1d9f6a76219c69b9443c7ebb42bf SHA512 a269a7dd54e293f331a79866d2de78e0778ffb8ce58206d335fe275b4cb8af31b65d909363463b0927d3c2356b172bd8ee952af36baf704cb80d1aee71516072
-EBUILD rocm-opencl-runtime-4.0.0.ebuild 1991 BLAKE2B 02a1c528bf0e7f6af7859fa2d61c9902401ccc7f669fa2f1cf4fd0fc34c754dc75ae900ccb495f583f464030628617c14ee0c5179fefdbf77ce66a7544523de5 SHA512 bcf6e76c6fa5627d8f6db89221bf3cd6502207a85f742a0cdc0fd72564f8943c44c80debe7fdefb1587cf5ba18c824facddf4f01733fc3d515f06965be0e825a
+EBUILD rocm-opencl-runtime-4.0.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
 MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
index 125321094992..d3a5d3f5ef89 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.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
 
-inherit cmake flag-o-matic
+inherit cmake flag-o-matic prefix
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
@@ -42,10 +42,9 @@ src_prepare() {
 	# Remove "clinfo" - use "dev-util/clinfo" instead
 	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
 
-	# Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
-	sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
-
 	cmake_src_prepare
+
+	hprefixify amdocl/CMakeLists.txt
 }
 
 src_configure() {
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 2f2b15a2b6e3..785e355b2ad7 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,5 @@
 DIST serd-0.30.6.tar.bz2 609365 BLAKE2B 35a86847642ffe806797ae8dbcd292ce26f08135edfa3b1fd39652f8964c35d73dba8f8627f32dcff399e9cddc332e5484f14a80580a32d52d93977cd9b42912 SHA512 db08d6c67d8627728679d0ed3770b8219a58f3eef82194ef8ba5682d3ff1f1033e2bbc8d6a1115a3fe0e32990f635c707a81ad8b4f457153fa78ff5991c9c30f
+DIST serd-0.30.8.tar.bz2 590817 BLAKE2B 31a485fccfb13e54e124cde0626ad16f3cc7f9c1f8d8c051ace7a98bd2bd5d6a2d159943f15f5734e028a31ce5eeea9d602f55bf6cf1277d532ae799e0c1895f SHA512 d12c4dea1a15b2aed9fb9d640affae23a4fbfb53b7f873af30b462ce96f3c22ee464f5b111f87a221e6ac51f4885c23bba023892331ab10d0a8aa0e27fcbd0fa
 EBUILD serd-0.30.6.ebuild 1150 BLAKE2B 6b9b3acdc7f5a7526372c734ea4c387bc0d6dc3ceb96d640195d92e327c5063d70ac0836dc642a4a7837f2e366aa63d976d879f3466ef295cffd00eab37e677a SHA512 d0e51f23f55c53a3259476a8e6fcab1e253f358b209303cf62670eeabca7b69139921cc6437c91dbdd3f0f0aaec87b0a8500fae6cd1aa7d8bc73d305f334885e
+EBUILD serd-0.30.8.ebuild 1169 BLAKE2B 43226b49e439c519f54ea05740f26f2abceed36b54fd7528214f6ab03e7e6c0fb896a21b3eeb524ea65ae022896053ad001eaabfd5b594fb73940d032a0c1655 SHA512 f691d8cd6334d49f1f99b8c443b11e649701c5a735875484a756508a714868ed44949af11856bb301a30dd8943a821bb7247f6b4407d0d5a6d6a9a93f4e5b61b
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.30.8.ebuild b/dev-libs/serd/serd-0.30.8.ebuild
new file mode 100644
index 000000000000..904e3cb77308
--- /dev/null
+++ b/dev-libs/serd/serd-0.30.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="http://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 626a8736d4e7..11f46a2b5100 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,9 +1,12 @@
 AUX simdjson-0.7.0-dont-bundle-cssopts.patch 1318 BLAKE2B 29fef993c326fd918c279ea70c06eba2bf69ff881577326c90b037ac538c4e0c75f156a86406b7fc357eaad7f5211bc255e885b57419c88af91087d519561e54 SHA512 77901d87773b2469011bce126520d33463907568991a1f2192492ac52331789c1e1cdc8251e2cf413c6493bb97a5e8737799ed3258616cb552ee038e9be65d26
+AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676359cd5c02cbdc5c97d3645c627667b6986b84bd53285103b50d152d663469623d973ca6f1332fc6b554412ba57be9395dd17a016e1 SHA512 00814353defbd7b77a88ad67faa151494c203470cc4627d8777f8dad7e5918e7650514b76dfb3007644a0864fc848cc30bd71aa61ec86b93bb9b66417da3d961
 DIST simdjson-0.4.7.tar.gz 4119328 BLAKE2B f19a603b83282081457f548bd9b609f4fc4b9b0e32c868c8d4ecc15fbc359e6463576c24f38b6623cd72cc4681a1db42ec45ee605df6096876982caa9f96be91 SHA512 023e8b75652cb29c41eb1e01ebc6c484b28ff5f6736c885fb5d8c639b1047660fd0eb24d131dabc035fc7fc824e15fe49b177bc3613e329f1d8cd956173a490f
 DIST simdjson-0.6.0-ppc64.patch.xz 23704 BLAKE2B ab26e93960d3e3cc2c7782516ef2e6e36fb259c1bd83b967f32b0ba899ca9f80468a47cc3344dd9dc392898626a88b4a1de42899502a989511945e573bf7f259 SHA512 c8e1233c7e6f92cf0c92206ae1023cd30067004e4e53fed86d11e105490f281bf1b8a0806880d02427485fbade24aeb7a7b027b17c9f05552089cf867f3029eb
 DIST simdjson-0.6.1.tar.gz 7889048 BLAKE2B 35b40e5e278e5093f5f07ad9e27ae23417f206bf2f4f624a6130931882db49632fc5141d027deca4977a3efa1fdfc7d8fc0bc2149d938a985a850eff4250f5bf SHA512 df5f6c717b3c4cfcde7757dff74d51c93f4682729fdbcdaae89d82db13bba006fe0378bc601d5bdf1d4cf2f0fafce56eb88aba8ca9648787a64cf160cab479e4
 DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
+DIST simdjson-0.8.0.tar.gz 7993692 BLAKE2B f2f04b3f9815645fcb4fcf2d10b0a234177042a0f4e306b0e130d5136c627344201a1f7c4d1ba6cb1ce30debf44f00694bc9a5bb646040bb614e91ae31bf43bb SHA512 8c41e07dbc3668105131c5a22060891c54f7663ec512d6c12f18eed0971fe245c3adb8d27c27305827314ebff39d2c940bd3715fa12e1ce9332d9bf3693424f2
 EBUILD simdjson-0.4.7.ebuild 622 BLAKE2B 591dc46e83afe30ff0aca4594a199302a237b078be207e3f7634bb76b1694319caf14ae83b3b7fff22c5bdd93cad5292c0e57ed5935c8c28c9931fae6bf75f80 SHA512 0bda85cfeb83a52657c9a127ae8711af162a92fe247f00e957896ba077509634654df11619c628cafc75fcd5efe528e57c69f69819582c91610e5e7b063d5cac
 EBUILD simdjson-0.6.1.ebuild 928 BLAKE2B c672740e77bc519b647d2f72efec2262b46629c3b9bdc429a647c0f08ecdb2fe3dd76ce81209d0359cdf9978086fe87e9428853369fd6f08de2698ccceb90364 SHA512 08daa7a4bae1325d3cd4dcc8bed8d44f86c2971404310dc013a0bc5ce4ccb9c61cead4dbc478cdc97f9bcb360289901ffa81abb7c29c592074f16de720f2da87
 EBUILD simdjson-0.7.1.ebuild 1038 BLAKE2B 0aea6fa87992593836dd852a8982bb5fdaec652a629d4fd2e5783cd2a5823539a0b0227f77aa0ee6077d9f20f0fe44209d0564ed4c80c60e5ad05010a346d0df SHA512 ac317104a1255436a41cc860f854fc2e2054ac2adc0866cd5b86b289833f8823d7360b72433dfedd91208e828a45d7fccc135e24fefa0f4c4ef964832f0ded1b
+EBUILD simdjson-0.8.0.ebuild 1152 BLAKE2B 3738cc0a48c655ab183165ee5ff50cb2435feb360ccceb5cf95155689ad86bda45ee6b5dac6615bf1d33c52e53fd7ac9ed0c65bd3258799b11396ce164fd1cba SHA512 249f066ea4482c0e4e5612a47a548ee8966c8737d7f8f8376ac4579cb0737a5a647616c682808f7f21655c6ef32281f7df62f627bbdff43bb0cba980d01a1e0b
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
new file mode 100644
index 000000000000..6a76cf83ed98
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
@@ -0,0 +1,40 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index 2c41169f..2f5d4436 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -129,15 +129,3 @@ endfunction()
+ if(SIMDJSON_COMPETITION)
+   competition_scope_()
+ endif()
+-
+-cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON
+-        SIMDJSON_ALLOW_DOWNLOADS OFF)
+-
+-if(SIMDJSON_CXXOPTS)
+-  set_off(CXXOPTS_BUILD_EXAMPLES)
+-  set_off(CXXOPTS_BUILD_TESTS)
+-  set_off(CXXOPTS_ENABLE_INSTALL)
+-
+-  import_dependency(cxxopts jarro2783/cxxopts 794c975)
+-  add_dependency(cxxopts)
+-endif()
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index f1a82be7..b1b7b1a0 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -1,10 +1,8 @@
+-if(TARGET cxxopts) # we only build the tools if cxxopts is available
+   message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
+-  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
++  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
+   add_executable(json2json json2json.cpp)
+   add_executable(jsonstats jsonstats.cpp)
+-  add_executable(jsonpointer jsonpointer.cpp)
++  add_executable(simdjsonpointer jsonpointer.cpp)
+   add_executable(minify minify.cpp)
+-else()
+-  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
+-endif()
+\ No newline at end of file
++  install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)
++
diff --git a/dev-libs/simdjson/simdjson-0.8.0.ebuild b/dev-libs/simdjson/simdjson-0.8.0.ebuild
new file mode 100644
index 000000000000..b97cc2e514e7
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.8.0.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 7d472228c8bf..7edeee3f8769 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,7 @@
 AUX sord-0.16.6-x86_32.patch 1292 BLAKE2B 0177c404d77cbc27a79a31b21c6c7e51015aba6c912bc2e3ed660f1d9516cf6afe8f52fd2f2bcf4028addc340f441cf9c1a61d412b10bd5e696ccb10902db33f SHA512 c851bd761eb1c77177c5333208f74b577a36a8e5b0ea0b2dc704c30d1e984c28df7003208ba629981a395b5e893b94289210f6c6273f51551d595276353cc1bf
 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 1209 BLAKE2B 50705d86ad1249edb4b50e98de14f3e688c695857a0dbd5164640e9faead3d4aca78ede2e5815eefe0d9d6e892a8be034a14d9de600041ffeebe9ca56774652c SHA512 776681996a5455ec35bdb2119c463072b70dc17b2357f90e8feac33dbe206ea8ceff92277559c7ea9a466b995a3b88d551f7c6ad2c1ac3c3678907768c01c1f2
-EBUILD sord-9999.ebuild 1169 BLAKE2B e814b98d57f0c12b816134b113417f4fb09923c56a275cd54086f54529242335cd3df8a8d7bb8ecb458f530c83ec2dd55bb10fd38483baa91773e6bb16d498d2 SHA512 4a88c8475943eb0bf4a487124c1cac7c891c3ffa53bf460656e170db13e9b55ab87a672a62d16833eb89c957718ca739ea6c12f1dc5c6e07315ee7231342d02b
+EBUILD sord-0.16.8.ebuild 1183 BLAKE2B 58f9bfc2a14dde0724a95b75a6713d5afdbecb970ec86d1a07bc2c065925502e6a423beac21e9a38d224e4dbc14ad0bca1f78df2a4397384219280e2cfbe2c02 SHA512 b502494aeb269a6b93e9b905a8d75a77dfafa1be21369b4e4ec50d13184881a2feae57cd40946d444c5a72ae668c5efa0145d9f6032aeaaa617d17cece8d4710
+EBUILD sord-9999.ebuild 1130 BLAKE2B b1ebded59cf6e0242410f78acd7c47198d1ebaef9580065da61b0a4966f1056cd72707f213abbcf9aa394d90ff5092e860837ef4e7ef5332da31841cbd3b16a1 SHA512 e4800837ec5768eb69dffeab625f41fc0de550ce3d4b9e5019c28afc454d8d29419dfce4863c4aba20b7781ed0c4500b4762f0fe77047bd855246fdb8f7d23c4
 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
new file mode 100644
index 000000000000..f9551082fe8a
--- /dev/null
+++ b/dev-libs/sord/sord-0.16.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/libpcre
+	dev-libs/serd
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index acfd96a2744a..1b9cee461c13 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-9999.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=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
 
@@ -17,21 +17,19 @@ KEYWORDS=""
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-libs/libpcre
 	dev-libs/serd
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
+"
 DOCS=( "AUTHORS" "NEWS" "README.md" )
 
-PATCHES=(
-	"${FILESDIR}/${P}-0.16.6-x86_32.patch"
-)
-
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 4a256ea2d352..0273548fec2b 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,8 +1,8 @@
 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
 DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a91d17b014abec26fd0f2ce3d25dd33cfb925f4468fa32da394f6efaca033290bdcf66abe8b067444999b87b63 SHA512 e15d461ac7a6d3d3186fe4283e4fbaf56b2ce3011babf892e3b2d3dbdd7e999a861f1f6f67a9d88a5cf488a440add087ea78e96131f49b52ed6c7815a972799a
-DIST spdlog-1.8.1.tar.gz 293528 BLAKE2B f5568a52489d9f6db459dd7733c493720551f7cb53be5f25fd7e02ec89de88b968bacd3eacb390473258cba2686e2614f21a700e3b3faf66d9b8eb74cfa263cb SHA512 ef855f4f91ed8aba89ef0191a9fd70f73a49567332f7eb42da1604e3a7dda3bbe48db3fd0fae317bb11ee95315d8cd62bf586d2de919ca0978d91e5a971b1c3f
+DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
 EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
 EBUILD spdlog-1.7.0.ebuild 937 BLAKE2B 415b5e6af56a86eb3c204d00f801cbf58d8763f7be2f9fe8a5891aca11dcb4f1b9ae5e748a5276cf052dea08b0e102c279233efd0055fc6fd3f91428d1f534f5 SHA512 714d48d21166541d80de368c508a4d299e2c4e883e0ffb819110c2ac9c722928e8105f94b37f82704b7a7f964ef7b8ec673099fdf0a8f515bef899d1c5edb129
-EBUILD spdlog-1.8.1.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
+EBUILD spdlog-1.8.2.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 EBUILD spdlog-9999.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.8.1.ebuild b/dev-libs/spdlog/spdlog-1.8.2.ebuild
index 0cd2105637eb..0cd2105637eb 100644
--- a/dev-libs/spdlog/spdlog-1.8.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.8.2.ebuild
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index b580de53edba..c544522756ef 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,7 +1,7 @@
 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
-EBUILD tree-sitter-0.17.3.ebuild 646 BLAKE2B c67c4ec09e70ad7ea3799cdb38c304a46494087f821967b2b28dd29d64a40858509a9d10513343991ff845c7f807a4cdbf597595fe69154de24a57880f6e72e9 SHA512 795feae856a3e42de92108a369f3b071c4a520eb5f365c8434a305a9442580813625204e36546f9eb20b90df59706c3b14d2cf2d3083eb148266224cb4a55590
-EBUILD tree-sitter-0.18.0.ebuild 646 BLAKE2B d925dd2bd884b0b88fb297b0925115394914bf872890b46afd74b2db446de0129b985a5c91894e5f77b7adfa1410b65f6a57a91d0c91d4fc10d5123ec5a228b8 SHA512 71c0896f943ce1fef64d558f40e8a951796da7b78598885e054dd07c37ab7591b3fe8b55769c5732c7a8ed1a0ae883b40c252f6370f86636752f92461d3a1df6
-EBUILD tree-sitter-9999.ebuild 646 BLAKE2B c67c4ec09e70ad7ea3799cdb38c304a46494087f821967b2b28dd29d64a40858509a9d10513343991ff845c7f807a4cdbf597595fe69154de24a57880f6e72e9 SHA512 795feae856a3e42de92108a369f3b071c4a520eb5f365c8434a305a9442580813625204e36546f9eb20b90df59706c3b14d2cf2d3083eb148266224cb4a55590
+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-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.17.3.ebuild b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
index b50d6429cd9a..547703a2d329 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,5 +22,5 @@ PATCHES=(
 )
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/lib64" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
 }
diff --git a/dev-libs/tree-sitter/tree-sitter-0.18.0.ebuild b/dev-libs/tree-sitter/tree-sitter-0.18.0.ebuild
index a59778d2f559..547703a2d329 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.18.0.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.18.0.ebuild
@@ -22,5 +22,5 @@ PATCHES=(
 )
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/lib64" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
 }
diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
index b50d6429cd9a..547703a2d329 100644
--- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,5 +22,5 @@ PATCHES=(
 )
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/lib64" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
 }
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index 6fe0dbdbd459..576d787b4a89 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,4 +1,4 @@
 AUX ucommon-6.0.3-install_gcrypt.m4_file.patch 4902 BLAKE2B 5c56eb0d9e397a653eb1a932e49cdce0c30fbe52f98f8d1b7403c27f53f5371da6f0bde83dff18250bfec5c9d3817bedb803d49344183e0dc5cb117e688dea6a SHA512 13604093ed0dba4064a8868785309d1de645dc0d010940febbf29166f69302c7272293bf161514396064d4f2ef0805dc6bb30336773568b0e5959ef76c1a0aad
 DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
 EBUILD ucommon-7.0.0.ebuild 1484 BLAKE2B af9da035d218d5893778df542e1c4e268448f49490b74977a3e22d7a0f7fa04392cc416c58fc1dc45d7ae2ce35df4b608b1ea48446ee107352a110c7c96fd9dd SHA512 63a6e1f23bc2cb0ad097fdb13716dc40e28e9d3792f4561ef94afd2130482d7b9a0d88ba5f9680510d3a1ad7a205ef59e903b2c2fe7b525e3874929ff02c5fd1
-MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml
index c5adddd4b3e6..6f49eba8f496 100644
--- a/dev-libs/ucommon/metadata.xml
+++ b/dev-libs/ucommon/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index df362291022f..0e02932200f2 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -1,5 +1,8 @@
+AUX unittest++-2.0.0-Add-support-for-LIB_SUFFIX.patch 2311 BLAKE2B c7d8511fbf0973f1209e0b555b3550b25692d306f35274e4e3dc8864d2928fe47930cf74f9e17e6c09cd1dc43e6c14a8f2f1f1444a5149b3d0e18a1672c78996 SHA512 638ee1aa92fdfc0148563e493b3853b4e8b71e69a8d0a279e6d033b6ecf2de9fe4b2e6b0b57ad8e242bda7d4a19ada1bd26649745ef2297275615e87a82a3ac7
+AUX unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch 999 BLAKE2B 02ac677273d5b2c52e23683b878df04095ddfdc294c87778da71e1e3f4a2c0b2012f9ffb78f92f43a5667b8c76426abf094b8048c76283f69951f3e8e3fbb104 SHA512 089ab6aa6b68f52ba7d61a4b7929cfefe4feb25b73ff6ab0f05e9a8fec29e502bc2bf5c16cd620808e24267f04b3330572baf232d8ce78e459d439c22b22d0b2
 AUX unittest++-2.0.0-fix-tests-with-clang.patch 1018 BLAKE2B 5913b010ceae5975b8cdcfe7656c137cfe47845ae92815d3b7fa66f429a712e686cb7accb400c43149458b6716020c7ff48f0a673a7c2b7bcc36f5cf0fcd40ae SHA512 dd77794e8c22e168235f14c3c00381bf7439bfe60a700ae038290c93e2f6faa276d4f45de17a159d7a1edbb182a40b078b7751a25e1dcf646e7d311fd33e31cf
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
 EBUILD unittest++-2.0.0-r1.ebuild 1082 BLAKE2B 1ba9a0302f39ea36d30d3566e2d185ece2f7a5cebcbf872338b25ebdd447ef4d4abe3f3fc9dfe37ec72cc50cdd14637363d301c338fb94dd44fcfcbd340ca2e6 SHA512 fa6347d4a4da9e656523f49c31f0e553a2c45203edad7a1a70bbfd0a9c9c5b7e08ad003b299d6174dae93925ad38863f1fd86d00b4b0706de060b6d0027dd7b7
+EBUILD unittest++-2.0.0-r2.ebuild 1204 BLAKE2B 41ead1db3468995edbebf103b4e66cfd0673e005047c4f1907ef0949e77c8029668489f7654857088c9b3efc874f6eab82abbfce185c7bddd48606d009c4dfcb SHA512 4169f5f74ef3a3946984ffaef47f93c9572e506102fdd2b689be785f42866f094dbde0b03831312a1f4122f1f3be24eabc038f4d7903b5b8975c5707f0ea148b
 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++/files/unittest++-2.0.0-Add-support-for-LIB_SUFFIX.patch b/dev-libs/unittest++/files/unittest++-2.0.0-Add-support-for-LIB_SUFFIX.patch
new file mode 100644
index 000000000000..fcaad5b0e69f
--- /dev/null
+++ b/dev-libs/unittest++/files/unittest++-2.0.0-Add-support-for-LIB_SUFFIX.patch
@@ -0,0 +1,55 @@
+From 0757ba8f903fc94ac852c8ba394cd96358b0e2c7 Mon Sep 17 00:00:00 2001
+From: Christoph Willing <chris.willing@iinet.net.au>
+Date: Mon, 23 Jan 2017 17:49:12 +1000
+Subject: [PATCH] Add support for LIB_SUFFIX
+
+Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
+---
+ CMakeLists.txt | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a0f5511..6b490ef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,8 @@ option(UTPP_AMPLIFY_WARNINGS
+     "Set this to OFF if you wish to use CMake default warning levels; should generally only use to work around support issues for your specific compiler"
+     ON)
+ 
++set(LIB_SUFFIX "" CACHE STRING "Identifier to add to end of lib directory name e.g. 64 for lib64")
++
+ if(MSVC14 OR MSVC12)
+     # has the support we need
+ else()
+@@ -92,10 +94,10 @@ else()
+ 	set (UTPP_INSTALL_DESTINATION "include/UnitTestPP")
+ endif()
+ 
+-set(config_install_dir_ lib/cmake/${PROJECT_NAME})
++set(config_install_dir_ lib${LIB_SUFFIX}/cmake/${PROJECT_NAME})
+ set(targets_export_name_ "${PROJECT_NAME}Targets")
+ 
+-install(TARGETS UnitTest++ EXPORT "${targets_export_name_}" DESTINATION lib)
++install(TARGETS UnitTest++ EXPORT "${targets_export_name_}" DESTINATION lib${LIB_SUFFIX})
+ install(FILES ${headers_} DESTINATION ${UTPP_INSTALL_DESTINATION})
+ install(FILES ${platformHeaders_} DESTINATION ${UTPP_INSTALL_DESTINATION}/${platformDir_})
+ install(FILES cmake/UnitTest++Config.cmake DESTINATION "${config_install_dir_}")
+@@ -103,13 +105,13 @@ install(EXPORT "${targets_export_name_}" DESTINATION "${config_install_dir_}")
+ 
+ set(prefix      ${CMAKE_INSTALL_PREFIX})
+ set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
+-set(libdir      ${CMAKE_INSTALL_PREFIX}/lib)
++set(libdir      ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ set(includedir  ${CMAKE_INSTALL_PREFIX}/include/UnitTest++)
+ configure_file("UnitTest++.pc.in" "UnitTest++.pc" @ONLY)
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+     set(pkgconfdir  ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
+ else()
+-    set(pkgconfdir  ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++    set(pkgconfdir  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+ endif()
+ install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/UnitTest++.pc"
+         DESTINATION "${pkgconfdir}")
+-- 
+2.26.2
+
diff --git a/dev-libs/unittest++/files/unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch b/dev-libs/unittest++/files/unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch
new file mode 100644
index 000000000000..44c243670027
--- /dev/null
+++ b/dev-libs/unittest++/files/unittest++-2.0.0-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch
@@ -0,0 +1,28 @@
+From 85bade33f596a4dab33eb6d44f662d64fc20f510 Mon Sep 17 00:00:00 2001
+From: Iblis Lin <iblis@hs.ntnu.edu.tw>
+Date: Sat, 14 Jan 2017 23:00:24 +0800
+Subject: [PATCH] cmake: fix pkgconfig dir path on FreeBSD
+
+---
+ CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fb10f47..a0f5511 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,5 +106,10 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
+ set(libdir      ${CMAKE_INSTALL_PREFIX}/lib)
+ set(includedir  ${CMAKE_INSTALL_PREFIX}/include/UnitTest++)
+ configure_file("UnitTest++.pc.in" "UnitTest++.pc" @ONLY)
++if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
++    set(pkgconfdir  ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
++else()
++    set(pkgconfdir  ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++endif()
+ install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/UnitTest++.pc"
+-        DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
++        DESTINATION "${pkgconfdir}")
+-- 
+2.26.2
+
diff --git a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..4930c05f9b6e
--- /dev/null
+++ b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="unittest-cpp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A lightweight unit testing framework for C++"
+HOMEPAGE="https://unittest-cpp.github.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# https://github.com/unittest-cpp/unittest-cpp/commit/2423fcac7668aa9c331a2dcf024c3ca06742942d
+	"${FILESDIR}"/${P}-fix-tests-with-clang.patch
+
+	"${FILESDIR}"/${P}-cmake-fix-pkgconfig-dir-path-on-FreeBSD.patch
+	"${FILESDIR}"/${P}-Add-support-for-LIB_SUFFIX.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# https://github.com/unittest-cpp/unittest-cpp/pull/163
+	sed -i '/run unit tests as post build step/,/Running unit tests/d' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Don't build with -Werror: https://bugs.gentoo.org/747583
+		-DUTPP_AMPLIFY_WARNINGS=OFF
+		-DUTPP_INCLUDE_TESTS_IN_BUILD=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}/TestUnitTest++" || die "Tests failed"
+}
diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest
deleted file mode 100644
index 9c6a31c4e408..000000000000
--- a/dev-libs/ustr/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ustr-1.0.4-build-libs.patch 2058 BLAKE2B 93162c8a35b892dd55a5334bbbfc718be959d597f969fdf1a712b49e490d04510268dad927ecdd2c9333eeb39c9091240887bb59b9b69a7e6e7887654c4676dc SHA512 122c38e4779526ae821341b10757454b28c35d59d99aee919d23f691fc06b019983467c5bdd0b8ca8d3e939e357e9bb588f61d4dd2ebb33235d720d637f20f86
-AUX ustr-1.0.4-gcc_5-check.patch 1087 BLAKE2B bd0414477fa789f5f6c3ef5292bd5b58f7fa8c396a739752c3fc5c4e8b456912273c5ab5fce6cc4a71830c003ac5c8e43d371177f2ed07abe3e614cff8bffb69 SHA512 b669a40929cf45cb83aa5c738cb58676cc9c08ee6c84dd7c79352c6aaa7aa36526a0878e98d78b45cfe3c7f62e9b014fe9eaf01fb1b4b460658cfcb1e77d7dab
-AUX ustr-1.0.4-inline-check.patch 1098 BLAKE2B d51410975458329f1587f747d03cfec52e212e8b22e20f159db254007fb2b29b30c335e3912443797c1c03132e7d4dc584b6d66962cb8982e3782b326c9af46d SHA512 08559671006e20f8cfb10e85738e420529822ec916acca29ab14f3f0ab77805b102ae5a60779f09978e334c167550a62eb960853d5821e308c056b4fec93117e
-DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320f5177a0f3c2b2e156a5756918e269053363d47608661a47d8969b8c505192edea316edbd9fc17649d8dbc91 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510
-EBUILD ustr-1.0.4-r8.ebuild 2028 BLAKE2B 6a6ca22ce593a1c804845b15a01da4c9a8d05434a3adf3af99c2cb55a5b6dd2938e2aacd1c6efe01d2988ed41d599a505e49f68981cc40cf4e1f862ae0b320e2 SHA512 34758bb22166a92f73e7e0324d5cd3d00927e1e540d3d062d07d77eb63d5b3c9101230de1a9b4f82e4ad1a4f7e05f5aae8b8b6f40939606aad8500640ff600f3
-EBUILD ustr-1.0.4-r9.ebuild 2039 BLAKE2B 1e24b6bd04be4535078479c7768b5c9434bed53d05f2711d0444a899262c53f35df90d5f155a5356e4461d570febc76e5cac244248327483c9679f0179997f89 SHA512 e58e53e73b4a8024a1531c19f13d919acf81d9714e60f7093a2b65c9ff1a857cabbe4ddd9c0854dc4d4e8acac7367630aa6082c1adb5573896c7c3f435849c9c
-MISC metadata.xml 479 BLAKE2B 4d19665a6413f27085ed035e5cd7fef83bae1d56dd2368079ec3166dd2a7e324ec1970aae754cec809014b5248fdc58053aff6277f3ae804d6f1e3300370984f SHA512 bf3530e0e77ddeaf0c97d4290d0f0a6101ceebfc41bc6df8758ed47938f2c791359ff723964bb8159e76fac6fb6ca64f1dee18a2e7fe445bbf59571a71d5bd3b
diff --git a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
deleted file mode 100644
index 79fe818c8edf..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-make static lib build/install controllable so we can disable it by default
-
-punt the -debug lib variants ... if people want debug libs, they can rebuild
-the package using their desired build settings.
-
---- a/Makefile
-+++ b/Makefile
-@@ -291,8 +291,10 @@
- OPT_LIB_SHARED      = libustr-$(VERS_BSO).so.$(VERS_ESO)
- OPT_LIB_STATIC      = libustr.a
- 
--LIB_SHARED = $(DBG_LIB_SHARED) $(OPT_LIB_SHARED)
--LIB_STATIC = $(DBG_LIB_STATIC) $(OPT_LIB_STATIC)
-+LIB_SHARED = $(OPT_LIB_SHARED)
-+ifeq ($(USE_STATIC),yes)
-+LIB_STATIC = $(OPT_LIB_STATIC)
-+endif
- 
- DEPS_NONC_ALL  = $(SRC_HDRS) $(SRC_SRCS_H)
- DEPS_C_ALL     = $(SRC_HDRS)
-@@ -388,17 +390,14 @@
- 		install -d $(DESTDIR)$(bindir)
- 		install -d $(DESTDIR)$(libdir)/pkgconfig
- 		$(HIDE)echo Installing files
-+ifeq ($(USE_STATIC),yes)
- 		install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC)
-+endif
- 		install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED)
- 		-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
- 		ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
- 		-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
- 		ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
--		-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
--		ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
--		-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
--		ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
--		$(LDCONFIG) -n $(DESTDIR)$(libdir)
- 		install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS)
- 		install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS)
- 		install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS)
-@@ -406,7 +406,7 @@ endif
- 		install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1)
- 		install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3)
- 		install -m 755 -t $(DESTDIR)$(bindir) ustr-import
--		install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc
-+		install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc
- 
- ustr-import-multilib: ustr-import-multilib.in
- 		sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@
diff --git a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch b/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
deleted file mode 100644
index aaed1503030a..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/ustr-conf.h.in	2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in	2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,24 @@
- /* this is the custom version for the library itself, for everyone else
-  * ustr-import generates one depending on the options. */
- 
-+/* If this is GCC with major version 5 and up, the default C standard
-+ * has changed from C89 to C99 so the old inline behaviour must be
-+ * restored:
-+ */
-+#if defined(__GNUC__) \
-+ && (__GNUC__ > 4) \
-+ && defined(__STDC_VERSION__) \
-+ && (__STDC_VERSION__ >= 199901L)
-+#  define inline inline __attribute__ ((gnu_inline))
-+#endif /* GCC greater than major version 4 and not -std=c89 set */
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
- 
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- *  because by the time we've included a libc header it's too late. */ 
-+ *  because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
deleted file mode 100644
index b38cf7829c9f..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/ustr-conf.h.in	2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in	2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,23 @@
- /* this is the custom version for the library itself, for everyone else
-  * ustr-import generates one depending on the options. */
- 
-+/* Ustr relies on GCC's traditional handling of inline functions, not
-+ * the version that was actually standardized in C99. GCC-compatible
-+ * compilers define __GNUC_STDC_INLINE__ when using the standard
-+ * behavior. When this is set we must restore the old inline behavior:
-+ */
-+#if defined(__GNUC__) \
-+ && defined(__GNUC_STDC_INLINE__)
-+#  define inline inline __attribute__ ((gnu_inline))
-+#endif
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
- 
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- *  because by the time we've included a libc header it's too late. */ 
-+ *  because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
deleted file mode 100644
index 97b72ca3a65d..000000000000
--- a/dev-libs/ustr/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sven.eden@prydeworx.com</email>
-		<name>Sven Eden</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-<use>
-	<flag name="ustr-import">Install ustr-import developer program and source code for bundling.</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
deleted file mode 100644
index 8515c489b472..000000000000
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr/"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-IUSE="ustr-import"
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ustr-conf.h
-	/usr/include/ustr-conf-debug.h
-)
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc_5-check.patch"
-	epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch"
-	multilib_copy_sources
-}
-
-_emake() {
-	emake \
-		USE_STATIC="no" \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		mandir="${EPREFIX}/usr/share/man" \
-		SHRDIR="${EPREFIX}/usr/share/${P}" \
-		DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		HIDE= \
-		"$@"
-}
-
-multilib_src_configure() {
-	# The included configure tests require execution.
-
-	# We require vsnprintf everywhere as it's in POSIX.
-	printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
-	chmod a+rx autoconf_vsnprintf
-
-	# Always use stdint.h as it's in POSIX.
-	sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
-
-	# Figure out the size of size_t.
-	printf '#include <sys/types.h>\nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
-	 $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
-	printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
-	chmod a+rx autoconf_64b
-
-	# Generate the config file now to avoid bad makefile deps.
-	_emake ustr-import
-}
-
-multilib_src_compile() {
-	_emake all-shared
-}
-
-multilib_src_install() {
-	_emake DESTDIR="${D}" install
-
-	if ! use ustr-import ; then
-		rm -r \
-			"${ED}/usr/bin/ustr-import" \
-			"${ED}/usr/share/man/man1/ustr-import.1" \
-			"${ED}/usr/share/${P}" || die
-	fi
-}
-
-multilib_src_test() {
-	_emake check
-}
diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
deleted file mode 100644
index 184372af56b2..000000000000
--- a/dev-libs/ustr/ustr-1.0.4-r9.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr/"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="ustr-import"
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ustr-conf.h
-	/usr/include/ustr-conf-debug.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-inline-check.patch"
-	"${FILESDIR}/${PN}-1.0.4-build-libs.patch"
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-_emake() {
-	emake \
-		USE_STATIC="no" \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		mandir="${EPREFIX}/usr/share/man" \
-		SHRDIR="${EPREFIX}/usr/share/${P}" \
-		DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		HIDE= \
-		"$@"
-}
-
-multilib_src_configure() {
-	# The included configure tests require execution.
-
-	# We require vsnprintf everywhere as it's in POSIX.
-	printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
-	chmod a+rx autoconf_vsnprintf
-
-	# Always use stdint.h as it's in POSIX.
-	sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
-
-	# Figure out the size of size_t.
-	printf '#include <sys/types.h>\nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
-	 $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
-	printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
-	chmod a+rx autoconf_64b
-
-	# Generate the config file now to avoid bad makefile deps.
-	_emake ustr-import
-}
-
-multilib_src_compile() {
-	_emake all-shared
-}
-
-multilib_src_install() {
-	_emake DESTDIR="${D}" install
-
-	if ! use ustr-import ; then
-		rm -r \
-			"${ED}/usr/bin/ustr-import" \
-			"${ED}/usr/share/man/man1/ustr-import.1" \
-			"${ED}/usr/share/${P}" || die
-	fi
-}
-
-multilib_src_test() {
-	_emake check
-}
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 354fab5dc12a..7667ecfe9f9f 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -3,5 +3,5 @@ DIST voikko-fi-2.3.tar.gz.asc 833 BLAKE2B 4d960595ac948ec59499448219c5c84fe17060
 DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
 DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
 EBUILD voikko-fi-2.3.ebuild 847 BLAKE2B 3e56a0d3c4f2a32e7b17798b99f9c2452c093642b62007850e0b625a62892e6d8104187df2f456c599bf7eebdae53662e7bbfedbb89bd2dca4f81d35e199c4c7 SHA512 f7b38d806d87095af6dea361c45a501b2ed92975a5bb833240c9e5abca3c6ca79e1dc7470b335688e25e16543d5b49135f54348330a39cd45053c8fd894f1010
-EBUILD voikko-fi-2.4.ebuild 849 BLAKE2B 424141699532415d35234846a9ba8bd4c1534ad16649267cadbacca98c95030ced271c5ebe29130f89083cd41320c049e4e81a0f6a2858c8c6d67dc2e1598755 SHA512 985b9ab743be38311c8973759ec24551f8743caef645ed28f09f7107075642e981ffada0499e50c8f7ddb3043820ef610e6912781c305882f43aeb1909f8c94f
+EBUILD voikko-fi-2.4.ebuild 847 BLAKE2B e915d4cc7acc882e5294518b8b0877890d3c087c2c726e2cf339cb44b4a329a32afc374441e60d4826cf4f3d1df814712d9e76438557a242baf32fae83afe4bc SHA512 b29f1c583e9eea48875df5a72e84f1cc800f3a763187cf1692f2e4f6fb942b28bcabff299f548f37c48c0b4cf8d04a2e63d9cfc2ef1a1ac435d050de4bd80ba3
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
index 527614bfd971..b25d293369e3 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-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
@@ -14,7 +14,7 @@ SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/foma
 	dev-libs/libvoikko"
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index d7f19c826d00..7de60d794689 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,7 +1,5 @@
 AUX volume_key-0.3.12-find_python3.patch 894 BLAKE2B 7173a00937a78c2b883d554e7c14ced4502088c5dee3af0378f13091aaf4133e4c899df60d4ebafd8c3f629c6020fdb17c0d61afda7e6d87a9c05b15803a4361 SHA512 bdbdf24f9a7e6b0db28cb22e831af898e4faca26b51c386835ab8dd74c0d0d79d261fa47ebd18213fe24424fd0bed54836fec5f3993a908ca88a720168768c7d
 AUX volume_key-0.3.12-support_higher_LUKS_versions.patch 917 BLAKE2B a637ba7d7761032bbbae34378a1cd8da57cd96c762ebeb50fce0ca28b7b154df11bda89af203d18833e7841fbd9181c01ee5fcb11d80d765fd147e82440becca SHA512 e784115d85f782db46dbd67c40c3a6b0864b69ce8d13b6a67d70471d39079e9fc0d9d263bd543556d645d7dc922ef22f641491051dd736128cdaecd63df2ff22
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.12-r1.ebuild 968 BLAKE2B 1f76e10a057318f71cfeccd60aee0de8b43f22888476bb9580361dc1bdec0c1027965f3d5e1f3469a059b8c3d5658f7a9be72a5b8523efe9099c73b387f9e114 SHA512 3c75c5090b02268e3a72da218a210e57158941f5a926e6cce9b02975398978a945721b541249f015fbd28044d2ad8216c5763fb53f0951c09ed8d4c5a4b84a5f
-EBUILD volume_key-0.3.12-r2.ebuild 1050 BLAKE2B a728cf5978b592976ece161d05e1d20a502beaf31668ade53125dd42ed950f856adef9ce4d0cace156dd55f4a5e211d29c5a0fd1ce6b25966313962995a9bff4 SHA512 093b7b8e1eea57b0452acec1992c53182d221fdd5cb40df3f4730746d8021d8b12ea3c279de57e39433a56174232a32728d5117a53a8c5283331e325afee4d36
-EBUILD volume_key-0.3.12-r3.ebuild 1160 BLAKE2B 09eadb785dced76513425bbd9fe6ab2637187842c8b0c4eeac5a8a6b60fd18022c640edd88c93dfe9b7ebc2d620c16a08f76cd8ee2bae93335a7bc14e67ce21b SHA512 6f6917816292a47f3791c1aee29ac39d185fa211407bc65f9d589a97bfbb49c6654403f0ec2a953e3198ad76e235aa0c7d3377c5e335bd15eef1b9d5b75350e9
+EBUILD volume_key-0.3.12-r3.ebuild 1157 BLAKE2B 4d9c7a54de611857170a9ac06cd818ad342254414215a34e688e36aa8697988799e22a81735e7bf131d4a65b5de89ead56041da5e59e190fcafa53166ea97ae6 SHA512 da690a480ed58e8e08601244649ba5fe7d620067db983e033ca3e88cd6d26bbac6672046c47c1bd66e102e3e86110cf151491a01f54da9d1c3ef08c0b033042f
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
deleted file mode 100644
index 9eb5fb16e7a9..000000000000
--- a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-single-r1
-
-DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
-HOMEPAGE="https://pagure.io/volume_key"
-SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-crypt/gpgme
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	sys-apps/util-linux
-	sys-fs/cryptsetup:=
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	test? ( dev-libs/nss[utils] )
-	"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# --without-python disables python2
-	econf --without-python --with-python3
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	python_optimize
-}
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild
deleted file mode 100644
index 90c67ed022e2..000000000000
--- a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit python-single-r1
-
-DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
-HOMEPAGE="https://pagure.io/volume_key"
-SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-crypt/gpgme
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	sys-apps/util-linux
-	sys-fs/cryptsetup:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	test? ( dev-libs/nss[utils] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-support_higher_LUKS_versions.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# --without-python disables python2
-	econf --without-python --with-python3
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	python_optimize
-}
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
index b2c7c39f30b4..013f54d6bbd1 100644
--- a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 341cbd27c6eb..277dd31e2709 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,6 +2,6 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 DIST weston-8.0.0.tar.xz 1094904 BLAKE2B 858f892027f2f41687deb699770843bf962b8fab06bded4f9018ded01d87e2dc3388e371921229887d45f6c9c9e981ae5b28ad473660b9acce9107c7a63a14d5 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
 EBUILD weston-8.0.0.ebuild 3637 BLAKE2B 1f83a82dabf0a8a983ae5ba19f758fb70523ab165e779d582abc0168136d3b0fdb5d6bcf78fc931dd4d737d42b66811c7d9e74994ba03d4689d6aeb0e352054c SHA512 dd22694d1a80c1df40f47b5162bc452c0ec7c50cc286a92e4d7b3e2ef31bac7b3bf1f74f25e268a72da489c2156027a76f8a7764d582b094c3a42f85accedf49
-EBUILD weston-9.0.0.ebuild 3704 BLAKE2B e517fd2c192018236784fcdcfeb9277ae3126d27403f410dbcfa71446895798a84fddc1915a36e16848637e196ef33b69351b629d938fc6b846c041ca2d54dd8 SHA512 3e20b62dc59cb5185cb124a23a4c2997c8f3db3096780f5f271d1344217e3ae10a629a8c90014ec7a94867e56f382e58c73425f5a7c7781e4692901c611d7e72
+EBUILD weston-9.0.0.ebuild 3711 BLAKE2B 574fae5ecb5ec4991b301fb1856ce5177256135a8c4ee05bfac8fb76cd3ca8238e0402ca71fe7d22cdd78f55d30fc9e27073813ac96a7b0bc37ad39c9c90fc70 SHA512 ec1e7ea53bacede54423fca8abfe4207531f4938a4d8ac66ae947c8de008551571856328f7b93af6032ce7b9d513cb739b27d03f72f062897d4cb1755477f6c6
 EBUILD weston-9999.ebuild 3706 BLAKE2B 82ba0bb4bf3889b07f5e77fca64f5ef4a09b6a395b2d2f481864c739a8aa8c67eab59a431e0bc34d499d5869f0c4565b756703ec064610c434124513a367327c SHA512 c4a69d7b0e83b7d29fb70a15e6e7e10bbb0f64185ab45f668f43cd9d44e14f5f8bcbf84551cc3ced92f05cbe9865a09008fce5dc66f41a26c2adec8786ce84a1
 MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index fcc8d36a421d..4f98f5bcab67 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index f733bdbf8273..9149b8d27c4d 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -2,9 +2,10 @@ DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad
 DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
 DIST xapian-bindings-1.4.16.tar.xz 1133900 BLAKE2B cea310cea777f665feac3b0cac7189da66e596d245af0a3a6cc40d01e6b9862bae2b61d5b21e7d742c1e0eb1424603a47c44a4fab9d17125820ab793360a85f9 SHA512 afdc4379c8dc8381813eefcaf761ea560a23ba6718a54c61874c0d29786b9f49dd548ed3854fee38689c273acebb4637833b8cf5c75d0c2ed05df83384e59113
 DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716798aa5b31e5bbc795d0f5c631022c69e96f472b3fd76609116a196431e5b069a710c3ebbfc989de8fb57d5e2d081008b89c SHA512 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
+DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
 EBUILD xapian-bindings-1.4.14.ebuild 6448 BLAKE2B cfb76c3b3fa1a5808430789933fc3c058d4ab194e461b14247d5e6246041d61fbb15a9c451462be0bb1b673e824f44fcc1482e07eddf5b33e034e3f6340bab0e SHA512 281d799edd1ea70c223bc9d2076b8dd5b50899c5dcf93c78ae5c79cc6a8d8b0b933036f8c06384a4170e3dd477c186b349eb5f94c19fcc87e0cbedd822d1108d
 EBUILD xapian-bindings-1.4.15.ebuild 6448 BLAKE2B 863f3a89cfc7656e07a25cb972456a45cd8d3da090ab4d0e5f830d39f4841ae04377dff6c93f798fd02ea01aefa5783cacd4a071b2eb95f6a215a8657540d6d5 SHA512 f59f5e58dabf13fe38e3d4dd35b1709feff7530fb3fb4fd29d48cd56d1148af6aa7fdacb0cfd8b7b1f59e6cd663eff2aa9ad82485b3ca3fd99ff6dedfbe5e360
 EBUILD xapian-bindings-1.4.16.ebuild 6448 BLAKE2B 863f3a89cfc7656e07a25cb972456a45cd8d3da090ab4d0e5f830d39f4841ae04377dff6c93f798fd02ea01aefa5783cacd4a071b2eb95f6a215a8657540d6d5 SHA512 f59f5e58dabf13fe38e3d4dd35b1709feff7530fb3fb4fd29d48cd56d1148af6aa7fdacb0cfd8b7b1f59e6cd663eff2aa9ad82485b3ca3fd99ff6dedfbe5e360
-EBUILD xapian-bindings-1.4.17-r100.ebuild 7014 BLAKE2B f5a2ccf4b25e8e62e5bbf54578486bbc61f48f262360a5c71b36de94062e72a61d0a6e866aa5d5d54b22f35787778ad862b84fcb814a6363e81af7b110bee342 SHA512 d92f9d3069ef48e7437d3bd994424e90e70104d86964eb4e6adcda156cceb71fe75873b38a92d724a32b94775e179cc3c165df38a49077334625c944eff9f9d3
 EBUILD xapian-bindings-1.4.17.ebuild 6448 BLAKE2B c73e402c5cc3a778b75a1d947f2f58f3e3dee124a9055389dbaf52bb21f20a0e822db890e4ba476a481d55d017b19510ac408f436ded9264e751ae2b8fcfedf8 SHA512 e9247edd66581d0df5deec39203efea46173fe4c392a6ab4410380912c88702dfd10cb28dcf27dafa86a80169052fbcbbf30e00e9438c220e948a4b1da231ceb
+EBUILD xapian-bindings-1.4.18-r1.ebuild 7037 BLAKE2B 03edfd4862d1eecd8ba8baa9aea713ab063ebd4124c758d988459a5fe034c274e1468f53dee76aaefefbacbb425db159e3c4bf4a8ea9ebfbe0b7c838cdaf55f5 SHA512 ed747fcb26412b1e70bc38c68c61cd8cd358c21e563833512113b51b43438b93222833097ed6325e081d694fac9d181686a54b84b95437ec29ed50ea6371f1ce
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
index 0c2cba44761d..ca365bb03da9 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-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
@@ -169,7 +169,9 @@ src_configure() {
 
 	}
 
-	lua_foreach_impl run_in_build_dir lua_configure
+	if use lua; then
+		lua_foreach_impl run_in_build_dir lua_configure
+	fi
 
 	php_configure() {
 		local myconf=(
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 881e67312a55..45102a051298 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,11 +1,7 @@
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
-DIST xapian-core-1.4.14.tar.xz 2970624 BLAKE2B 5bfa5ab36ad4626fcc9a214427f88bdf55e60166939db3a65d3118b426b0ec6754efc10dbcf32456e033292eba3b29f7500679f69a49df15d40c4111322249ed SHA512 c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b
-DIST xapian-core-1.4.15.tar.xz 2988752 BLAKE2B d68d69cdc55c1b62a746620fc90f028819813bb98c0ad0cc130c399a4dd62231b920d24363b61e58d002f65a79a117598455779028de1b26b7a808367f5f2de4 SHA512 f28209acae12a42a345382668f7f7da7a2ce5a08362d0e2af63c9f94cb2adca95366499a7afa0bd9008fbfcca4fd1f2c9221e594fc2a2c740f5899e9f03ecad3
-DIST xapian-core-1.4.16.tar.xz 3041132 BLAKE2B 2c009bcdec05542ceae9354e47e8ff9b971ec87d04caf8058711fd6952135620c353f2feabcd869313f55194409944bc7374ce69d626f948461963a7790c3953 SHA512 3d319ab672485e840019ee28b54b1c59bbd535c1802874f58593fb999681c19bff3e776dc19ab5d5bd97734bf01f1408f36ae49e21ca9706ca187db49f8a18a6
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
+DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
 EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B 976319adb17d73cfb5aff1c29c7febd4c50b9a399cd2a554ac463396b20890913f1c86cbca6ab5d0c7c1185e0b38ca41949102fc7ba704090647dd78f2522805 SHA512 bf3a8c9ad433c52b6ef74479220b693044483dd5aa8d8b09ddfd244cf6f4cf6e0b80c30f1f67901a725cd783baa5dc623080c15a8c07dfdebf13269af37820d5
-EBUILD xapian-1.4.14.ebuild 1798 BLAKE2B 8722898cbf9c08322d60ed017c76530d5c3863f858ebcada1f6d7e38aedc9413268cfe3cb5f2b07b4bc5e3e84a8011ef6ccc952b0bef976f0a440355f4d0680e SHA512 57d55a724bdcc02ae6122676bf885075b00b19cd6e77d1ab8c9a816c9d7258b6fcee4c055e3cb91f12e7469d9acfabd275f79d848554a1ca19c888d8e4463c08
-EBUILD xapian-1.4.15.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
-EBUILD xapian-1.4.16.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
 EBUILD xapian-1.4.17.ebuild 1816 BLAKE2B 809243dcc9cd4381c065cd8f3a17cd5359243bc98811c8400fa9920280609996e28f493311e8333c52cd8ef03c79df2f91eeef0bb517c51172504594c2c93efd SHA512 15115ebfd00d4a5a40c7faa8d0361e046d16618c591cba4192fc0c527aa4bd8081840813914eaa063865d15d76d8cd3ec57820191d1cb57ac969e60df1cd64ef
+EBUILD xapian-1.4.18.ebuild 1823 BLAKE2B 42caa4249b8dd87771e59ff55033f747134055d5a427eaf705c3f1534a2c26775cd83392faaed75c22bf0ac4fe64b663667a6c78a465a2d15f76a2d652ad5beb SHA512 723d12abbefa2272b8923c826437dd73939b32d753e90bee174810bf00e67c03d5a363948ce5535b1764354f77464f3bca47c34bc8ddc3315047c3d09be1f271
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/xapian-1.4.14.ebuild b/dev-libs/xapian/xapian-1.4.14.ebuild
deleted file mode 100644
index f6ae79205eb5..000000000000
--- a/dev-libs/xapian/xapian-1.4.14.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-	use remote || myconf="${myconf} --disable-backend-remote"
-
-	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
-	fi
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.16.ebuild b/dev-libs/xapian/xapian-1.4.16.ebuild
deleted file mode 100644
index 669d3eb246de..000000000000
--- a/dev-libs/xapian/xapian-1.4.16.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-	use remote || myconf="${myconf} --disable-backend-remote"
-
-	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
-	fi
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.15.ebuild b/dev-libs/xapian/xapian-1.4.18.ebuild
index 669d3eb246de..b33e8c6402c3 100644
--- a/dev-libs/xapian/xapian-1.4.15.ebuild
+++ b/dev-libs/xapian/xapian-1.4.18.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"
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 0df8a27130af..e7173c251014 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-r1.ebuild 2068 BLAKE2B c9c3ba6afc412b88fe09edf67be2e55eebf25c9c2a7de655d77502242cec6233a064e5fbbe4adadd4f02a9e128bc6c7997adec20ea962a22fa63a66ec7c04ba6 SHA512 18675c0caf253631279e87fdf9507f91b0f31ec9e36e3385b67a0b63fc1eb054c889f2565c25a230e2effb060abcf9c44d2ccd2aeb00f14e248aad26a0b5e43b
+EBUILD xmlrpc-c-1.51.06-r2.ebuild 2070 BLAKE2B ae2c26de4d30d36c9f9c4446b745c69cd11f802207a1ba2d884368de3c94690d1f84a30b4772ee91caf951683b5ec0cb1a915d5bf0140a61109e607cf68cab8d SHA512 288f29257a7d725a1a0225ed4a8b36fe15607ad9c535d463475b0ffd0386773def1fddb0bcd72b67d624c365c64f7fd2f4992718befcff364ed228484dd55021
 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-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index bb9fcaeedc35..13b34e66e318 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
@@ -15,8 +15,8 @@ HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
-SLOT="0"
-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"
+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"
 
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
 
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index be46a6dae5a4..fa80560a3b49 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -2,4 +2,4 @@ DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514a
 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
-MISC metadata.xml 414 BLAKE2B 265c7a10b540266026188b46fbe6f609d83946a5ceadae090bed44b981e9c37599b86c506ea16d06d62bde58d804f042d01eb5e9a96fd9480671ae3e423040d3 SHA512 6192225c849da5ac481f102aa6e7ca91d4222623eb84d42d5313ecd9280a4fec8ac819ed74c0b761986c60532b5ec5061d0998e20c77c5dae0abd058ecb039d7
+MISC metadata.xml 492 BLAKE2B f1d4308323da79d17e6f5e0025fff338024b6d74c90584c469917418ebb06aa9be43a1b1d5f8a8e4a25aa0584b8b96aadc5508a2aca1b9f6d3924c81bb33f41b SHA512 920fe71d66278f82b0fcb18044998d5b72cc69a07966e8d1d2527a0d1a7e78c89536e165f105dc4ed9de84377a80f3ef55804bd26f71d868808077ffcd6b39c3
diff --git a/dev-libs/xmlsec/metadata.xml b/dev-libs/xmlsec/metadata.xml
index 68a53aac563f..8f1184e366ba 100644
--- a/dev-libs/xmlsec/metadata.xml
+++ b/dev-libs/xmlsec/metadata.xml
@@ -8,4 +8,7 @@
 		<flag name="nss">Install xmlsec-nss library</flag>
 		<flag name="openssl">Install xmlsec-openssl library</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">lsh123/xmlsec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index 4f299c3ed874..f6a9d81f01fc 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,5 +1,5 @@
 DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664
 DIST xxhash-0.8.0.tar.gz 145909 BLAKE2B 3e4e715d20ad09da2fe706a69e89a305d9f4d19588a28361f519d424c002345ba76b48d5adc0b600e34e595fed20a1ce8b8c5f22457cb05c4233810e9af9b823 SHA512 c3973b3c98bad44e1d8687ab4f9461aecd1c071bb3d320537a4c50fb7301edd13e990bab48cc6e5ca30536a814c8fa8cac24ceb1803a7e8eca30ef73d449373e
 EBUILD xxhash-0.7.3.ebuild 908 BLAKE2B afb6ab7cdf944fe2360ac959d9cd56444aa655d022e8bbc96418597baba42ae59a4b0aa5f46dff013c3de9b519d41159796493be302f0e525d10c73290d765a9 SHA512 e735864d13fc0ccd3d087f28fb5254d38c764377cb4c490068e986f1f4e79cff8249d97edd086995e8484e1a6c3dcbf150db0661838fc32535a4e83c3728b702
-EBUILD xxhash-0.8.0.ebuild 915 BLAKE2B e53dc68af29b3b458be6e814d893c64605d1dcae248e0431cd688f2b3dd2c2ce69e07bd4868b682a6d2e31307eba4832863b3567dc42d99aaf4038ef9a0dcd2b SHA512 fc51837d2319ff529c246be0661e18b7a7faac6dd966a0d2dfe6f87635a8da5e4152da6f7d3c70063177dd60390c3cf1763af52b67ff150e929e62c04f6bf114
+EBUILD xxhash-0.8.0.ebuild 913 BLAKE2B af099e735d33ca64600b51db688092f12d9eaaaebd59462febb781d8a460f2efdcd62e06e9226dbec9d283ffa7ef15f71d0e88336d5a81792763f6edc9aac4f5 SHA512 01b183e930572111c194eac7c337bd1cb786ba0b24c9fa481cdb89cfc4e9f0ff0ac9a6ec3e9398b67ca14fd30768de0d692e46062e7705f88a8148e6eccc196a
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.8.0.ebuild b/dev-libs/xxhash/xxhash-0.8.0.ebuild
index 6a5a61f5e4da..f9de1710d47c 100644
--- a/dev-libs/xxhash/xxhash-0.8.0.ebuild
+++ b/dev-libs/xxhash/xxhash-0.8.0.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2 GPL-2+"
 # https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 1c9abe8bac5b..795f17b57c34 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -9,6 +9,8 @@ AUX zziplib-0.13.71-shell-DESTDIR.patch 3206 BLAKE2B 4f542e0f26ce332e75f341dfdd8
 AUX zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch 5840 BLAKE2B fac60aa6271dd189198ea7b9640567378def938a09d2362acf60a4aeb2a3787121f644685fb4f1310459eb665b509951c02ad7a40a78a216b9778e7599dd764f SHA512 ed6d3101587d6d0088bffb1bb1483cffe1629d2ff5301e88cdab8e654bac79f84534012e129d7c17ff23beb19ca46a96598894cd383040d41993732ff62ab05d
 DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
 DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2aa03dd8b5e96df50c6e9d5aaf2df9bc072cd8389959019e41c06bd808f3df8e710dd11d198438bf70e58e5ae278a882d854d5b SHA512 ebbc5bc9e403e203d36cacb0ec5aea9d1750f1a8b144a41748c9475e6cc0b1c3af197a4ef7df5f38f90be40bd4f9b68edbcb4624ceff1d48a47127065e570cb3
+DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
 EBUILD zziplib-0.13.71-r2.ebuild 1689 BLAKE2B d7f7d9593ab7ce53cddb180eb4ada459c3a1b5578498f830255011bf37c53f96a45f03c7d4f94db3b17524985ad0dd88c1e409c7a2e65ec9b7911a964cbb0cc0 SHA512 0ad6987046a578fc32d83ae6c7f6e75ba1c8e9d66c4ab2627ead7d1e65dee17a7f0d788955dbb4e8c8288478709cb1284417654ae66e8485ebbb558030590951
 EBUILD zziplib-0.13.71_p20201021.ebuild 1873 BLAKE2B 74afd72afcd1178340fd2abe199761e09ac6071f00b87505d34d15d09aec1991a0daf9862510f19707e4191065802de41383f0567e239d57c2fa499fb06a71f4 SHA512 28b2f71b5fa4719898c97d179ed7415d7f9e45376eacff0ab70a3b143d5ed9832f1f06bcb2f3f31d3e77093b6313cf912aec48ee1caca737c8735c308a88a1d4
+EBUILD zziplib-0.13.72.ebuild 1267 BLAKE2B 30cd6f184c166896e9c791c5a677e6c9756b1cd73f3eb80ea9e643c315cf275f2549cf46b7969e99b4d97d74e60bada11cb9d0774d091c87f24380b8948e996f SHA512 43b0dcc179ebc8614cf5e87f9409868884567d8d028ea607a867e20ada6dcb4a4042befbbf333ad0deed5fec891fa6cf066ced1e094fb8e730cb264de036f1c3
 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
new file mode 100644
index 000000000000..51c4c3d95071
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.72.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
+HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
+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"
+IUSE="sdl static-libs"
+
+# Tests require internet access
+# https://github.com/gdraheim/zziplib/issues/24
+
+BDEPEND="
+	${PYTHON_DEPS}
+"
+DEPEND="
+	sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DZZIPSDL="$(usex sdl)"
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DBUILD_TESTS=OFF
+		-DZZIPTEST=OFF
+		-DZZIPDOCS=ON
+		-DZZIPWRAP=OFF
+	)
+
+	cmake_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-libs
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)