gentoo resync : 03.09.2021

43 files changed, 691 insertions, 148 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4874f50a99b9..f6af11a04432 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/hyperleveldb/Manifest b/dev-libs/hyperleveldb/Manifest
deleted file mode 100644
index 6fea6365da86..000000000000
--- a/dev-libs/hyperleveldb/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX snappy.patch 1016 BLAKE2B f53a9742bbb016f1ea8ff22fe5d440cdf3e5a528d4c5099b27ee7eb7b8d5c1ba08ad92118ec46777be2e63aef9c7337decdb2c03c51f440cb0152f6968c7b35a SHA512 c791faa7f7d0c3f1a94526f2ae0c3833c7b5f29e1a64c81447dda3b05134f1081b69a9963540e6cb5e4076b65e8b65ab1f3402f4e2eef4b9372a0b57ff0d094d
-DIST hyperleveldb-1.2.2.tar.gz 584955 BLAKE2B de578b83ae3ea4e3802bee9936d5917af421baf2513da9e4575b8965a8bcc53565fd56105eea70a0c0c62ddefc3c5c11bb3511b52c6c09e68c5a416d6aa06ac0 SHA512 6fb7a84ec237a5a1a3f5f7c90965a0b0661a6143722a159a189c4c54231d8c5746dcbb76713fbe9b8b2529467f287365d30dd7115fb5c1ef54f864686a709eb2
-EBUILD hyperleveldb-1.2.2-r1.ebuild 581 BLAKE2B f4b82fa5015581ebceade2488d252ed943ef0fe45a4579dabcdd6bca18c977768fce17486a148ab7d8fabfe6d88039c76b50a82eba0261ebd7c77784545858a8 SHA512 bc34848116d6bb26938584a3a0b87b4657483f1ff417e64aa3839e7824b04ef628281343edc68e3139aa22191899a9da3b303fe617557b1fd2aee6dbadca7425
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/hyperleveldb/files/snappy.patch b/dev-libs/hyperleveldb/files/snappy.patch
deleted file mode 100644
index db3d2e3885a4..000000000000
--- a/dev-libs/hyperleveldb/files/snappy.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -196,7 +196,7 @@
- TESTS = $(check_PROGRAMS)
- 
- benchmark_SOURCES = benchmark.cc
--benchmark_LDADD = libhyperleveldb.la -lpthread -le -lpopt -lygor
-+benchmark_LDADD = libhyperleveldb.la -lpthread -le -lpopt -lygor -lsnappy
- benchmark_LDFLAGS = -no-install
- 
- db_bench_SOURCES = db/db_bench.cc $(TESTUTIL)
-
-@@ -200,7 +200,7 @@
- benchmark_LDFLAGS = -no-install
- 
- db_bench_SOURCES = db/db_bench.cc $(TESTUTIL)
--db_bench_LDADD = libhyperleveldb.la -lpthread
-+db_bench_LDADD = libhyperleveldb.la -lpthread -lsnappy
- 
- db_bench_sqlite3_SOURCES = doc/bench/db_bench_sqlite3.cc $(TESTUTIL)
- db_bench_sqlite3_LDADD = -lsqlite3
-@@ -215,7 +215,7 @@
- leveldb_dump_all_LDADD = libhyperleveldb.la -lpthread
- 
- leveldb_verify_SOURCES = leveldb-verify.cc
--leveldb_verify_LDADD = libhyperleveldb.la -lpthread
-+leveldb_verify_LDADD = libhyperleveldb.la -lpthread -lsnappy
- 
- autocompact_test_SOURCES = db/autocompact_test.cc $(TESTHARNESS)
- autocompact_test_LDADD = libhyperleveldb.la -lpthread
-
diff --git a/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild b/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
deleted file mode 100644
index 1a42b9d33f78..000000000000
--- a/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.11"
-
-inherit autotools
-
-DESCRIPTION="Hyperdex fork/extension of leveldb"
-HOMEPAGE="http://hyperdex.org/"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/leveldb:=[snappy]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/snappy.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/hyperleveldb/metadata.xml b/dev-libs/hyperleveldb/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/dev-libs/hyperleveldb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 66bbc34a17ac..cfb9a23bbc1f 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,3 +1,3 @@
 DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
-EBUILD hyperscan-5.4.0.ebuild 1363 BLAKE2B adc6e8411b9d96faa2315242ad2bc072e84736791c9d5a2129d7120333213a57dc1d75b882afba16abc09d8dbafa4815538b983063809fa351b7f90b6a74868b SHA512 f3d4b3135c522b99c365b4cad575a7d92681896c3501e551a2cdbe2d35c8ae1eecb6af933a66634637f493804255afc306ae6fa975e9e284b1c5f6eee1225c42
+EBUILD hyperscan-5.4.0.ebuild 1366 BLAKE2B 36e702803f0c63a7b2c97e0e3d85535ae2e40a0e5d90dd9495d948421a8e27ffc1ca235c528d8b6e40917b8a6ec16b9ce267cd4f3cc879b307affc5605c4d887 SHA512 c8b668bb583e5363b68db800feaf7f1707ebdaa1e36a92b2aaa8d1961917f4015dca6dbd4e82ca0ea1f34da00ce4fdc96a17d79def042c203752a9204c3109c7
 MISC metadata.xml 592 BLAKE2B 34be91efe23c3f15a33721893e48d8b963b9a27b6d2ce58eadfbc7a90cebbbf83f14231b9b843205d6906ceb69b5756b00326b32732a91b3abe0b49cf26e88a6 SHA512 c1a119770e21839d0775f898453e8dd7392fd248bec79a794702ade386edc7a1794359c1e4b368148f84603daca09f303c92d660473a5b45a0ab88e60b90e8b2
diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
index 9cd4cf02b42e..9e3f43300d71 100644
--- a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit cmake flag-o-matic python-any-r1
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3 static-libs"
 
 RDEPEND="dev-libs/boost:="
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 8cbcc8bc0544..da9ffe2d86bb 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,3 +1,3 @@
 DIST inih-53.tar.gz 16984 BLAKE2B 1242e6273c9dd9a11ea026a3495a487b2aa72d8e01f34304d8568c88897ae9c9bb425246f992dc16f4dc2210ec14c597d0ef595cec84ff98a5d6101ee5a643b9 SHA512 99bc40c294b521e9973184bfb30d60c129735991f33b387b3d023827a34672b0489eadf91e38895ea725168dbc7b27bb02c1975debe7573b4b209d0e947b2100
-EBUILD inih-53.ebuild 741 BLAKE2B 922581afb5a1e55042ec9d8396124f1cefe272371ecc047691f256e47e4fb59245ecda20ef9b3be1ff1d06b5138d4f577c953fa8f6b0c2915c0401614a9723d3 SHA512 1ab336d4e18d238f974e7bd5a5b3eb3982f5120d804f5d774547b2626f7eaa3dc9c7b03e8d5fa6f70ad5795ee7dc203bc101ebff4d85bb8a39f8a54f804fc561
+EBUILD inih-53.ebuild 748 BLAKE2B d673f71ea07ebb4447ed99f46c5e4bb9c7531c7ddaa0b3d14eccd11c108689cd0ecc47b854c23dff53c8d0a5479e56194ba9078e1deb4bc81e276e391c0666ac SHA512 7e81db814e79f801c55595bfaa3be9c431db1bb7c74d09bc9ca9c2e9e9e1c832eac840675a26bd099e479a3073e23aac239588642054b2e75fbc4bcc108f0848
 MISC metadata.xml 519 BLAKE2B 837ec41139390ae96130a1be2c25e178f4ca39a655a263e1be689c3da09236c43cc9750d07af108577d54663710ccc0cffb5fc432b0320c9c3f55177424ed35e SHA512 b9c05b7b9e8314a943215b721862d16b361306cc715d77250eb5e4fa1ac24f22165b8a79465188f4b5e3dc2381de72821c76b6bd6b6c7b966a3c6697209a8234
diff --git a/dev-libs/inih/inih-53.ebuild b/dev-libs/inih/inih-53.ebuild
index 9ccb6693b900..539d28ddaebc 100644
--- a/dev-libs/inih/inih-53.ebuild
+++ b/dev-libs/inih/inih-53.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 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index bbc123ca49d5..f2c511fa3f4e 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,6 +1,6 @@
 AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
 DIST kopeninghours-21.04.3.tar.xz 63212 BLAKE2B 8f16566559b529ca44aaa0cb6b8267cc4d253c82e336d210cd240191ea5b60e029d6acd914053707c010bf94628cfb43e9fa0cc5625f275808426f75ecaf8e6a SHA512 d368cdbfe9dfcd82a847b932ddd244bdabfabdf1d44dbf6fb371f3af294f538d77d9f955fdbf1d9a34a2f18e84e649ac32e4b6e296cd7a8cc84d0238ca89bd6d
-DIST kopeninghours-21.08.0.tar.xz 65696 BLAKE2B e6fe12eea2f3cab18e07d7c17277a932ad3f57e897e727b61d4740aea87699669bd04becfe9943dd72f562d50141abed30c6342ac7728e0d0b386075b0ac6309 SHA512 529c53ac47eaa629ad0927b7ab3b29c3d89ec8313434ff59c123d6eae62caf6bde1c243045b56ab19ae2b0b8c6bf021baf20f89a14ce82e2ff759642709f3bfe
+DIST kopeninghours-21.08.1.tar.xz 65660 BLAKE2B 9647a1178904f47d6856f141e4d5823067249c0ce9ded65796c8c12448830db06d07e6d918534808930bf7e35cbd67016a5d53cc375da4c12621f2b3249e32b4 SHA512 944682e064c48d0b1e0acdeb4b0f0bb9fd7375af2d8ae82c7aa03d261441d3b4cfbd059c33ecc266d5ed07ae5dab237ed40b8f7187d26ac2da49e05cbb21199d
 EBUILD kopeninghours-21.04.3.ebuild 1264 BLAKE2B ef8b08e6a92d355253e141eb183b51201ced6d5f10e5de8211f3670839b1cd028473bc32f3c1111afe7dc218644fddd874ff817aaf5a9439781c839e6b253030 SHA512 3d17d9b782ac4ba28310b991e5ced032acaf12df68e6cba68392089f40d8f0a09d02e189a5789fce48856f4bcc25b707e4bdf97fadfc5e3eaf9ffad332557132
-EBUILD kopeninghours-21.08.0.ebuild 1264 BLAKE2B 6af9be1149469f9b3b4fa77e01970417993792785db0d3b71dac91418fd5ca044c9960f222715de511ce50a1487b5b2f1215ba42ea4a69b04b58e653ad620076 SHA512 82e8037c88e9424a441e8d7041279a2004bac5314d8c88e84d0bb0939610aed17142b415b0a4dcf3dd4d322520201b21c1c0a93a4d29f7b64cbc274bb895591e
+EBUILD kopeninghours-21.08.1.ebuild 1266 BLAKE2B 2300f8e1734e45840ad781e679fc860071c9f80774c09f0bed04d9a1adc56336252c5bcc18c8940b6532a9599d92cc4acc9bff4b5eaaa1bed0688c29e425002e SHA512 c80bc7a598e6df2ca2053fa9d3fda6fd5e222e1a91e704b1d0156fac6411b11980a0c443ee1c753471229f23e8ae3f9b4e73be1b11d64219c32cbf04d5cc2568
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/dev-libs/kopeninghours/kopeninghours-21.08.0.ebuild b/dev-libs/kopeninghours/kopeninghours-21.08.1.ebuild
index bf5b510bc6f5..bd46d6ad91b3 100644
--- a/dev-libs/kopeninghours/kopeninghours-21.08.0.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-21.08.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KDE_GEAR="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.84.0
 QTMIN=5.15.2
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit ecm kde.org python-single-r1
 
 DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index 69c851561779..df7f71ab2061 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,5 +1,5 @@
 DIST kosmindoormap-21.04.3.tar.xz 337008 BLAKE2B d1bf349a5b4362fe3cca6a9003ccdf17eb9425e1e2525f3bda39c962658fb9265f7f9f5206c6caec7f26fbdd876f4c9b06ab5662fd2061d1059a51ab089ddcee SHA512 08dc32bd07cc6653f2f12dc3060b102d5c94505f6ff539cdbcd0ed1972a7bec774df55d74f2831b1e6c537167a15a241c0875c6abd73c626718908a3d9f21a2d
-DIST kosmindoormap-21.08.0.tar.xz 339076 BLAKE2B 006a9516e1bd4354bf510a0e9d1b8256f4a7cd2ec2f03dda3b2ef53632411bba2b5c57d739ac19048e1469949febef0d28e2701e3959315fc3022fd220640520 SHA512 7e8f0d1b6cbb46d1c5ce6c1ea70de194cc79bd00f5ef1ea6273eb19744af6c81721df697fb2b92780fe9ed8fbf1e5f01075f3bbd16d869cef11ab965741cc77a
+DIST kosmindoormap-21.08.1.tar.xz 340568 BLAKE2B 3fe6bc99de994e8e0a07ec46b6fec7bb220f2b125a486503b701efb162364acd51180726e12f1ec16d1b567b04aa024478e9b5a93237030c1a271377942fa253 SHA512 478ba2e01e6a2093531e2c67e09ed08ba18175a025deaed3f13175abc97e68f0c7cd43921a80ebcb474c7dbb09fa31ce4ccfb317ddf2d5dbef9f43ec3d73bbdd
 EBUILD kosmindoormap-21.04.3-r1.ebuild 1063 BLAKE2B a4c288867a7579d9d9e213e349e99b0acc8700d5a84e22a0e81df4d026a602d03e3996b613be61473b0746a92dfb0c05507a7baa75316a0994c21b419e0591b3 SHA512 b5c65cb9c9dfcca952a73dc834d386f35bc719fae90020a7e38664670cfa6b17918ea5f1f5a269dd3af3fb30a25dc8141ab90c00af5a0d3283cd236c75cfb48b
-EBUILD kosmindoormap-21.08.0.ebuild 1063 BLAKE2B 595423f63279b16e77a2fda79d9fb1951a6bd5f4e71706f036494f8a5af3d2d356c304347ecb0759f4277389f8f3f41fd7a8867263b950627730b8dec4d3861a SHA512 d2853c80dbe6c27fa1dfebb8aa80c89a409e05db156758491221d3c32e4e26da0203e7bd987299a515fe75306857780ecc73c139fe8441dc8c0bbcf701c9fc08
+EBUILD kosmindoormap-21.08.1.ebuild 1063 BLAKE2B 80687934139fd66331b87a30a5ce87d01ec04276d12bacbe3c1bd45f33184f894307c501078e4d42c3578045d4af406a94694174a8a719041938a2b1858eb5b4 SHA512 ecb37c911e5bcfc27702b40cf57422bf3833e9061fec751d4170f6fb44ad12ea615de7000e19fb5a9733621d82b5bdfd179aec49af9595b73a4adb59892c4273
 MISC metadata.xml 435 BLAKE2B 0ff98cec8b57e4b4e3ac674df719377c504c770ea91cfdf67f5963c790a2777aa0290815009b0f0ff58c424e76325ee9732cff8c6171b2baa46547e8d28f3c5e SHA512 e4b96636d5576b07606d8d996c7b7c44b174f6f0cd41d1501dd71aac5a16fbf801700676934596313ad79848f2478d92a4ae60176771143372dbb3a1e04b3169
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.08.0.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.08.1.ebuild
index 646460d5abc1..f8dbb4b729a5 100644
--- a/dev-libs/kosmindoormap/kosmindoormap-21.08.0.ebuild
+++ b/dev-libs/kosmindoormap/kosmindoormap-21.08.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KDE_GEAR="true"
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index cb37d22c208a..9932085f8581 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,5 +1,5 @@
 DIST kpublictransport-21.04.3.tar.xz 392532 BLAKE2B 203580f29862dfca34406b250907bc1bc320524212cfef7830aa6f545c012c4bb94976f77c404c1e488655c54e1c724b10d8b38c0a15271b81a4707af25d943a SHA512 a952f11719dfc7223ca2a94ec59ac158f95a4034ed8c37918ab5b03cb06d5d0ad6270912e4823fcd535c745baec406e2b0f29360591d32ddd3b7591ad71c8688
-DIST kpublictransport-21.08.0.tar.xz 407844 BLAKE2B 38c531c3b70e631ec498a933ebd930ce11b97b2a9f3c34ecef0782424bcb0e2b31f62833d2be552b8c0292ef944f9b3f2802eb59edf1cd473e87da32995adb97 SHA512 59207fee9cdeb874756abdaff6404e415f30aba54ead3dfd4b3f83c5dba40b3d1bce3830875a51b1c7f83c58e136be49feb5f18bde5d0333dab3f708cc429b93
+DIST kpublictransport-21.08.1.tar.xz 407848 BLAKE2B 44f8c1b99438c36e5f3914152d4ccf8a177231ad2aa7dbc967868db1549bbb17676fd79080523f1fbeba25d11ea58e6fadb7ba311f738efbd587150ae1bf5322 SHA512 90be4a1e1c6a6068f263d32e8eee11e139d53fcc7c520385cc2b4cbb5ae958a037c008c168b37948402f0a2ce04099cd01fe2a5c616828cc88e3ee5e1c740df2
 EBUILD kpublictransport-21.04.3.ebuild 803 BLAKE2B 3ead7d5be4f24fd8397b1a9c3f30eb7ff48ec05f1eed9266028e285c3e11730e920e1b8f5c57b3f9df8fd1a2ec19730dde6a8b27df3da1e1cf99e4e96a36577e SHA512 957a6ffc58a623523ad49fcd1eec7a6212a8d1040e74e60ab602ead09874fa9415f3148edd37c4ce10d05c8a91e12e38849ca67ca34560bac9b0084cfffef7a3
-EBUILD kpublictransport-21.08.0.ebuild 803 BLAKE2B a83a22a932553102ea1794bd4dc24f649104bc920b39400207518883e1abe0da82ff81fd3815a0f76d0348518c1b9a003fb493ae7e12ab0692d168db421c9c8a SHA512 c8d7778156c20bfa487baa3e8a5415b1c75e1a825645ae15d9e220854a0c5f3c38b4fefef3fcee6f5f3dc574de0ae12d077f4782b43cbb74652b82ed09d7fd42
+EBUILD kpublictransport-21.08.1.ebuild 803 BLAKE2B a187d2d48e43849b1591d956415edcaf9da5943398abbaa2a589de239cf86421d02c8eec081e4ead722831f2057002bb0e41e6188b89869a1435c60f17f5cb15 SHA512 ffdbdf321470ecb6721924d872e2a95feac4ed972c6a5d972b5b3a995d3103810dc74dfc4ac522196157399fcfb6dbbaaae0142e4d8902b640a6ccb2ee567242
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/dev-libs/kpublictransport/kpublictransport-21.08.0.ebuild b/dev-libs/kpublictransport/kpublictransport-21.08.1.ebuild
index 6a375881e3a6..98ceaa976b4d 100644
--- a/dev-libs/kpublictransport/kpublictransport-21.08.0.ebuild
+++ b/dev-libs/kpublictransport/kpublictransport-21.08.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KDE_GEAR="true"
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 07e0c4dd0719..c468628208f3 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -6,6 +6,6 @@ DIST libfmt-8.0.1.tar.gz 805616 BLAKE2B b64a4686050a9edb4e5d3ec28a3727a847105ae0
 EBUILD libfmt-7.1.2.ebuild 778 BLAKE2B 8bcbc4e41e301994ef5d4b3af78c156503be5635937c17f9e48d27f5800cc022071352131d63e2cdb24c9ce05929006fea637911c537c1b39874753cf00fdac1 SHA512 3e3a6478992cabf9be4c94a6fa55c027414978f6a422d3557777d39b4dd0bf3f4dbabd7abb768bbc2991a64e51b753060e86bf1297f2f8decc62dbe55ed74ff1
 EBUILD libfmt-7.1.3.ebuild 778 BLAKE2B 8bcbc4e41e301994ef5d4b3af78c156503be5635937c17f9e48d27f5800cc022071352131d63e2cdb24c9ce05929006fea637911c537c1b39874753cf00fdac1 SHA512 3e3a6478992cabf9be4c94a6fa55c027414978f6a422d3557777d39b4dd0bf3f4dbabd7abb768bbc2991a64e51b753060e86bf1297f2f8decc62dbe55ed74ff1
 EBUILD libfmt-8.0.0-r1.ebuild 837 BLAKE2B 40ccd08531ed4834cd9b5489a623775a7770e2ef6ede4431d4ee45376f03895e5f1c6e40d9f4204b9368851f9e8d6620dc1c61e5e290d73bd5a3e17e6720f4c7 SHA512 35a204cd36f3b08d328b20c5da367826ce2d27647a19563fc540561226d75bc68c29c9352ea526062c2088010cc02a747fef26e619f554496649e0b140055926
-EBUILD libfmt-8.0.1-r1.ebuild 777 BLAKE2B 0ca3fe5e31c7d3084810e2d7a3788dc3506310d66a8ef0d4858cb87fa5f6b29cff4b96df12ebfc4b2a46238c231ff66db7c777c4c94ab4bae21c5310b9f61c87 SHA512 15a37face14227409d0d719b8729d89eba74933197bd1e3e7125a6beef9948340be17c9378c88a39642b23a4dac209f59911626853ccfcd185f06387c5139885
+EBUILD libfmt-8.0.1-r1.ebuild 784 BLAKE2B 483b0edf71a10536c233b5ede3f12326119ccfa6ca2417dc01c275d0d37140452f320b58c30d25cf62abc9223c50ca92271e80131c67f134d42bd50de050dde7 SHA512 dd7cdc4589d7054cdaa77c13b99cf39e440944163d33d3f7b0994dd3f54db808eb9d45fbea5fa31690036f452d80668b39834e2d5dcd3d4fc2e57b15bfefca55
 EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild b/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
index 858bf182268a..d9e236d2dace 100644
--- a/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
+++ b/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 832043359f34..5b9a72472287 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,7 @@
 DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8
 DIST libgit2-1.1.1.tar.gz 5451203 BLAKE2B 46842ea270fc457d0960c1a825928eb2747b236e689ff785e9fc2bce919744d1da95a89e6fcf928bbe6a4981e2ff6a02989df92026ba181f2743e949982a18df SHA512 287255c81e5baa04d8fbce95efca8174cb34da8025cab979445d41e8361955f1d8c582d7705666ae9fc03c5215fc4f4f57e51d73d14ca9b063ed94077f88e6bc
+DIST libgit2-1.2.0.tar.gz 5589147 BLAKE2B b612e3a30b4675431879792132adee22cce57986b4f307507b896d823329f7e37514d9008e008075c395a4eca26aaf6ed6eb3943cf97370a0b04086240a5e1fc SHA512 428188de153fdf8ff5bf78949f4a3a89fba57b87a8b641f92fed501df6a8cfdb72e0ffe0bf61a98adf210a2867134eb4421ea4b8d8219331aabc3daddd92f5fc
 EBUILD libgit2-1.1.0-r2.ebuild 1661 BLAKE2B 1acd45d3b5aa96e3f7cfb75baed1137a7fbc6ddfaa42d5703e9890a191c4505f4dce87a3fb1f331454d136fcb46db7178436c8820cd7b7ea5e7b2812960d1ce8 SHA512 45ed2fab7ab54597e186def3362ec90c3318859fdc86f203a822e74214bf84275358b359bdf997eaa3e23c02cd014e15b093035ad8470202d93c86fa8c202402
-EBUILD libgit2-1.1.1.ebuild 1681 BLAKE2B aa34da7da67ed99c624ff95f029274d66e639e79e4105ad75331c369337991f0577035053b376a96c5929c1e8c903ced60d26e9edb2364e4f718624c4fb0c75c SHA512 58328beb2f53c7cc5dce32077c4e033271e3e6a5b120b4fed3379792da12c7d2f04d7037744dc1b86771a12409dd773248ef65570dc59984645da6eff5a016f3
+EBUILD libgit2-1.1.1.ebuild 1680 BLAKE2B 4510c60e5042887edbc7696b60efabe5a97484c07d5a4e2a3a07c38c5758d90b4612eee7806b07d1c581ec32b5bc34a1075a8b0d3065b81cb9ef6a591fe57983 SHA512 f8c10fb2dc80560ebd58f5dbdc6c0ac37082881bbe3922c1c73cd1fad866203dae2857cf53344fd0e0a888c3d1dfd96cc15970be1dd104cdb91399c347762633
+EBUILD libgit2-1.2.0.ebuild 1686 BLAKE2B d397aafdeeb75006880dabf9653b88921794cee0f79ecf2498fbeb303dd5816d74afe21c03076eaaa6e575d0e96f57d0e697d7e0e859ad97f4bc02860fe9c6f3 SHA512 55e66ddcf474bca68cc61ed829a22b830f083ff584239d23c62d48ec0ad45dca75294c7bff0d27bb425cc6152ea71dd03e05082da846e8fcf086dc38a136fd90
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-1.1.1.ebuild b/dev-libs/libgit2/libgit2-1.1.1.ebuild
index e5be2e907283..27ef1c642b19 100644
--- a/dev-libs/libgit2/libgit2-1.1.1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.1.1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgit2/libgit2-1.2.0.ebuild b/dev-libs/libgit2/libgit2-1.2.0.ebuild
new file mode 100644
index 000000000000..f2c774a8b63c
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.2.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DUSE_HTTP_PARSER=system
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 26ba66ebcf0c..709ccafadc74 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,4 +1,4 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
 DIST libjcat-0.1.8.tar.gz 64828 BLAKE2B 86ebc635364cd78c05694baf3d5fe7d9bf6764629f4530f5ab8a9502887884b3d5369860806a252493a7a3208367b848e470730fb8c32d4c66cc8eb92df51990 SHA512 058bcf7ddddc7a3cedefcfcef9947c5f318fa806c8673b991be29f36e4fa0e09e51e972c0bebe0404fd92060715f8a497a0c0566d743bf6f3fa71bc3d94688c9
-EBUILD libjcat-0.1.8.ebuild 1449 BLAKE2B d842f87eee4f697912bbaaa0d53d8187e7744f3cce27011325d3de3998998f5535021da9a27f40a9c23d7ff689b165824f38ccfc570140bac98eb0a824715977 SHA512 a189876bbc5073d2466498b378cfd2c100c358a953681ed473185c60d9cab962e369587b0bbbb888348e6336f15cdeeca857422d0265059e82bce5b24aba7474
+EBUILD libjcat-0.1.8.ebuild 1456 BLAKE2B 693445986907a3d10a21e6fd3b9c95cc6850ff3786ab234715cffc181268d7d1c41a536ec0bfd5fad23519584d9601ce7c7b152d5fdb3adc68a8cc61040d43f9 SHA512 364b7c724954d39ca04c932f98fbda319dafae35482bfddc9bb081c3c863f6fa578b4b3e29faffb25591bfcfa853067a2c3c85bf3b8c8e3d2e0aaed7c06407b0
 MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b
diff --git a/dev-libs/libjcat/libjcat-0.1.8.ebuild b/dev-libs/libjcat/libjcat-0.1.8.ebuild
index 11fd5361f10f..1740585297c8 100644
--- a/dev-libs/libjcat/libjcat-0.1.8.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index fa17d694162c..a127fdd97f3a 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -3,5 +3,5 @@ DIST libxmlb-0.3.1.tar.gz 113197 BLAKE2B 1e437cb1d9e58350b591bdb6234be453dfdf80f
 DIST libxmlb-0.3.2.tar.gz 113428 BLAKE2B 30f29ebd7522ee2338b4e78e15a544bdf20514e151e63d555be29fca63a3c8251c8d340f778ba1b6b6484c084ab145f9e9d1d4acf037b3f1abad05c5b0101082 SHA512 d4c1cbb8dfd2da9f4b9f436fbba5102f0391df7786a1c0bb1543841eaa5928ac72e6d8125e263be51c69627574bfea70d72624385086879cdbdb44721c0daa3d
 EBUILD libxmlb-0.1.15-r1.ebuild 1207 BLAKE2B 1ea024b9a69ee5da1d849c1f5ad7f13fd78621498591faa5de9ff48a6889c428018ab880472950ec5ea9fa10c70e2388e7661cee6f7a81942926330008d0b93f SHA512 332919207fd280d33be7e4087b356745b065b8af8be7be3149c40cd741173eaa1d92b3928f6704471c021f61aaf0d13424d6204f60e1733f145dbc92c6985c66
 EBUILD libxmlb-0.3.1-r1.ebuild 1239 BLAKE2B 59f8f86554b5d74193b131c48d14930763e576b731e6d18209db205df2caff2598c53f329f35a980017eb84945a9b016180c0aabfa2e3110fc56f797815984ef SHA512 e9e9db309f8fe8654e4ca8adaa14e4d51ccfefa30b9242a8c5f4ef030befa313aea16d19b6e1fd8496b4c5b41fb7aa55fd4a44623ce9041294fa17d721a9a249
-EBUILD libxmlb-0.3.2-r1.ebuild 1239 BLAKE2B 59f8f86554b5d74193b131c48d14930763e576b731e6d18209db205df2caff2598c53f329f35a980017eb84945a9b016180c0aabfa2e3110fc56f797815984ef SHA512 e9e9db309f8fe8654e4ca8adaa14e4d51ccfefa30b9242a8c5f4ef030befa313aea16d19b6e1fd8496b4c5b41fb7aa55fd4a44623ce9041294fa17d721a9a249
+EBUILD libxmlb-0.3.2-r1.ebuild 1246 BLAKE2B aa8a3145a3c16608a75ddba41d286fdd926540cc1cb3733ef755a8e6ccb3b804fbe528b425e85ce18f1d2ac713dcd11d77045822bf50ab7f452d783bc596a57a SHA512 7ab2e358b914a00ca0b9b2d4aed4f57c216349d181c5f8688c9abfc235de6cb93cab7606045620222022654684fc1283896b3a37286a7840d3785d662b2a0548
 MISC metadata.xml 541 BLAKE2B 06a78ea07fff14353777549351cc8655b621d71c51d47b11359fb231653506385291363b9c7139de5da067ad9f7e463bec6332957a6f4f42b16703a93ed9aec2 SHA512 0a65dcd6beb1e8a39214a77ff8ed0fd91adb0a3f536c18c02ba3e387b2be743b866d45dfd13652120f6ca3778e2e872f8ca0fa36d2842f26540284d97f152b5e
diff --git a/dev-libs/libxmlb/libxmlb-0.3.2-r1.ebuild b/dev-libs/libxmlb/libxmlb-0.3.2-r1.ebuild
index 9c0e47edf64f..3e7e8592b795 100644
--- a/dev-libs/libxmlb/libxmlb-0.3.2-r1.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # libxmlb.so version
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc introspection stemmer test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index 97e72f7248d5..8b1906ece7f9 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -3,5 +3,5 @@ DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1
 DIST mathjax-2.7.7.tar.gz 25347766 BLAKE2B c1f11bc854c95888d7f04ee627094a2e297e7554b0380dab30c08e2c4405495df611b440da0efd1e6456150513e07fa4ef90808d2332f9fb83785c118228de18 SHA512 471bd22475827a13d79de7d335f3e51ace06dfc04f575e8829b4505f428949f1dbe58798635cb434ed02ae0cd3fd8d1d577196b4961365fbcb399cc075d3284f
 EBUILD mathjax-2.7.0.ebuild 1221 BLAKE2B 4ff6312f8abe475a5b04b33af927a6c0bd5d23dbfc47d44c7aaf2ec9a7fc60d0f74df33ad337cb1f839d85d04f5265bfd8ae4f59bfb944b9e51d7bd7504c0d09 SHA512 1569474015ab59649e2cfff5eb76179216e39359730561b9ce8e58edd496e1f92f10821b036a3fed3bc557d6ea2481157172800d614e584c7f35e9587914a90e
 EBUILD mathjax-2.7.4.ebuild 1221 BLAKE2B 4ff6312f8abe475a5b04b33af927a6c0bd5d23dbfc47d44c7aaf2ec9a7fc60d0f74df33ad337cb1f839d85d04f5265bfd8ae4f59bfb944b9e51d7bd7504c0d09 SHA512 1569474015ab59649e2cfff5eb76179216e39359730561b9ce8e58edd496e1f92f10821b036a3fed3bc557d6ea2481157172800d614e584c7f35e9587914a90e
-EBUILD mathjax-2.7.7.ebuild 1362 BLAKE2B 85f2ad7f7e8deae216c4bb7e4ad0d41a57696051bef17704e13d0e4dc7a1ccb387a71953e2990d7124aef85b786c5f285f973055383bbddf8c00dc6a68329d46 SHA512 415e8ce3a08802689eb440f60d490e81d8c7cc62e64236528293148b219c26798d5cea7cda6b60f0e93d79fa740d883e65a4c230428054e2768f2244005b923f
+EBUILD mathjax-2.7.7.ebuild 1369 BLAKE2B 89bcbe1e907803289bc97cdce7aed73ba1d80c35f1235f1b64586efcf7c7f2e3e7f5429ea58726f36107dc1c0a3b6e432e9a761346698f43088bb6f969e1b6b5 SHA512 039928b11786ffc72a0d1d0a945831a631dfc6c92e74796156c332b1d5154a2c2051859c68630893f1ecc70492068394183527715bb26c374718f1d988acefd9
 MISC metadata.xml 1030 BLAKE2B 8f3b54b726e2f135394cd6a0957d309070d3aba8fa7c40ef4b51ef8daaa0123b7f30f6cc793e2d93cef3c9f801267640444d7c604a3d6dcb277d9621ec6dd1a7 SHA512 aa7911df581513457da3e6f146e9d7d986c9b028698309ed42d1980f7bdd7a738dd6eb2a252ffbdd49fded3877e196c32b0a75f90fd1fd928b078429ed84565e
diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild
index 02f0e0b71632..ef75b971a7d1 100644
--- a/dev-libs/mathjax/mathjax-2.7.7.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/MathJax-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 3f70608dbc94..33dfe6e21622 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,9 +3,11 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 DIST nss-3.63.1.tar.gz 82166899 BLAKE2B a3c1939d16dcb083fae819659c0a61ff1d4dab70c8a7fc4b176a391bf7cd22eae1c93c85533b6af15e1c1cd9fb6b007380741e0b1670f3891f298ffa1b309284 SHA512 62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730
 DIST nss-3.68.tar.gz 82405833 BLAKE2B 0a48c599bb3c97f41e41c5723e6c1b12d7f03469bf37593f62973817b7cbc9257b97a17ca2393d737bda51536c0b81169ec38b9ac6baa2c9dc7a61ae7817f103 SHA512 be1197320620ffc9c00aa8aec14de71b5c0bdbfc286309fcc5e995c74d1249cea798fd226ba613b345719238b73883af9f2bc28e1e1f698563767295df518a6e
+DIST nss-3.69.1.tar.gz 82426679 BLAKE2B 71948a9fee08536c41da9916e6d2eb82bf52bf688c900eb283f83f0ac60498cce2d936950836b0bfb097ee9315860dbbd402a3b63ab28d23b3bd90523b65ead3 SHA512 26895e542e66bb99965da9832cd7f5b191336aa1027b2e90f194473dd8f6277909102f21833d988fa8d8b0e2178eaca9437b182d1155038abb0743eda2cc5697
 DIST nss-3.69.tar.gz 82427268 BLAKE2B 1467c7f17b1d3d46fb4fcb1d19112585c24ec3d10125d7e954a87c3a6d0e20a300d2084a9480c88dad20274c500e1efb70143bb92b4a8110c2080abf3fe68dfe SHA512 9dd824b3e96aa5a032d5005cdf60a55efac23f69f3857cd1f4337f3ebad92fc2354bb05ed85f04a368e55306a46ebd17a91f7f432f1c191a96e99aecfa62cfdf
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
-EBUILD nss-3.63.1-r1.ebuild 9222 BLAKE2B 8c6ad2c1156913b3a21c056524ebde104e2b6d2d8422eb5f3ae8c9782bf671ce70f8e6ccc527201e7d4c6ce3e7a703d00fe349c719368f6df0d96a36f0be06d9 SHA512 e5e73cbf0cfb93d4493278e8ec93faeb704196d5ec19aaa3e27c42518c611605b87118f2fbfe546575cd549a98c2df2b09da42bcf4a26eb86af56678fbd8b1d9
-EBUILD nss-3.68.ebuild 9237 BLAKE2B 3f37145dff053702335447f0034f45920c7e3ba828e38dbd59cabbe44dc41c1c8ed41079c225d56deeeef69a3545f7dfbf02d9b9d8c5af3509a3678211340a28 SHA512 ad5d2e8c3e4e38aafae17514a7e9f4e215d45111d995562c209e50b6061b4eb6c3a07842b3dc7df2897a47f535a57c291fd5fa4f2c90297ed0f58040edb7b967
-EBUILD nss-3.69.ebuild 9237 BLAKE2B d3dfa99548a19900b6b765cbf9073acdc603e4365e0d382de329d3d9c35094dc9eca6b05ba8ed50a87c6a42c4b9b40bd9e3a9b6dbce2b5796ca27682cc09d7f3 SHA512 83e203ee37b8d3c2ab2e2251a4c057128664ca829d140f638a92a62821eae1c6dac4fd2a715aa0c3b1ed2c9c1fc483f6fdbbaceaa608026080f89f50b2127eb1
+EBUILD nss-3.63.1-r1.ebuild 9506 BLAKE2B 28105fb764f1f57e8d06fc8e58ac7cc03534c9a83f939dd49b63a3ae84a79d82a815858680f4bccd03abca8703b39329cb5ddea21bd06648bed9460a68b4af50 SHA512 ddcb298b779ca3430b18eba1da4ad1778b39b7c946f22b92c2857ed0e612e93138a57f486c37980ebbcc53b906beff68d6ebec58e2fbb821930053b78a76e9b1
+EBUILD nss-3.68.ebuild 9521 BLAKE2B de04a237b2980036eaf2012346b4f0b8e9fa83ff0cec78319f9b69fb34861d8047d53045ae7c1b64a2784476292cf4eb34fae99e7b5fbdc9b7920615922345ea SHA512 d9cdb53234d74e823bafc1ff9c1e80538866efe0618f7660ef7f297fda32f1d9a8580e91ff5f28d659dbe995e143538464eaa46c2429b2d6bee6d102505d6c79
+EBUILD nss-3.69.1.ebuild 9521 BLAKE2B 5ad382679f739a612e30c5670df39fcb92306e79307f348c47968355536a65252c3424a90977d18245d4f50d8cab233946389fa6e83f9e3188ceed3ec650d4be SHA512 afccf0a6a2c3851375cb459619e0a5773e4e4ba27697596b057ebe1a0a79adbdf229bd1ef1967bc6e23a82d9a063571c9c3c68d410f50b79af7473044eb108a3
+EBUILD nss-3.69.ebuild 9521 BLAKE2B 5ad382679f739a612e30c5670df39fcb92306e79307f348c47968355536a65252c3424a90977d18245d4f50d8cab233946389fa6e83f9e3188ceed3ec650d4be SHA512 afccf0a6a2c3851375cb459619e0a5773e4e4ba27697596b057ebe1a0a79adbdf229bd1ef1967bc6e23a82d9a063571c9c3c68d410f50b79af7473044eb108a3
 MISC metadata.xml 516 BLAKE2B d2657cd7422f790cd002e8cbf149bf840888d5a95598f5366dc88ef31fa7a34df20de3e4bab9a1e6a165dd34321317916bbb605c9f850d92bfef19bd4fdf5cba SHA512 5423340287855dc948c1897ae770c2f11a3a5fddce3e484803cccbcda6074825b5037d7fb16cdc837222c85be3c11f37c85045702462f73e56e9fe5ef1cd0259
diff --git a/dev-libs/nss/nss-3.63.1-r1.ebuild b/dev-libs/nss/nss-3.63.1-r1.ebuild
index ab23dc3b5588..35a01a196be9 100644
--- a/dev-libs/nss/nss-3.63.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.63.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
+IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
@@ -168,6 +168,15 @@ multilib_src_compile() {
 		export CC_IS_CLANG=1
 	fi
 
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
 	local d
 
 	# Build the host tools first.
diff --git a/dev-libs/nss/nss-3.68.ebuild b/dev-libs/nss/nss-3.68.ebuild
index 6f5630e89284..a4a9893d7784 100644
--- a/dev-libs/nss/nss-3.68.ebuild
+++ b/dev-libs/nss/nss-3.68.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
+IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
@@ -168,6 +168,15 @@ multilib_src_compile() {
 		export CC_IS_CLANG=1
 	fi
 
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
 	local d
 
 	# Build the host tools first.
diff --git a/dev-libs/nss/nss-3.69.1.ebuild b/dev-libs/nss/nss-3.69.1.ebuild
new file mode 100644
index 000000000000..973f651b763d
--- /dev/null
+++ b/dev-libs/nss/nss-3.69.1.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.32"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/nss/nss-3.69.ebuild b/dev-libs/nss/nss-3.69.ebuild
index 2b0b9c2e6285..973f651b763d 100644
--- a/dev-libs/nss/nss-3.69.ebuild
+++ b/dev-libs/nss/nss-3.69.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
+IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
@@ -168,6 +168,15 @@ multilib_src_compile() {
 		export CC_IS_CLANG=1
 	fi
 
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
 	local d
 
 	# Build the host tools first.
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 51f9abc3717f..af485830c217 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,4 +1,6 @@
 AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f922f8a03602f15e3b1a98570be0a1f3f2db922c9083976eeb164d011b981c8709a9b1459e959634f SHA512 52a0a47963d0938a3a644dedcd913bb22ea6d5e3d539b759872c4175085491cc11a3958bb308029eb4942ea20e0f7890865c21cb063e335e38a154957a64ed58
 DIST opensc-0.21.0.tar.gz 2210878 BLAKE2B 22b63ca59cb721cdbbda755fa90f5b46fd9e5b6d7768cddbfeaffd58d68adcb145d6d604b334cf778608be9ee5fc98109f98d131d2536e61f79705aa3dbafa6c SHA512 3511b0a04a96e62011c48667e3fd36a1611fe67a89f7626ff056c9c3614f8cabc91c9924a6ca7a8ea50076a128e3967277a0dd624b4fa27c62cefee9fab22646
+DIST opensc-0.22.0.tar.gz 2287020 BLAKE2B 74e4bb6843b640c5a397b820a52180a34159c330f5ecb81af166096f23e2499ef1a4d555b5d71613da57ba121d0f984dcfdc2ba9491f26f826a423725a2321e2 SHA512 70ad5f1219f2ec2a5529a30d8e9955510c77c87d0bc857d5951c7227c75cf9de1c6071f43dd3816a2034123ebd902709793ff776e84d5379fdd54c811ccfaaee
 EBUILD opensc-0.21.0-r1.ebuild 1636 BLAKE2B 42b0aabc469e8c7036f13b591d9e491fe0af5a521ebdac15fe2f402ec37538e041d4bf7a442663bf64eea4e886bc56c34eae859b319ae62834b5080c84958538 SHA512 637e2ac00c90dd88621d5af24ba0469944c2e55a4bb4b0af4ebacd9d23184ea02f10d81b2b5ae1bc5415d8e56370b94ee6777bf5990567962e1270d625cc299b
+EBUILD opensc-0.22.0.ebuild 1641 BLAKE2B c70e8effa2319b6f41b42d25bc4eb15606cf1badc778cced46ae4ea6a65f008557f396cdbf4935bea2f1a97870e1b5665e666f296c833b0196c660425545227f SHA512 d420b5eaaf069c02187258b16a026edbee10295b383097202d2bc6d365ab34fbc0f71da0f98c51005f594a863b87b0c772f5f04fbc700934335284821a100f63
 MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
diff --git a/dev-libs/opensc/opensc-0.22.0.ebuild b/dev-libs/opensc/opensc-0.22.0.ebuild
new file mode 100644
index 000000000000..40c261f055bc
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.22.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 libtool
+
+DESCRIPTION="Libraries and applications to access smartcards"
+HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
+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"
+IUSE="ctapi doc openct notify +pcsc-lite readline secure-messaging ssl test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+	openct? ( >=dev-libs/openct-0.5.0 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+	notify? ( dev-libs/glib:2 )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	pcsc-lite? ( !openct !ctapi )
+	openct? ( !pcsc-lite !ctapi )
+	ctapi? ( !pcsc-lite !openct )
+	|| ( pcsc-lite openct ctapi )"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--with-completiondir="$(get_bashcompdir)" \
+		--disable-openpace \
+		--disable-static \
+		--disable-strict \
+		--enable-man \
+		$(use_enable ctapi) \
+		$(use_enable doc) \
+		$(use_enable notify ) \
+		$(use_enable openct) \
+		$(use_enable pcsc-lite pcsc) \
+		$(use_enable readline) \
+		$(use_enable secure-messaging sm) \
+		$(use_enable ssl openssl) \
+		$(use_enable test cmocka) \
+		$(use_enable zlib)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	insinto /etc/pkcs11/modules/
+	doins "${FILESDIR}/${PN}.module"
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 8c5d3dbc43e8..c1bc7570bc97 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -10,6 +10,6 @@ DIST openssl-1.1.1l.tar.gz 9834044 BLAKE2B 9e8739015db63a013c05587e3d164d67c3f65
 DIST openssl-3.0.0-beta2.tar.gz 14912360 BLAKE2B f1180eee6561f04e778f40d3d6f9fac5645777de09d965662f00c2506da30d3c3cfa0e98a25fc668e2e1fd39b8d700d7f0fd901f80964be048cb3aaa6432a5f5 SHA512 3eb9b472429bc26a7fc5c5837e2ea496706e3c6273ba33f36bbe3dc13bf7dcf7cba08d19ce005ee9b1cecfc63de68ef86cd8d911df28c82873ee44ba5d7e253a
 EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
 EBUILD openssl-1.1.1k-r1.ebuild 10306 BLAKE2B 1c8274fb11aafa6aa78f09df1f7a88ced754d08e5b332fe8bec55152da240617fad12a5489549d967da472ee1cfed10ce93689e0e011a54826c55334c3a3daa2 SHA512 96fb34ba04ffcf7e801365ce95d3ab6062b162524c43bab47543f1826a9c94b849b004a58d3ceb3cac3bbe973410d11455488d1e3c3850bb2acabe68c66b6f68
-EBUILD openssl-1.1.1l.ebuild 10311 BLAKE2B 8391d432f0373b393646a03deae7df18c7cd4977332fa3824c3c8e12eec4992c84ae7ca96af033573fba8ebfe95f21e79b0562f286545c28fb4af5f1c0303a19 SHA512 58df034b27d1f7fdef7b0a54b3b3be0b520a00fde660135955ee643d5687ce9ce719d2e77c68463394f2f08103beaf592f598f4b3d7db340a9c8a29b65960f95
+EBUILD openssl-1.1.1l.ebuild 10308 BLAKE2B 985b424c9e4481306917e897ecaaebca5d60b1d968f978d1aba2c1dac954b6736fa6654a119b3d90ef8bb313c524edb50b4ba015f23c7157c5198cd7d337f84e SHA512 3b1bd0845f838bc039090cd56045ac955577bc21b2ccdb435e766e8b6eb5ad390938af2cb797399901ac04b64d77ef675d9c6532e8e8488481b015fddf7cbb75
 EBUILD openssl-3.0.0_beta2.ebuild 8202 BLAKE2B 77d7b31ac7eb5949e4a7561f975a792a21378eabf1877c77b796004d543d2e02a50d0b9ea6770cf775c8a43d7ef3333b0a4a25761553cc7fa276d652348f38d7 SHA512 c4c7d6619a2fda1ec98c51a644d80b1fec321d06384ef3be4cde58831f79769c91107fdecd0532ef59d73a720009e0f2213104100703d0dc826e6a98cb76731d
 MISC metadata.xml 1438 BLAKE2B 2a55417670eacb436b450bd2075e6fca79413a6fa16947efed6dd824b465b81b1ab5869ba33e0ea734e644d5c51cd686b3f950b6787b4cdaad5b2e6feb42fab0 SHA512 8031ae2212e7d8217dd4a50be2564a1102f4ea067af07b722a22ca02f779f7973932fde66e69f957f0c1a9ac88b6f868b12c42f2172835e432b6eba9033cb633
diff --git a/dev-libs/openssl/openssl-1.1.1l.ebuild b/dev-libs/openssl/openssl-1.1.1l.ebuild
index a37dd201e164..644608b06111 100644
--- a/dev-libs/openssl/openssl-1.1.1l.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1l.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
diff --git a/dev-libs/replicant/Manifest b/dev-libs/replicant/Manifest
deleted file mode 100644
index 95ac433882a5..000000000000
--- a/dev-libs/replicant/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST replicant-0.8.1.tar.gz 444074 BLAKE2B 0e4c87437268a86d67b0452e77bca4b4787d44deac29daa4535e851e007c5f6641f2c2cc7f650493ff89e69fa65ee8075658aa70ea0212253334d1af7a6155ae SHA512 a968b92717156656d8f3d8302cedf3405fe1efdf2be79905900f3e3ef26002ec83d4337dceb60ea493bb1607a0b0f9bcba92d766bb11463818483d64ecaaef38
-EBUILD replicant-0.8.1.ebuild 445 BLAKE2B 994961ba47084a29fa54da653d2f77f48c84781d8b1076a48c41c8474a12c8ec0262249eaf07f661ba8c0d96e2caa98b3e8d3d60ac943d150a774297f5b2fbca SHA512 d01e33a5acde789b665d210cf33636413c8931446e54d31e2fc0095ea928c924f7a366fb09fffffc1e4be3b65298d9f6d13572b01740edd0da08f1001557a229
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/replicant/metadata.xml b/dev-libs/replicant/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/dev-libs/replicant/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/replicant/replicant-0.8.1.ebuild b/dev-libs/replicant/replicant-0.8.1.ebuild
deleted file mode 100644
index 1f24b21f9eb7..000000000000
--- a/dev-libs/replicant/replicant-0.8.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Hyperdex replicant support library"
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.8
-	>=dev-libs/libe-0.11
-	>=dev-libs/busybee-0.7
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 78f332c33805..44614dd6f64f 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,7 +1,8 @@
+AUX rocksdb-6.14.6-libatomic.patch 2994 BLAKE2B cac08dfa6fd490645e341148701ba0372aa97f76c84010e3ed94e3aa3a501762c7b2ea09cccc9e895912204e79d7430694b5ab7302fccb7b25f1c7f2ebba4afc SHA512 9f3814133699d7069ebff35b0513ad113a744d7adf21d7ec1d7975fc4fbd114430618760fd38dea69c6948dbf1dc4f5a994f7b347b40423c0244d2867276e448
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d072ee4de1f2850628854af4b5672ff7072ab5c41de84bca9ad0713a1eea7ad7c5cca5ba9b3b96c4bd492a01b5e859 SHA512 c0918fd48bc1e57be9e30452c5cd0c2ba627a15012ab6922404d6cddffdf80799e4442b14d03cbe13a9a9acbdf1736c505cc6f5406efefbf68aba71ec05cf5f0
 DIST rocksdb-6.17.3.tar.gz 6651009 BLAKE2B c032bdf61d93a35e84c65146ad6d1f8639e9f36a323c142fe4131b501051bfb9c4c4edb13b69c86e35740117029996bb4c94887ea690d1957926bdfd347c744a SHA512 085adab94b7eb22859b4119b0356f148231800413571e932a7248967b1866d40a0be4b8265f2a9c6c21c600d3b2254c36e64ce7851171ff7c439a17306a84981
-EBUILD rocksdb-6.14.6-r1.ebuild 1096 BLAKE2B 627a65313bfc642f1fa77f3cc0e20324d7b62b17e9464d9436285b4ebee5d3d932183ef521f43aa545f5ef5bc3b727bd520b373348672025005af75e29c294d3 SHA512 7a43c3752950b3d884c537f3378a823747f366e2ec896478f7a40ae002083cbd8a540e0189f28ba788f1a3cd471014ce579740b4744e2c4039911548fd0f3d3a
-EBUILD rocksdb-6.15.5.ebuild 1095 BLAKE2B d674b9cb7dc1f515a26a8ed904df6bcd562790064c11360bb433782a9972a4826897ba9976a8244ebca498daa882e70ed2cca1738502159b5d5898acfcfd758c SHA512 b6bf539eeb0f902239d9897d216cb60583a4921e68b710aa1e6a87d9c5726b10bff4113a1671c71487ea4b01ed1f439ff712e6f3073d5b9148f97a252d0974f8
-EBUILD rocksdb-6.17.3.ebuild 1102 BLAKE2B 2ba5047f5b99765d8d1e0d9abb85741ca337fdadef66ed99397b3b69ef960da1ab1732c6ff5a00f9353895c29197b291823559943785a897e7f7db28d7e386da SHA512 7543d6a5b04cac6b7ea523538126f19293744f919d83d6e56a6d416580c86cc250bb23b5df7d513e24c7fee020e3aba78c8b4d1e5ad5bfdf6314b36799419d81
+EBUILD rocksdb-6.14.6-r1.ebuild 1160 BLAKE2B 5009cd00349faa37165a5367a5ff79200b8c20422e6de77658f72da663478b283d8b084f7d7f76c23f83a7b22ff2b7b42d536858adb45742395a90cdc924ad19 SHA512 a8b462f530fa1b158722977ded10f60426b09d8fd538f2d1511dcb781abddd198de7e0f83f88a097f2f6b13da65f999685e54e745c8f06a95f6d19115a61e70d
+EBUILD rocksdb-6.15.5.ebuild 1152 BLAKE2B 1f8cfcf17f8b74bf9e6eb8fdeed62cf75b59a807f4f153ab715bc46084f313271fa7199e1fa2eb8f09b5e77b712a5f7a6baaca120efbc64bac723d42fe14692f SHA512 f7a0c6457c609e0c2341e389fce1124e2ba64107f620c04506ddf39901135561cd3af9ce48211fc5f5816985d273d578bb93ce1aad0ee7c02b4590bb1cd7fa7d
+EBUILD rocksdb-6.17.3.ebuild 1159 BLAKE2B d8409769d990b81de0cc17fbf7c0f0dde178c6894af6b2a076bacdce813a3996236818ac3832883e7ba75022bad89ad105edc635bf225da5faa96ea84af8102a SHA512 39bd04fab4b745e1f656e9fa0b027e40690510e0378b3b26d4b96956db0257ef2d7042f24059a92ba31eb312774b290ad7483be79ff5fce32d59f86bd2e8dcda
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
new file mode 100644
index 000000000000..27f17aab8933
--- /dev/null
+++ b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
@@ -0,0 +1,105 @@
+From 38d79de10da65d234c70cbb36c24c58d189f76db Mon Sep 17 00:00:00 2001
+From: mrambacher <mrambach@gmail.com>
+Date: Mon, 12 Apr 2021 20:06:57 -0400
+Subject: [PATCH 1/3] Add check to cmake to see if we need to link against
+ -latomic
+
+For some compilers/environments (e.g. Clang, riscv64), we need to link against -latomic.  Check if this is a requirement and add the library to the third-party libs if it is.
+---
+ CMakeLists.txt | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 984c6197cb..460d350054 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -312,7 +312,6 @@ int main() {
+   auto d = _mm_cvtsi128_si64(c);
+ }
+ " HAVE_SSE42)
+-unset(CMAKE_REQUIRED_FLAGS)
+ if(HAVE_SSE42)
+   add_definitions(-DHAVE_SSE42)
+   add_definitions(-DHAVE_PCLMUL)
+@@ -320,6 +319,26 @@ elseif(FORCE_SSE42)
+   message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
+ endif()
+ 
++# Check if -latomic is required or not
++if (NOT MSVC)
++  set(CMAKE_REQUIRED_FLAGS "--std=c++11")
++  CHECK_CXX_SOURCE_COMPILES("
++#include <atomic>
++std::atomic<uint64_t> x(0);
++int main() {
++  uint64_t i = x.load(std::memory_order_relaxed);
++  bool b = x.is_lock_free();
++  return 0;
++}
++" BUILTIN_ATOMIC)
++if (NOT BUILTIN_ATOMIC)
++  #TODO: Check if -latomic exists 
++  list(APPEND THIRDPARTY_LIBS atomic)
++endif()
++endif()
++
++unset(CMAKE_REQUIRED_FLAGS)
++
+ CHECK_CXX_SOURCE_COMPILES("
+ #if defined(_MSC_VER) && !defined(__thread)
+ #define __thread __declspec(thread)
+
+From df7fdd69ac19f26601a80e35f70ec51913838a6e Mon Sep 17 00:00:00 2001
+From: mrambacher <mrambach@gmail.com>
+Date: Wed, 14 Apr 2021 10:33:47 -0400
+Subject: [PATCH 2/3] Reset CMAKE_REQUIRED_FLAGS after compilation checks
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 460d350054..5d167855a7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -296,6 +296,7 @@ else()
+ endif()
+ 
+ include(CheckCXXSourceCompiles)
++set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+ if(NOT MSVC)
+   set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
+ endif()
+@@ -337,7 +338,8 @@ if (NOT BUILTIN_ATOMIC)
+ endif()
+ endif()
+ 
+-unset(CMAKE_REQUIRED_FLAGS)
++# Reset the required flags
++set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
+ 
+ CHECK_CXX_SOURCE_COMPILES("
+ #if defined(_MSC_VER) && !defined(__thread)
+
+From 4793c5c75351d5d7c609c27d0243c2138729c7b0 Mon Sep 17 00:00:00 2001
+From: mrambacher <mrambach@gmail.com>
+Date: Fri, 16 Apr 2021 08:53:48 -0400
+Subject: [PATCH 3/3] Fix lint warning
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d167855a7..558b985073 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -333,7 +333,7 @@ int main() {
+ }
+ " BUILTIN_ATOMIC)
+ if (NOT BUILTIN_ATOMIC)
+-  #TODO: Check if -latomic exists 
++  #TODO: Check if -latomic exists
+   list(APPEND THIRDPARTY_LIBS atomic)
+ endif()
+ endif()
diff --git a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
index 52fa5972a51b..337b328a43cf 100644
--- a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
 
 DEPEND="
@@ -25,6 +25,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+)
+
 src_configure() {
 	mycmakeargs=(
 		-DFAIL_ON_WARNINGS=OFF
diff --git a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
index eca7931e3752..c8bb53cec446 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
@@ -25,6 +25,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+)
+
 src_configure() {
 	mycmakeargs=(
 		-DFAIL_ON_WARNINGS=OFF
diff --git a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
index e441ef854c8d..76c4d651f8af 100644
--- a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
@@ -25,6 +25,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+)
+
 src_configure() {
 	mycmakeargs=(
 		-DFAIL_ON_WARNINGS=OFF