Updating liguros repo21.1.0

49 files changed, 1117 insertions, 397 deletions

diff --git a/dev-libs/aws-c-cal/Manifest b/dev-libs/aws-c-cal/Manifest
new file mode 100644
index 000000000000..41e867a57137
--- /dev/null
+++ b/dev-libs/aws-c-cal/Manifest
@@ -0,0 +1 @@
+DIST aws-c-cal-0.4.5.tar.gz 51956 BLAKE2B 8e758cf4ba362efb3721c4b25f8264e3859eb0882d5bd1dc65a1ad7fa6ac5deb80872b214f39f389ad2c4cae620cb3d6535f39e8e6cbd63bceeb6b1ad7fd5bd1 SHA512 b6feb72e607bf9bbd927dda21a6d7e7f99771c5078fad778aa2d858aa86b251726a3797b61ad2d927a5293dad10b8ec97192ed60db652ebf8c664923c2484b6f
diff --git a/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild b/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild
new file mode 100644
index 000000000000..407a8f3334d2
--- /dev/null
+++ b/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Crypto Abstraction Layer: Cross-Platform C99 wrapper for cryptography primitives"
+HOMEPAGE="https://github.com/awslabs/aws-c-cal"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	|| (
+		>dev-util/cmake-3.19.1
+		<dev-util/cmake-3.19.0
+	)
+"
+
+DEPEND="
+	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-prefix.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-c-cal/files/aws-c-cal-0.4.5-cmake-prefix.patch b/dev-libs/aws-c-cal/files/aws-c-cal-0.4.5-cmake-prefix.patch
new file mode 100644
index 000000000000..7c861ce715f9
--- /dev/null
+++ b/dev-libs/aws-c-cal/files/aws-c-cal-0.4.5-cmake-prefix.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ endif()
+ 
+ # This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
+-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
++set(AWS_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake")
+ string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
+ # Append that generated list to the module search path
+ list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
diff --git a/dev-libs/aws-c-cal/metadata.xml b/dev-libs/aws-c-cal/metadata.xml
new file mode 100644
index 000000000000..aa540c54f61c
--- /dev/null
+++ b/dev-libs/aws-c-cal/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-libs/aws-c-common/Manifest b/dev-libs/aws-c-common/Manifest
index 2b7630e5d4ae..a6c552fe9079 100644
--- a/dev-libs/aws-c-common/Manifest
+++ b/dev-libs/aws-c-common/Manifest
@@ -1 +1 @@
-DIST aws-c-common-0.4.57.tar.gz 418954 BLAKE2B cfb268d92e90343e01756b571d0d7fa1269a144b933b5dfae6e5fb92a2b384ff73bf14ad830b53427ad37e9dbd9a0afff5b571108869a69a8d466982a2e6c6ef SHA512 77a9110a067e3057ae3cb90ee0b1fa42e18595e476b803f83711ecc164053db73683df2fccf75ad992b7d08e142cb31d6a70f87ce2f3b87ce28ee1e8151b3c62
+DIST aws-c-common-0.4.62.tar.gz 411263 BLAKE2B b9eb8eab8fceb949adcb96bc98987c318dcc70dae2cb8ecdcdf36c306be97158a64208c4bcc2452c83f03708cd7fb5401639558bc9bea946234f4b6b4c8eaec1 SHA512 7f31d739a3376404016bd509b40656d7620bddfb77a7f988306f2dcb2b03a03387855d845c2b9f63194d0bf2182a8d96392dba6c2bf847eaeb008115561d73ba
diff --git a/dev-libs/aws-c-common/aws-c-common-0.4.57-r1.ebuild b/dev-libs/aws-c-common/aws-c-common-0.4.62.ebuild
index 120faea56d6a..7f1ab8b2b7e7 100644
--- a/dev-libs/aws-c-common/aws-c-common-0.4.57-r1.ebuild
+++ b/dev-libs/aws-c-common/aws-c-common-0.4.62.ebuild
@@ -16,8 +16,15 @@ IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	|| (
+		>dev-util/cmake-3.19.1
+		<dev-util/cmake-3.19.0
+	)
+"
+
 PATCHES=(
-	"${FILESDIR}"/${P}-remove-Werror-CFLAG.patch
+	"${FILESDIR}"/${PN}-0.4.57-remove-Werror-CFLAG.patch
 )
 
 src_configure() {
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index c2b13f320ab7..26068293074f 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1 +1 @@
-DIST aws-c-event-stream-0.1.6.tar.gz 26952 BLAKE2B 0edebb4c290d7e33d06dcba64a339bb3f4c60aa8b9455d8d519b41c7cab7eae3ac80e3545219ce87174de8ca47be4c4cd88d7cf21deff87a10f4d121ca66d3bb SHA512 2eca4176d9429de2741e9650f84b726a9979842e729fd0d900c1265ff89886dd7e12f72b61fc3af7c3282ec9357b8f6290c92713cef68e474150c947a5773421
+DIST aws-c-event-stream-0.2.5.tar.gz 61949 BLAKE2B baebd87a916fb8440db56afa2b97bd02229d70e00b55c40a17a2f467ad683422a6c6747aa698adce5272a03ced3fe6957d8cc62040d8080d3ed95409d8182851 SHA512 1421d608d8a5cfa5ec5df3bd905aab9ce9abc913461569a99b895c8415e50305aca0be3595bd4f3ed74cb52cc0e342354d211531066fdde60e14dd60e5629239
diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.6-r1.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5.ebuild
index 9c59ceb1a5eb..57f763c252a6 100644
--- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.6-r1.ebuild
+++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5.ebuild
@@ -16,9 +16,16 @@ IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	|| (
+		>dev-util/cmake-3.19.1
+		<dev-util/cmake-3.19.0
+	)
+"
+
 DEPEND="
-	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
-	>=dev-libs/aws-checksums-0.1.9:=[static-libs=]
+	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
+	>=dev-libs/aws-checksums-0.1.10:=[static-libs=]
 "
 
 PATCHES=(
diff --git a/dev-libs/aws-c-io/Manifest b/dev-libs/aws-c-io/Manifest
new file mode 100644
index 000000000000..bca18fcf6224
--- /dev/null
+++ b/dev-libs/aws-c-io/Manifest
@@ -0,0 +1 @@
+DIST aws-c-io-0.7.0.tar.gz 561762 BLAKE2B ffe8ac5de9fd5f57e7bc18e1d956f28567413d34ec23a7d0869065718039b1ab56aeae82fd8e24bf77f7393df2c1140308195cd8a4c6ff06cbc7843ae62d76c8 SHA512 b858a5a14cfea86c39f96963c4238ca0f90339befcbd6480e6353719d9846079764f8b42fbdc0cec2f99223bfe1c07fa2a014543fa3fe8a6357440e3cd1007f5
diff --git a/dev-libs/aws-c-io/aws-c-io-0.7.0.ebuild b/dev-libs/aws-c-io/aws-c-io-0.7.0.ebuild
new file mode 100644
index 000000000000..e3fbefde1310
--- /dev/null
+++ b/dev-libs/aws-c-io/aws-c-io-0.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="AWS SDK for C module, handles IO and TLS work for application protocols"
+HOMEPAGE="https://github.com/awslabs/aws-c-io"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	|| (
+		>dev-util/cmake-3.19.1
+		<dev-util/cmake-3.19.0
+	)
+"
+
+DEPEND="
+	>=dev-libs/aws-c-cal-0.4.5:=[static-libs=]
+	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
+	>=dev-libs/s2n-0.10.21:=[static-libs=]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-prefix.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-c-io/files/aws-c-io-0.7.0-cmake-prefix.patch b/dev-libs/aws-c-io/files/aws-c-io-0.7.0-cmake-prefix.patch
new file mode 100644
index 000000000000..39cab922b3d9
--- /dev/null
+++ b/dev-libs/aws-c-io/files/aws-c-io-0.7.0-cmake-prefix.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ endif()
+ 
+ # This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
+-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
++set(AWS_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake")
+ string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
+ # Append that generated list to the module search path
+ list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
+
diff --git a/dev-libs/aws-c-io/metadata.xml b/dev-libs/aws-c-io/metadata.xml
new file mode 100644
index 000000000000..50ffd156cf66
--- /dev/null
+++ b/dev-libs/aws-c-io/metadata.xml
@@ -0,0 +1,24 @@
+<?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>
+	<longdescription>
+This is a module for the AWS SDK for C. It handles all IO and TLS work for application protocols.
+
+aws-c-io is an event driven framework for implementing application protocols. It is built on top of cross-platform
+abstractions that allow you as a developer to think only about the state machine and API for your protocols. A typical
+use-case would be to write something like Http on top of asynchronous-io with TLS already baked in. All of the platform
+and security concerns are already handled for you.
+
+It is designed to be light-weight, fast, portable, and flexible for multiple domain use-cases such as: embedded,
+server, client, and mobile.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-libs/aws-checksums/Manifest b/dev-libs/aws-checksums/Manifest
index 5ae05de0ed8e..aeb6ae36ca4e 100644
--- a/dev-libs/aws-checksums/Manifest
+++ b/dev-libs/aws-checksums/Manifest
@@ -1 +1 @@
-DIST aws-checksums-0.1.9.tar.gz 70967 BLAKE2B 2be344e9757236400879de2f946e7d7a41106c9544c1eefda0150bee3e483b909719d4612f4a8bbef1df01a8f5f887332f06e99aa0867f9d0f9b92f76c8badeb SHA512 16d8f1624d4a60c6a285c6212d2cc1bdf081fec4be5034095b89040543a0ccec6a2f22d9bacf156c781e0e06e80935e13f39c3643a77c2186b58211da4ca1207
+DIST aws-checksums-0.1.10.tar.gz 70961 BLAKE2B ef0644b8b6f81ca743955170940b9e152bf6b48d8146ea0ebe11b37eac607fe6544a826d9a14b273575837c842a3e539e4829571df1c4fa61bf9008e44872e8c SHA512 a76eb274f668189cb303f7010311e51551b224d19bf54bb152c3d9346ab837c33300fc6c1e9c35b04922101817cca8b3ea7968f6cdecf1166e7933bf0348edb6
diff --git a/dev-libs/aws-checksums/aws-checksums-0.1.9-r1.ebuild b/dev-libs/aws-checksums/aws-checksums-0.1.10.ebuild
index bda76dac92c3..61375a3de8b2 100644
--- a/dev-libs/aws-checksums/aws-checksums-0.1.9-r1.ebuild
+++ b/dev-libs/aws-checksums/aws-checksums-0.1.10.ebuild
@@ -16,12 +16,19 @@ IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	|| (
+		>dev-util/cmake-3.19.1
+		<dev-util/cmake-3.19.0
+	)
+"
+
 DEPEND="
-	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
+	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-cmake-prefix.patch"
+	"${FILESDIR}/${PN}-0.1.9-cmake-prefix.patch"
 )
 
 src_configure() {
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index c27b05abb983..283ae812409e 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1 +1 @@
-DIST aws-sdk-cpp-1.8.46.tar.gz 28989406 BLAKE2B 47a72d1e0578ecd28e376f3c6688a997faeeae41ba5e4ab5aeff59a2d8f592fc63746445728ab3236952cfc045dc683c816c77dfb8fbe3d98904e50013201ace SHA512 9fedc9de84721189f001a0a5fb2dd63987a366a37ec6354234b244da39929b420e6289bd319d0f056fa4274b7bc682d1aab2dddd5dc823abdf24b69536610ed4
+DIST aws-sdk-cpp-1.8.105.tar.gz 31880249 BLAKE2B 1a2eb972b716c656f45b8d1d12fc3e7280c171e4a19eb5431e320511365d305211e8567aa7fcc3e21f553ad5befda91829df6ccf60c23296d210d0c7347bb2a2 SHA512 a76da095718c8569c62597431d29a0a54c1a7f81c1825894f0f40b1a971a3e0b4f0813da4ac929612b9bb5f92501ee6a034436faa6eef678d936117765baab7e
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.105.ebuild
index 75bfd53b518b..4795b8eb3add 100644
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.105.ebuild
@@ -17,12 +17,13 @@ KEYWORDS="~amd64 ~x86"
 
 MODULES=(
 	access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media
-	cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks
-	elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events forecast
-	frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail machinelearning
-	macie managedblockchain marketplace networkmanager opsworks organizations other outposts personalize polly qldb
-	queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns
-	sqs textract transcribe translate waf
+	cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs
+	eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events
+	forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail
+	lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks
+	organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3
+	sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe
+	translate waf
 )
 
 IUSE="+http libressl pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
@@ -36,9 +37,9 @@ DEPEND="
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
-	>=dev-libs/aws-c-event-stream-0.1.6:=[static-libs=]
-	>=dev-libs/aws-checksums-0.1.9:=[static-libs=]
+	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
+	>=dev-libs/aws-c-event-stream-0.2.5:=[static-libs=]
+	>=dev-libs/aws-checksums-0.1.10:=[static-libs=]
 	sys-libs/zlib
 "
 RDEPEND="
@@ -72,7 +73,7 @@ src_configure() {
 		if use ${module}; then
 			if [ "${module}" = "access-management" ] ; then
 				mybuildtargets+=";${module};accessanalyzer;acm;acm-pca;dataexchange;iam"
-				mybuildtargets+=";identity-management;identitystore;ram;sso;sso-oidc;sts"
+				mybuildtargets+=";identity-management;identitystore;ram;sso;sso-admin;sso-oidc;sts"
 			elif [ "${module}" = "apigateway" ] ; then
 				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
 			elif [ "${module}" = "budgets" ] ; then
@@ -100,8 +101,8 @@ src_configure() {
 			elif [ "${module}" = "cloudsearch" ] ; then
 				mybuildtargets+=";${module};cloudsearchdomain"
 			elif [ "${module}" = "cloudwatch" ] ; then
-				mybuildtargets+=";application-insights;appmesh;cloudtrail;compute-optimizer;guardduty"
-				mybuildtargets+=";health;inspector;logs;monitoring;synthetics"
+				mybuildtargets+=";application-insights;appmesh;auditmanager;cloudtrail;compute-optimizer"
+				mybuildtargets+=";detective;devops-guru;guardduty;health;inspector;logs;monitoring;synthetics"
 			elif [ "${module}" = "cognito" ] ; then
 				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
 			elif [ "${module}" = "dynamodb" ] ; then
@@ -109,6 +110,10 @@ src_configure() {
 			elif [ "${module}" = "ec2" ] ; then
 				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
 				mybuildtargets+=";ec2-instance-connect;elasticfilesystem;imagebuilder;savingsplans"
+			elif [ "${module}" = "ecr" ] ; then
+				mybuildtargets+=";${module};ecr-public"
+			elif [ "${module}" = "eks" ] ; then
+				mybuildtargets+=";${module};emr-containers"
 			elif [ "${module}" = "elasticloadbalancing" ] ; then
 				mybuildtargets+=";${module};elasticloadbalancingv2"
 			elif [ "${module}" = "email" ] ; then
@@ -132,16 +137,20 @@ src_configure() {
 			elif [ "${module}" = "marketplace" ] ; then
 				mybuildtargets+=";marketplacecommerceanalytics;marketplace-catalog"
 				mybuildtargets+=";marketplace-entitlement;meteringmarketplace;pricing"
+				mybuildtargets+=";servicecatalog-appregistry"
 			elif [ "${module}" = "opsworks" ] ; then
 				mybuildtargets+=";${module};opsworkscm"
 			elif [ "${module}" = "other" ] ; then
 				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;braket;clouddirectory"
-				mybuildtargets+=";comprehend;comprehendmedical;connect;datapipeline;datasync"
+				mybuildtargets+=";comprehend;comprehendmedical;connect;connect-contact-lens"
+				mybuildtargets+=";connectparticipant;customer-profiles;datapipeline;databrew;datasync"
 				mybuildtargets+=";directconnect;discovery;dms;docdb;ds;dynamodb;gamelift;glue"
-				mybuildtargets+=";groundstation;importexport;kafka;lakeformation"
+				mybuildtargets+=";groundstation;healthlake;importexport;kafka;lakeformation"
 				mybuildtargets+=";migrationhub-config;mq;mturk-requester;neptune;quicksight;redshift"
 				mybuildtargets+=";robomaker;sdb;schemas;service-quotas;servicecatalog;servicediscovery"
 				mybuildtargets+=";signer;sms;snowball;ssm;states;storagegateway;support;swf"
+			elif [ "${module}" = "outposts" ] ; then
+				mybuildtargets+=";${module};s3outposts"
 			elif [ "${module}" = "personalize" ] ; then
 				mybuildtargets+=";${module};personalize-events;personalize-runtime"
 			elif [ "${module}" = "polly" ] ; then
@@ -157,11 +166,14 @@ src_configure() {
 			elif [ "${module}" = "s3" ] ; then
 				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
 			elif [ "${module}" = "sagemaker" ] ; then
-				mybuildtargets+=";${module};sagemaker-a2i-runtime;sagemaker-runtime"
+				mybuildtargets+=";${module};sagemaker-a2i-runtime;sagemaker-edge"
+				mybuildtargets+=";sagemaker-featurestore-runtime;sagemaker-runtime"
+			elif [ "${module}" = "timestream" ] ; then
+				mybuildtargets+=";timestream-query;timestream-write"
 			elif [ "${module}" = "transcribe" ] ; then
 				mybuildtargets+=";${module};transcribestreaming"
 			elif [ "${module}" = "waf" ] ; then
-				mybuildtargets+=";${module};fms;waf-regional;wafv2"
+				mybuildtargets+=";${module};fms;network-firewall;waf-regional;wafv2"
 			else
 				mybuildtargets+=";${module}"
 			fi
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch
index 9c8ff79e311e..8130066cc391 100644
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch
@@ -1,5 +1,5 @@
---- a/cmake/compiler_settings.cmake	2020-09-29 10:15:14.293703615 +0200
-+++ b/cmake/compiler_settings.cmake	2020-09-29 10:15:32.173704251 +0200
+--- a/cmake/compiler_settings.cmake	2020-12-12 15:31:17.703362345 +0100
++++ b/cmake/compiler_settings.cmake	2020-12-12 15:31:53.641363625 +0100
 @@ -53,7 +53,7 @@
  endmacro()
  
@@ -9,19 +9,19 @@
      if(COMPILER_CLANG)
          if(PLATFORM_ANDROID)
              # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.
---- a/cspell.json	2020-09-29 10:19:23.102712472 +0200
-+++ b/cspell.json	2020-09-29 10:20:32.195714931 +0200
-@@ -11,7 +11,7 @@
+--- a/cspell.json	2020-12-12 15:31:17.703362345 +0100
++++ b/cspell.json	2020-12-12 15:31:42.488363228 +0100
+@@ -13,7 +13,7 @@
          // CMake
-         "cmake",
+         "cmake", "DCMAKE", "AUTORUN", "DEPS", "STREQUAL", "RPATH", "STREQUAL", "DTARGET", "TOOLCHAIN", "DANDROID", "DBUILD", "DGIT", "SYSROOT", "DSTATIC", "BINDIR", "LIBDIR", "INCLUDEDIR", "DHAS",
          // Compiler and linker
--        "Wpedantic", "Wextra", "Werror", "xldscope", "Wtype", "Wunused",
-+        "Wpedantic", "Wextra", "xldscope", "Wtype", "Wunused",
+-        "Wpedantic", "Wextra", "Werror", "xldscope", "Wtype", "Wunused", "RTTI", "ffunction", "fdata", "fsanitize", "pathconf", "unistd", "umask",
++        "Wpedantic", "Wextra", "xldscope", "Wtype", "Wunused", "RTTI", "ffunction", "fdata", "fsanitize", "pathconf", "unistd", "umask",
          // Android NDK
          "JNIEXPORT", "jint", "JNICALL", "jobject", "jclass", "jmethod", "Ljava",
          // XML parser
---- a/CI/install-test/CMakeLists.txt	2020-09-29 10:19:32.094712792 +0200
-+++ b/CI/install-test/CMakeLists.txt	2020-09-29 10:19:46.064713289 +0200
+--- a/CI/install-test/CMakeLists.txt	2020-12-12 15:31:17.704362345 +0100
++++ b/CI/install-test/CMakeLists.txt	2020-12-12 15:32:06.433364080 +0100
 @@ -4,4 +4,4 @@
  find_package(AWSSDK REQUIRED COMPONENTS s3)
  add_executable(${PROJECT_NAME} "main.cpp")
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
index 32e431283632..544ef40a48e6 100644
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -45,8 +45,8 @@
 			SSO : AWS Single Sign-On (SSO) makes it easy to centrally manage access to multiple AWS
 				accounts and business applications and provide users with single sign-on access to all
 				their assigned accounts and applications from one place.
-			Also enables acm-pca, identity-management, identitystore, sso-oidc and sts (Security Token
-			Service).
+			Also enables acm-pca, identity-management, identitystore, sso-admin, sso-oidc and sts
+			(Security Token Service).
 		</flag>
 		<flag name="apigateway">
 			Create and deploy your own REST and WebSocket APIs at any scale.
@@ -143,10 +143,16 @@
 			The following modules besides monitoring are also enabled:
 			Application Insights: Monitor .NET and SQL Server applications.
 			App Mesh            : Monitor and control microservices running on AWS.
+			Audit Manager       : Helps to continuously audit your AWS usage to simplify how you manage
+				risk and compliance with regulations and industry standards.
 			CloudTrail          : Monitor AWS deployments in the cloud by getting a history of AWS API
 				calls, including API calls made via the AWS Management Console, the AWS SDKs, the
 				command line tools, and higher-level AWS services.
 			Compute Optimizer   : Recommends optimal AWS compute resources for your workloads.
+			Detective           : Analyze, investigate, and identify the root cause of security findings
+				or suspicious activities. 
+			DevOps Guru         : Generates operational insights using machine learning to help to improve
+				the performance of operational applications.
 			GuardDuty           : Continuous security monitoring service.
 			Health              : Provides personalized information about events that can affect the AWS
 				infrastructure, guides through scheduled changes, and accelerates the troubleshooting
@@ -194,6 +200,7 @@
 		</flag>
 		<flag name="ecr">
 			Amazon Elastic Container Registry (ECR) is a fully managed Docker container registry.
+			Also enables Amazon ECR Public.
 		</flag>
 		<flag name="ecs">
 			Amazon Elastic Container Service (ECS) is a highly scalable, fast, container management service.
@@ -201,6 +208,7 @@
 		<flag name="eks">
 			Amazon Elastic Kubernetes Service (EKS) is a managed service to run Kubernetes on AWS without
 			own Kubernetes clusters.
+			Also enables Amazon EMR on EKS.
 		</flag>
 		<flag name="elasticache">
 			Set up, manage, and scale distributed in-memory cache environments in the AWS Cloud
@@ -303,6 +311,10 @@
 		<flag name="lightsail">
 			The easiest way to get started with AWS for developers who just need virtual private servers
 		</flag>
+		<flag name="lookoutvision">
+			Amazon Lookout for Vision enables you to find visual defects in industrial products, accurately
+			and at scale. 
+		</flag>
 		<flag name="machinelearning">
 			The algorithms of Amazon Machine Learning create machine learning (ML) models by finding
 			patterns in existing data. The service uses these models to process new data and generate
@@ -327,7 +339,11 @@
 			Marketplace Metering Service   : A pricing and metering feature that AWS Marketplace sellers can
 				use to directly charge for their software along one of four dimensions: users, data,
 				bandwidth, or hosts.
-			Also enables marketplace-catalog and pricing.
+			Also enables marketplace-catalog, pricing and servicecatalog-appregistry.
+		</flag>
+		<flag name="mwaa">
+			Amazon Managed Workflows for Apache Airflow (Amazon MWAA) is a managed service for Apache
+			Airflow that makes it easy for you to build and manage your workflows in the cloud.
 		</flag>
 		<flag name="networkmanager">
 			Transit Gateway Network Manager (Network Manager) enables you to create a global network, in
@@ -347,16 +363,17 @@
 			bug report and it will most probably get one.
 			The modules are:
 			AWSMigrationHub, alexaforbusiness, appflow, braket, clouddirectory, comprehend,
-			comprehendmedical, connect, datapipeline, datasync, directconnect, discovery, dms, docdb, ds,
-			dynamodb, gamelift, glue, groundstation, importexport, kafka, lakeformation, migrationhub-
-			config, mq, mturk-requester, neptune, quicksight, redshift, robomaker, sdb, schemas, service-
-			quotas, servicecatalog, servicediscovery, signer, sms, snowball, ssm, states, storagegateway,
-			support and swf.
+			comprehendmedical, connect, connect-contact-lens, customer-profiles, datapipeline, databrew,
+			datasync, directconnect, discovery, dms, docdb, ds, dynamodb, gamelift, glue, groundstation,
+			healthlake, importexport, kafka, lakeformation, migrationhub-config, mq, mturk-requester,
+			neptune, quicksight, redshift, robomaker, sdb, schemas, service-quotas, servicecatalog,
+			servicediscovery, signer, sms, snowball, ssm, states, storagegateway, support and swf.
 		</flag>
 		<flag name="outposts">
 			AWS Outposts brings native AWS services, infrastructure, and operating models to virtually any
 			data center, co-location space, or on-premises facility. You can use the same services, tools,
 			and partner solutions to develop for the cloud and on premises.
+			Also enables s3outposts.
 		</flag>
 		<flag name="personalize">
 			Real-time personalization and recommendations, based on the same technology used at Amazon.com.
@@ -408,7 +425,8 @@
 			Fully managed machine learning service. With Amazon SageMaker, data scientists and developers
 			can quickly and easily build and train machine learning models, and then directly deploy them
 			into a production-ready hosted environment.
-			Also enables sagemaker-a2i-runtime and sagemaker-runtime.
+			Also enables sagemaker-a2i-runtime, sagemaker-edge, sagemaker-featurestore-runtime and
+			sagemaker-runtime.
 		</flag>
 		<flag name="secretsmanager">
 			Encrypt, store, and retrieve credentials for databases and other services.
@@ -431,6 +449,11 @@
 		<flag name="textract">
 			Amazon Textract to add document text detection and analysis to applications.
 		</flag>
+		<flag name="timestream">
+			Store and analyze sensor data for IoT applications, metrics for DevOps use cases, and telemetry
+			for application monitoring scenarios such as clickstream data analysis.
+			Note: The two modules enabled are timestream-query and timestream-write.
+		</flag>
 		<flag name="transcribe">
 			A transcription services for audio files. It uses advanced machine learning technologies to
 			recognize spoken words and transcribe them into text.
@@ -445,7 +468,7 @@
 			CloudFront distributions or an Application Load Balancer. Can also be used to block or allow
 			requests based on conditions such as the IP addresses that requests originate from or values in
 			the requests.
-			Also enables fms, waf-regional and wafv2
+			Also enables fms, network-firewall, waf-regional and wafv2
 		</flag>
 	</use>
 	<origin>gentoo-staging</origin>
diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
index 1c33e27fd381..f9f235de0e51 100644
--- a/dev-libs/distorm64/Manifest
+++ b/dev-libs/distorm64/Manifest
@@ -1,2 +1 @@
-DIST distorm3-3.5.0.tar.gz 137500 BLAKE2B 01d426f0b76a232503ebe4e1edb719bcdd1480a6ab729f3e49eff3e3fee5e9e4af6e6051c1e7675b14aa39a2fc999df2c1535976bb0981a23baef0e78aec8bd3 SHA512 ad9415a0a1a65a7ad3824b19ec83df90459eeb153494efb6623a8f02c60b6d0cf61d7dae4143eb1dd0586f5c7a7115f4a53cea5609296f703e5db612ce925011
 DIST distorm3-3.5.1.tar.gz 137638 BLAKE2B cecd29dd30a78514e8f8275fef6d0d8338f8d3f5c22b9b48abf2a156b9dc14626455db92172a9bcf6ce36fab8975149395437697a464ce8dd7fb73e9acfcad9d SHA512 0f4cc669c0c562f8458f29d7d6c5d6c308e4681c1c1737d9d81dd2d02e11e5af236b7084d1b24980d1bd0fac514a043bb83d3b6c499b731d43cb4b7458172c48
diff --git a/dev-libs/distorm64/distorm64-3.5.0.ebuild b/dev-libs/distorm64/distorm64-3.5.0.ebuild
deleted file mode 100644
index 92a1c865ea51..000000000000
--- a/dev-libs/distorm64/distorm64-3.5.0.ebuild
+++ /dev/null
@@ -1,32 +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,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
-HOMEPAGE="https://www.ragestorm.net/distorm/"
-
-MY_PN=distorm3
-MY_P=${MY_PN}-${PV}
-
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-DEPEND=""
-RDEPEND=""
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-python_install() {
-	distutils-r1_python_install
-
-	# don't know why it does not happen by default
-	python_optimize
-}
diff --git a/dev-libs/elfutils/elfutils-0.182.ebuild b/dev-libs/elfutils/elfutils-0.182.ebuild
index 55bfc73a8346..9497b4a96856 100644
--- a/dev-libs/elfutils/elfutils-0.182.ebuild
+++ b/dev-libs/elfutils/elfutils-0.182.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild
index 74a04e0bd981..9111f7d2f3da 100644
--- a/dev-libs/gumbo/gumbo-0.10.1.ebuild
+++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/jansson/files/jansson-2.13.1-sphinx3.patch b/dev-libs/jansson/files/jansson-2.13.1-sphinx3.patch
new file mode 100644
index 000000000000..e611896e9c4e
--- /dev/null
+++ b/dev-libs/jansson/files/jansson-2.13.1-sphinx3.patch
@@ -0,0 +1,269 @@
+Rebase pull request #543 onto v2.13.1
+
+Allows jansson documentation to compile with Sphinx-3.0
+
+Squashed commit messages below:
+
+
+pick 798d40c doc: convert refcounting directive to a class
+
+Directive functions are no longer supported in Sphinx-3.0
+but directive classes have been supported since early 1.x
+
+
+pick 9431889 doc: do not use references for standard C types or file names
+
+Use double-backtick quoting instead. It has the same effect
+(because these links had nowhere to link to) but it does not
+result in loud warnings about broken references by default with Sphinx-3.x.
+
+
+pick c329fd7 doc: add return types for function-like macros
+
+The Sphinx-3.0 c:function:: directive requires the return type.
+
+Sphinx-3.0 also adds function-like macro support to the c:macro::
+directive, which Sphinx-1.x and Sphinx-2.x do not support, but it
+is probably a good idea to keep compatibility with slightly older
+Sphinx for now.
+
+diff --git a/CHANGES b/CHANGES
+index a374a86..256fde1 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -8,7 +8,7 @@ Released 2020-05-07
+   - Include `jansson_version_str()` and `jansson_version_cmp()` in
+     shared library. (#534)
+ 
+-  - Include `scripts/` in tarball. (#535)
++  - Include ``scripts/`` in tarball. (#535)
+ 
+ 
+ Version 2.13
+@@ -127,7 +127,7 @@ Released 2018-02-09
+ 
+   - Work around gcc's -Wimplicit-fallthrough.
+ 
+-  - Fix CMake detection of `sys/types.h` header (#375).
++  - Fix CMake detection of ``sys/types.h`` header (#375).
+ 
+   - Fix `jansson.pc` generated by CMake to be more consistent with the one
+     generated using GNU Autotools (#368).
+diff --git a/doc/apiref.rst b/doc/apiref.rst
+index c3a814f..94c5726 100644
+--- a/doc/apiref.rst
++++ b/doc/apiref.rst
+@@ -145,33 +145,33 @@ Type
+ .. function:: int json_typeof(const json_t *json)
+ 
+    Return the type of the JSON value (a :type:`json_type` cast to
+-   :type:`int`). *json* MUST NOT be *NULL*. This function is actually
++   ``int``). *json* MUST NOT be *NULL*. This function is actually
+    implemented as a macro for speed.
+ 
+-.. function:: json_is_object(const json_t *json)
+-               json_is_array(const json_t *json)
+-               json_is_string(const json_t *json)
+-               json_is_integer(const json_t *json)
+-               json_is_real(const json_t *json)
+-               json_is_true(const json_t *json)
+-               json_is_false(const json_t *json)
+-               json_is_null(const json_t *json)
++.. function:: int json_is_object(const json_t *json)
++              int json_is_array(const json_t *json)
++              int json_is_string(const json_t *json)
++              int json_is_integer(const json_t *json)
++              int json_is_real(const json_t *json)
++              int json_is_true(const json_t *json)
++              int json_is_false(const json_t *json)
++              int json_is_null(const json_t *json)
+ 
+    These functions (actually macros) return true (non-zero) for values
+    of the given type, and false (zero) for values of other types and
+    for *NULL*.
+ 
+-.. function:: json_is_number(const json_t *json)
++.. function:: int json_is_number(const json_t *json)
+ 
+    Returns true for values of types ``JSON_INTEGER`` and
+    ``JSON_REAL``, and false for other types and for *NULL*.
+ 
+-.. function:: json_is_boolean(const json_t *json)
++.. function:: int json_is_boolean(const json_t *json)
+ 
+    Returns true for types ``JSON_TRUE`` and ``JSON_FALSE``, and false
+    for values of other types and for *NULL*.
+ 
+-.. function:: json_boolean_value(const json_t *json)
++.. function:: int json_boolean_value(const json_t *json)
+ 
+    Alias of :func:`json_is_true()`, i.e. returns 1 for ``JSON_TRUE``
+    and 0 otherwise.
+@@ -594,7 +594,7 @@ A JSON array is an ordered collection of other JSON values.
+    Appends all elements in *other_array* to the end of *array*.
+    Returns 0 on success and -1 on error.
+ 
+-.. function:: json_array_foreach(array, index, value)
++.. function:: void json_array_foreach(array, index, value)
+ 
+    Iterate over every element of ``array``, running the block
+    of code that follows each time with the proper values set to
+@@ -732,11 +732,11 @@ allowed in object keys.
+    recursively merged with the corresponding values in *object* if they are also
+    objects, instead of overwriting them. Returns 0 on success or -1 on error.
+ 
+-.. function:: json_object_foreach(object, key, value)
++.. function:: void json_object_foreach(object, key, value)
+ 
+    Iterate over every key-value pair of ``object``, running the block
+    of code that follows each time with the proper values set to
+-   variables ``key`` and ``value``, of types :type:`const char *` and
++   variables ``key`` and ``value``, of types ``const char *`` and
+    :type:`json_t *` respectively. Example::
+ 
+        /* obj is a JSON object */
+@@ -764,7 +764,7 @@ allowed in object keys.
+    .. versionadded:: 2.3
+ 
+ 
+-.. function:: json_object_foreach_safe(object, tmp, key, value)
++.. function:: void json_object_foreach_safe(object, tmp, key, value)
+ 
+    Like :func:`json_object_foreach()`, but it's safe to call
+    ``json_object_del(object, key)`` during iteration. You need to pass
+@@ -1488,17 +1488,17 @@ arguments.
+     Output a JSON null value. No argument is consumed.
+ 
+ ``b`` (boolean) [int]
+-    Convert a C :type:`int` to JSON boolean value. Zero is converted
++    Convert a C ``int`` to JSON boolean value. Zero is converted
+     to ``false`` and non-zero to ``true``.
+ 
+ ``i`` (integer) [int]
+-    Convert a C :type:`int` to JSON integer.
++    Convert a C ``int`` to JSON integer.
+ 
+ ``I`` (integer) [json_int_t]
+     Convert a C :type:`json_int_t` to JSON integer.
+ 
+ ``f`` (real) [double]
+-    Convert a C :type:`double` to JSON real.
++    Convert a C ``double`` to JSON real.
+ 
+ ``o`` (any value) [json_t \*]
+     Output any given JSON value as-is. If the value is added to an
+@@ -1625,20 +1625,20 @@ type whose address should be passed.
+     Expect a JSON null value. Nothing is extracted.
+ 
+ ``b`` (boolean) [int]
+-    Convert a JSON boolean value to a C :type:`int`, so that ``true``
++    Convert a JSON boolean value to a C ``int``, so that ``true``
+     is converted to 1 and ``false`` to 0.
+ 
+ ``i`` (integer) [int]
+-    Convert a JSON integer to C :type:`int`.
++    Convert a JSON integer to C ``int``.
+ 
+ ``I`` (integer) [json_int_t]
+     Convert a JSON integer to C :type:`json_int_t`.
+ 
+ ``f`` (real) [double]
+-    Convert a JSON real to C :type:`double`.
++    Convert a JSON real to C ``double``.
+ 
+ ``F`` (integer or real) [double]
+-    Convert a JSON number (integer or real) to C :type:`double`.
++    Convert a JSON number (integer or real) to C ``double``.
+ 
+ ``o`` (any value) [json_t \*]
+     Store a JSON value with no conversion to a :type:`json_t` pointer.
+diff --git a/doc/ext/refcounting.py b/doc/ext/refcounting.py
+index bba2684..e72c481 100644
+--- a/doc/ext/refcounting.py
++++ b/doc/ext/refcounting.py
+@@ -24,8 +24,8 @@
+ """
+ 
+ from docutils import nodes
++from docutils.parsers.rst import Directive
+ 
+-class refcounting(nodes.emphasis): pass
+ 
+ def visit(self, node):
+     self.visit_emphasis(node)
+@@ -40,16 +40,25 @@ def html_depart(self, node):
+     self.body.append('</em>')
+ 
+ 
+-def refcounting_directive(name, arguments, options, content, lineno,
+-                   content_offset, block_text, state, state_machine):
+-    if arguments[0] == 'borrow':
+-        text = 'Return value: Borrowed reference.'
+-    elif arguments[0] == 'new':
+-        text = 'Return value: New reference.'
+-    else:
+-        raise Error('Valid arguments: new, borrow')
++class refcounting(nodes.emphasis):
++    pass
++
++class refcounting_directive(Directive):
++    has_content = False
++    required_arguments = 1
++    optional_arguments = 0
++    final_argument_whitespace = False
++
++    def run(self):
++        if self.arguments[0] == 'borrow':
++            text = 'Return value: Borrowed reference.'
++        elif self.arguments[0] == 'new':
++            text = 'Return value: New reference.'
++        else:
++            raise Error('Valid arguments: new, borrow')
++
++        return [refcounting(text, text)]
+ 
+-    return [refcounting(text, text)]
+ 
+ def setup(app):
+     app.add_node(refcounting,
+@@ -57,4 +66,4 @@ def setup(app):
+                  latex=(visit, depart),
+                  text=(visit, depart),
+                  man=(visit, depart))
+-    app.add_directive('refcounting', refcounting_directive, 0, (1, 0, 0))
++    app.add_directive('refcounting', refcounting_directive)
+diff --git a/doc/upgrading.rst b/doc/upgrading.rst
+index 9b49046..94ff7de 100644
+--- a/doc/upgrading.rst
++++ b/doc/upgrading.rst
+@@ -47,13 +47,13 @@ List of Incompatible Changes
+ 
+ **Underlying type of JSON integers**
+     The underlying C type of JSON integers has been changed from
+-    :type:`int` to the widest available signed integer type, i.e.
+-    :type:`long long` or :type:`long`, depending on whether
+-    :type:`long long` is supported on your system or not. This makes
++    ``int`` to the widest available signed integer type, i.e.
++    ``long long`` or ``long``, depending on whether
++    ``long long`` is supported on your system or not. This makes
+     the whole 64-bit integer range available on most modern systems.
+ 
+     ``jansson.h`` has a typedef :type:`json_int_t` to the underlying
+-    integer type. :type:`int` should still be used in most cases when
++    integer type. ``int`` should still be used in most cases when
+     dealing with smallish JSON integers, as the compiler handles
+     implicit type coercion. Only when the full 64-bit range is needed,
+     :type:`json_int_t` should be explicitly used.
+@@ -69,8 +69,8 @@ List of Incompatible Changes
+ 
+ **Unsigned integers in API functions**
+     Version 2.0 unifies unsigned integer usage in the API. All uses of
+-    :type:`unsigned int` and :type:`unsigned long` have been replaced
+-    with :type:`size_t`. This includes flags, container sizes, etc.
++    ``unsigned int`` and ``unsigned long`` have been replaced
++    with ``size_t``. This includes flags, container sizes, etc.
+     This should not require source code changes, as both
+-    :type:`unsigned int` and :type:`unsigned long` are usually
+-    compatible with :type:`size_t`.
++    ``unsigned int`` and ``unsigned long`` are usually
++    compatible with ``size_t``.
diff --git a/dev-libs/jansson/jansson-2.13.1-r1.ebuild b/dev-libs/jansson/jansson-2.13.1-r1.ebuild
new file mode 100644
index 000000000000..1f926f3cbf18
--- /dev/null
+++ b/dev-libs/jansson/jansson-2.13.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
+HOMEPAGE="https://www.digip.org/jansson/"
+SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+IUSE="doc static-libs"
+
+BDEPEND="doc? ( dev-python/sphinx )"
+
+PATCHES=(
+	# dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
+	"${FILESDIR}/${P}-sphinx3.patch"
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake html
+		HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. )
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/klibc/klibc-2.0.4-r3.ebuild b/dev-libs/klibc/klibc-2.0.4-r3.ebuild
index 76a79fe5f515..0063e8cd74bb 100644
--- a/dev-libs/klibc/klibc-2.0.4-r3.ebuild
+++ b/dev-libs/klibc/klibc-2.0.4-r3.ebuild
@@ -21,7 +21,7 @@ inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="A minimal libc subset for use with initramfs"
 HOMEPAGE="https://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/"
-KV_MAJOR="4" KV_MINOR="x" KV_SUB="4"
+KV_MAJOR="4" KV_MINOR="x" KV_SUB="14"
 PKV_EXTRA=""
 if [[ ${PKV_EXTRA} ]]; then
 	if [[ ${KV_MAJOR} == 2 ]]; then
@@ -49,19 +49,21 @@ SRC_URI="
 	${KERNEL_URI}"
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~alpha amd64 ~arm ia64 -mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="debug test custom-cflags"
 
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	sys-devel/bc"
 
 KS="${WORKDIR}/linux-${OKV}"
 
 # Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
 QA_EXECSTACK="*"
 # Do not strip
-RESTRICT="strip"
+RESTRICT="strip
+	!test? ( test )"
 
 kernel_asm_arch() {
 	a="${1:${ARCH}}"
@@ -94,23 +96,23 @@ src_unpack() {
 }
 
 PATCHES=(
-# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-"${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-# Fix usage of -s, bug #201006
-"${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-# The inline definition from sys/stat.h does not seem to get used
-# So just copy it to make this compile for now
-"${FILESDIR}"/klibc-2.0.2-mkfifo.patch
-# Newer kernels have some headers in the uapi dir
-"${FILESDIR}"/klibc-2.0.3-kernel-uapi.patch
+	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
+	"${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
+	# Fix usage of -s, bug #201006
+	"${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
+	# The inline definition from sys/stat.h does not seem to get used
+	# So just copy it to make this compile for now
+	"${FILESDIR}"/klibc-2.0.2-mkfifo.patch
+	# Newer kernels have some headers in the uapi dir
+	"${FILESDIR}"/klibc-2.0.3-kernel-uapi.patch
 )
 
 src_prepare() {
-[[ ${PKV} ]] && eapply "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX}
+	[[ ${PKV} ]] && eapply "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX}
 
-# Symlink /usr/src/linux to ${S}/linux
-ln -snf "${KS}" linux
-#ln -snf "/usr" linux
+	# Symlink /usr/src/linux to ${S}/linux
+	ln -snf "${KS}" linux
+	#ln -snf "/usr" linux
 
 # Borrow the debian fixes too
 for p in $(<"${WORKDIR}"/debian/patches/series) ; do
@@ -127,133 +129,135 @@ default
 # This functions maps from a Gentoo ARCH, to an arch that klibc expects
 # Look at klibc-${S}/usr/klibc/arch for a list of these arches
 klibc_arch() {
-a="${1:${ARCH}}"
-case ${a} in
-	amd64) echo x86_64;;
-	mips) die 'TODO: Use the $ABI' ;;
-	x86) echo i386;;
-	*) echo ${a} ;;
-esac
+	a="${1:${ARCH}}"
+	case ${a} in
+		amd64) echo x86_64;;
+		mips) die 'TODO: Use the $ABI' ;;
+		x86) echo i386;;
+		*) echo ${a} ;;
+	esac
 }
 
 src_compile() {
-local myargs="all"
-local myARCH="${ARCH}" myABI="${ABI}"
-# TODO: For cross-compiling
-# You should set ARCH and ABI here
-CC="$(tc-getCC)"
-LD="$(tc-getLD)"
-HOSTCC="$(tc-getBUILD_CC)"
-HOSTLD="$(tc-getBUILD_LD)"
-KLIBCARCH="$(klibc_arch ${ARCH})"
-KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-libdir="$(get_libdir)"
-# This should be the defconfig corresponding to your userspace!
-# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-defconfig=$(kernel_defconfig ${ARCH})
-unset ABI ARCH # Unset these, because they interfere
-unset KBUILD_OUTPUT # we are using a private copy
+	local myargs="all"
+	local myARCH="${ARCH}" myABI="${ABI}"
+	# TODO: For cross-compiling
+	# You should set ARCH and ABI here
+	CC="$(tc-getCC)"
+	LD="$(tc-getLD)"
+	HOSTCC="$(tc-getBUILD_CC)"
+	HOSTLD="$(tc-getBUILD_LD)"
+	KLIBCARCH="$(klibc_arch ${ARCH})"
+	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
+	libdir="$(get_libdir)"
+	# This should be the defconfig corresponding to your userspace!
+	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
+	defconfig=$(kernel_defconfig ${ARCH})
+	unset ABI ARCH # Unset these, because they interfere
+	unset KBUILD_OUTPUT # we are using a private copy
 
-cd "${KS}"
-emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "No defconfig"
-if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
-   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
-	# The delete and insert are seperate statements
-	# so that they are reliably used.
-	sed -i \
-	-e '/CONFIG_AEABI/d' \
-	-e '1iCONFIG_AEABI=y' \
-	-e '/CONFIG_OABI_COMPAT/d' \
-	-e '1iCONFIG_OABI_COMPAT=y' \
-	-e '1iCONFIG_ARM_UNWIND=y' \
-	"${KS}"/.config \
-	"${S}"/defconfig
-fi
-emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "Failed to prepare kernel sources for header usage"
+	cd "${KS}"
+	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "No defconfig"
+	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
+	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
+		# The delete and insert are seperate statements
+		# so that they are reliably used.
+		sed -i \
+		-e '/CONFIG_AEABI/d' \
+		-e '1iCONFIG_AEABI=y' \
+		-e '/CONFIG_OABI_COMPAT/d' \
+		-e '1iCONFIG_OABI_COMPAT=y' \
+		-e '1iCONFIG_ARM_UNWIND=y' \
+		"${KS}"/.config \
+		"${S}"/defconfig
+	fi
+	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "Failed to prepare kernel sources for header usage"
+
+	cd "${S}"
 
-cd "${S}"
+	use debug && myargs="${myargs} V=1"
+	use test && myargs="${myargs} test"
+	append-ldflags -z noexecstack
+	append-flags -nostdlib
+	append-flags -fno-pie
 
-use debug && myargs="${myargs} V=1"
-use test && myargs="${myargs} test"
-append-ldflags -z noexecstack
-append-flags -nostdlib
-append-flags -fno-pie
-emake \
-	EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-	EXTRA_KLIBCLDFLAGS="-z noexecstack" \
-	HOSTLDFLAGS="-z noexecstack" \
-	KLIBCOPTFLAGS='-nostdlib' \
-	HOSTCC="${HOSTCC}" CC="${CC}" \
-	HOSTLD="${HOSTLD}" LD="${LD}" \
-	INSTALLDIR="/usr/${libdir}/klibc" \
-	KLIBCARCH=${KLIBCARCH} \
-	KLIBCASMARCH=${KLIBCASMARCH} \
-	SHLIBDIR="/${libdir}" \
-	libdir="/usr/${libdir}" \
-	mandir="/usr/share/man" \
-	T="${T}" \
-	$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
-	$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
-	$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
-	${myargs} || die "Compile failed!"
+	# Parallel build intermittantly fails when doing `LIST usr/klibc/syscalls/klib.list'
+	emake -j1 \
+		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
+		HOSTLDFLAGS="-z noexecstack" \
+		KLIBCOPTFLAGS='-nostdlib' \
+		HOSTCC="${HOSTCC}" CC="${CC}" \
+		HOSTLD="${HOSTLD}" LD="${LD}" \
+		INSTALLDIR="/usr/${libdir}/klibc" \
+		KLIBCARCH=${KLIBCARCH} \
+		KLIBCASMARCH=${KLIBCASMARCH} \
+		SHLIBDIR="/${libdir}" \
+		libdir="/usr/${libdir}" \
+		mandir="/usr/share/man" \
+		T="${T}" \
+		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
+		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
+		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
+		${myargs} || die "Compile failed!"
 
-	#SHLIBDIR="/${libdir}" \
+		#SHLIBDIR="/${libdir}" \
 
-ARCH="${myARCH}" ABI="${myABI}"
+	ARCH="${myARCH}" ABI="${myABI}"
 }
 
 src_install() {
-local myargs
-local myARCH="${ARCH}" myABI="${ABI}"
-# TODO: For cross-compiling
-# You should set ARCH and ABI here
-CC="$(tc-getCC)"
-HOSTCC="$(tc-getBUILD_CC)"
-KLIBCARCH="$(klibc_arch ${ARCH})"
-KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-libdir="$(get_libdir)"
-# This should be the defconfig corresponding to your userspace!
-# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-defconfig=$(kernel_defconfig ${ARCH})
+	local myargs
+	local myARCH="${ARCH}" myABI="${ABI}"
+	# TODO: For cross-compiling
+	# You should set ARCH and ABI here
+	CC="$(tc-getCC)"
+	HOSTCC="$(tc-getBUILD_CC)"
+	KLIBCARCH="$(klibc_arch ${ARCH})"
+	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
+	libdir="$(get_libdir)"
+	# This should be the defconfig corresponding to your userspace!
+	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
+	defconfig=$(kernel_defconfig ${ARCH})
 
-use debug && myargs="${myargs} V=1"
+	use debug && myargs="${myargs} V=1"
 
-local klibc_prefix
-if tc-is-cross-compiler ; then
-	klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-else
-	klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-fi
+	local klibc_prefix
+	if tc-is-cross-compiler ; then
+		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
+	else
+		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
+	fi
 
-unset ABI ARCH # Unset these, because they interfere
-unset KBUILD_OUTPUT # we are using a private copy
+	unset ABI ARCH # Unset these, because they interfere
+	unset KBUILD_OUTPUT # we are using a private copy
 
-emake \
-	EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-	EXTRA_KLIBCLDFLAGS="-z noexecstack" \
-	HOSTLDFLAGS="-z noexecstack" \
-	KLIBCOPTFLAGS='-nostdlib' \
-	HOSTCC="${HOSTCC}" CC="${CC}" \
-	HOSTLD="${HOSTLD}" LD="${LD}" \
-	INSTALLDIR="/usr/${libdir}/klibc" \
-	INSTALLROOT="${D}" \
-	KLIBCARCH=${KLIBCARCH} \
-	KLIBCASMARCH=${KLIBCASMARCH} \
-	SHLIBDIR="/${libdir}" \
-	libdir="/usr/${libdir}" \
-	mandir="/usr/share/man" \
-	T="${T}" \
-	$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
-	$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
-	$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
-	${myargs} \
-	install || die "Install failed!"
+	emake \
+		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
+		HOSTLDFLAGS="-z noexecstack" \
+		KLIBCOPTFLAGS='-nostdlib' \
+		HOSTCC="${HOSTCC}" CC="${CC}" \
+		HOSTLD="${HOSTLD}" LD="${LD}" \
+		INSTALLDIR="/usr/${libdir}/klibc" \
+		INSTALLROOT="${D}" \
+		KLIBCARCH=${KLIBCARCH} \
+		KLIBCASMARCH=${KLIBCASMARCH} \
+		SHLIBDIR="/${libdir}" \
+		libdir="/usr/${libdir}" \
+		mandir="/usr/share/man" \
+		T="${T}" \
+		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
+		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
+		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
+		${myargs} \
+		install || die "Install failed!"
 
-	#SHLIBDIR="/${libdir}" \
+		#SHLIBDIR="/${libdir}" \
 
-# klibc doesn't support prelinking, so we need to mask it
-cat > "${T}/70klibc" <<-EOF
-	PRELINK_PATH_MASK="/usr/${libdir}/klibc"
+	# klibc doesn't support prelinking, so we need to mask it
+	cat > "${T}/70klibc" <<-EOF
+		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
 	EOF
 
 	doenvd "${T}"/70klibc
diff --git a/dev-libs/libconfig/libconfig-1.7.2.ebuild b/dev-libs/libconfig/libconfig-1.7.2.ebuild
index 3c60a7c94fbd..225468fb0c9c 100644
--- a/dev-libs/libconfig/libconfig-1.7.2.ebuild
+++ b/dev-libs/libconfig/libconfig-1.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
 IUSE="+cxx static-libs"
 
 DEPEND="
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index f88b142b6ae9..0b2dd87dbdf4 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,3 +1,3 @@
 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.99.13.tar.xz 913688 BLAKE2B 31cbe158193c8c76aa46e020fac6a1be7758d92ac164f24803b64ed6f9f61a4a693fb350fa2d0c76a8ee3eca1ff7a762f9fe2384fbf60259ad87169f7e2f398e SHA512 a394914618cfb19b8a2da91212b0d9ce7509a2065ef9d956775b82a428f0ebcfe0bd1917cb337c1ad0ec729405d1ae366d22c63bfcae136da32e298394ea9d3d
+DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
diff --git a/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch b/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch
deleted file mode 100644
index 2c9a62a6b069..000000000000
--- a/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -1480,6 +1480,7 @@
-   --enable-benchmark=yes|no
- 
- 
-+
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-@@ -17799,8 +17800,7 @@
- 
- # Check whether --enable-benchmark was given.
- if test "${enable_benchmark+set}" = set; then :
--  enableval=$enable_benchmark; enable_benchmark=yes
--
-+  enableval=$enable_benchmark;
- fi
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
index 3b6f454bf43c..343cc0cc0674 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
@@ -1,3 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,11 +8,12 @@ GNOME_TARBALL_SUFFIX="bz2"
 inherit autotools gnome2 eutils
 
 DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://sourceforge.net/projects/libsigc/"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="1.2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/m4"
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
index 6ccf62b4d309..ae83beb1b896 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
@@ -1,14 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit gnome2 flag-o-matic multilib-minimal
 
 DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://sourceforge.net/projects/libsigc/"
+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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigc++/libsigc++-2.99.13.ebuild b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
index cb1570093fd4..594c6195e8b8 100644
--- a/dev-libs/libsigc++/libsigc++-2.99.13.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
@@ -1,24 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
+EAPI=6
 inherit gnome2 flag-o-matic multilib-minimal
 
 DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://sourceforge.net/projects/libsigc/"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
 
 LICENSE="LGPL-2.1+"
-SLOT="3/0"
-KEYWORDS=""
-
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
-
 RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="sys-devel/m4
 	doc? ( app-doc/doxygen )
-	test? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )"
+	test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
 # Needs mm-common for eautoreconf
 
 src_prepare() {
@@ -55,4 +54,3 @@ multilib_src_install_all() {
 	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
 	use doc && dodoc -r examples
 }
-
diff --git a/dev-libs/libsigc++/metadata.xml b/dev-libs/libsigc++/metadata.xml
index b2c33d30b474..dffb0841826e 100644
--- a/dev-libs/libsigc++/metadata.xml
+++ b/dev-libs/libsigc++/metadata.xml
@@ -8,5 +8,5 @@
 	<upstream>
 		<remote-id type="sourceforge">libsigc</remote-id>
 	</upstream>
-	<origin>kit-fixups</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-libs/libusb/libusb-1.0.24.ebuild b/dev-libs/libusb/libusb-1.0.24.ebuild
index f7e9ec91ac72..167ef4b659da 100644
--- a/dev-libs/libusb/libusb-1.0.24.ebuild
+++ b/dev-libs/libusb/libusb-1.0.24.ebuild
@@ -33,7 +33,7 @@ multilib_src_compile() {
 	emake
 
 	if multilib_is_native_abi; then
-		use doc && emake -C doc docs
+		use doc && emake -C doc
 	fi
 }
 
@@ -50,7 +50,7 @@ multilib_src_install() {
 	if multilib_is_native_abi; then
 		gen_usr_ldscript -a usb-1.0
 
-		use doc && dodoc -r doc/html
+		use doc && dodoc -r doc/api-1.0
 	fi
 }
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index a4e3450e711a..49b73ef3c565 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -6,3 +6,5 @@ DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e96248
 DIST openssl-1.1.1e-bindist-1.0.tar.xz 16948 BLAKE2B 78e034f1d263cbf5e57c92393f72acd07e86e39a5511a8852bad151371430954e07d787fd82cca55b373d1579bb22b9d29c9d677104ed68291a9d2dffe3ffbbb SHA512 0dbfb378b8f2724db82915e17fd4e43977e3e45030db25cdb9241c0ab842e41ef3d597ef71c4db5103635752dc2059ea6022597511a440f55fb56a5a52d3ccea
 DIST openssl-1.1.1g.tar.gz 9801502 BLAKE2B 5e3dd4725ff89b959a5436d64b521317c6ffeb377418cc24c6d1927fab923423cb5f5fce2f9c2cdee597041c7be156d09668a5fd13dc6ff06d235a83db94cf19 SHA512 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
 DIST openssl-1.1.1h.tar.gz 9810045 BLAKE2B ac9ba6fb0c4da0a761e8655b6907634365ddb114216acfcfc981e13c211577b6bd23ea8d2ad0999c0960b039f5d3dead5733e6dc07c5231ab953307a9015cd36 SHA512 da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a
+DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
+DIST openssl-1.1.1i.tar.gz 9808346 BLAKE2B ca98bab08e1874134da113dd0bda0583c133c7dce5b739f9601641ed2cf97894e5e13d901f0db9367aa5d7b78c552ac598aa0a3c2a3f0a438daae044e29f58d6 SHA512 fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index 7c275bc836ba..4b65026f151e 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -23,5 +23,5 @@
   and libssl.so.0.9.8 only.</slot>
  <subslots>Reflect ABI of libcrypto.so and libssl.so.</subslots>
 </slots>
-	<origin>kit-fixups</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild
index 5e9a751f9b6a..ab6d946a8b33 100644
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u.ebuild
@@ -1,3 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/dev-libs/openssl/openssl-1.1.0l.ebuild b/dev-libs/openssl/openssl-1.1.0l.ebuild
index 91d5f3f2882b..7e8ec91525ca 100644
--- a/dev-libs/openssl/openssl-1.1.0l.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0l.ebuild
@@ -1,3 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/dev-libs/openssl/openssl-1.1.1g.ebuild b/dev-libs/openssl/openssl-1.1.1g.ebuild
index 73af1344bc79..7a3f675be54a 100644
--- a/dev-libs/openssl/openssl-1.1.1g.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1g.ebuild
@@ -1,3 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/dev-libs/openssl/openssl-1.1.1h.ebuild b/dev-libs/openssl/openssl-1.1.1h.ebuild
index 52d542a28825..ccc0cbc5d585 100644
--- a/dev-libs/openssl/openssl-1.1.1h.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1h.ebuild
@@ -1,3 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/dev-libs/openssl/openssl-1.1.1i.ebuild b/dev-libs/openssl/openssl-1.1.1i.ebuild
new file mode 100644
index 000000000000..77fb15f30271
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1i.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+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"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist sm2) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/pugixml/files/pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch b/dev-libs/pugixml/files/pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch
deleted file mode 100644
index 18928e39cd6f..000000000000
--- a/dev-libs/pugixml/files/pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c12889f7ccee3a91754f12a4f5b2bf5eb87acabd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
-Date: Wed, 27 Jun 2018 00:53:42 +0200
-Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for pugixml.pc (#215)
-
-- Up to now, the libdir was hardcoded to "lib" inside pugixml.pc and
-  the install directory of pugixml.pc was "lib/pkgconfig"
-- Adds support for lib and lib64 by using CMAKE_INSTALL_LIBDIR variable
----
- CMakeLists.txt        | 2 +-
- scripts/pugixml.pc.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 148f7b0d..d322a631 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,7 @@ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX
- install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
- 
- configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
--install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-+install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
- if(BUILD_TESTS)
- 	file(GLOB TEST_SOURCES tests/*.cpp)
-diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
-index 04b4d3b0..fbb7f8b8 100644
---- a/scripts/pugixml.pc.in
-+++ b/scripts/pugixml.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
- includedir=${prefix}/include@INSTALL_SUFFIX@
--libdir=${exec_prefix}/lib@INSTALL_SUFFIX@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@@INSTALL_SUFFIX@
- 
- Name: pugixml
- Description: Light-weight, simple and fast XML parser for C++ with XPath support.
diff --git a/dev-libs/pugixml/files/pugixml-1.9-always-install-the-pkg-config-file.patch b/dev-libs/pugixml/files/pugixml-1.9-always-install-the-pkg-config-file.patch
deleted file mode 100644
index 4551280b3728..000000000000
--- a/dev-libs/pugixml/files/pugixml-1.9-always-install-the-pkg-config-file.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From daeb8013b20f9c47e85730faaa4131064a1f9c2e Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Mon, 9 Apr 2018 13:48:53 -0400
-Subject: [PATCH] cmake: always install the pkg-config file (#193)
-
-There's really never a reason to *not* want this installed. If an option
-is needed to specify installing in a versioned subdirectory, this option
-should be explicitly described rather than hidden in something else.
-
-As an added bonus, this makes the CMake install code slightly *less*
-complicated.
----
- CMakeLists.txt        | 10 ++++------
- scripts/pugixml.pc.in |  6 +++---
- 2 files changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90fa6793..d7bc1b20 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ project(pugixml)
- 
- option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
- option(BUILD_TESTS "Build tests" OFF)
--option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF)
-+option(USE_VERSIONED_LIBDIR "Use a private subdirectory to install the headers and libs" OFF)
- 
- set(BUILD_DEFINES "" CACHE STRING "Build defines")
- 
-@@ -55,7 +55,7 @@ endif()
- set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1)
- get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
- 
--if(BUILD_PKGCONFIG)
-+if(USE_VERSIONED_LIBDIR)
- 	# Install library into its own directory under LIBDIR
- 	set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
- endif()
-@@ -71,10 +71,8 @@ install(TARGETS pugixml EXPORT pugixml-config
- install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
- install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
- 
--if(BUILD_PKGCONFIG)
--	configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
--	install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
--endif()
-+configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
-+install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
- 
- if(BUILD_TESTS)
- 	file(GLOB TEST_SOURCES tests/*.cpp)
-diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
-index 3c97c28d..804c4d38 100644
---- a/scripts/pugixml.pc.in
-+++ b/scripts/pugixml.pc.in
-@@ -1,11 +1,11 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--includedir=${prefix}/include/pugixml-@PUGIXML_VERSION_STRING@
--libdir=${exec_prefix}/lib/pugixml-@PUGIXML_VERSION_STRING@
-+includedir=${prefix}/include@INSTALL_SUFFIX@
-+libdir=${exec_prefix}/lib@INSTALL_SUFFIX@
- 
- Name: pugixml
- Description: Light-weight, simple and fast XML parser for C++ with XPath support.
- URL: http://pugixml.org/
- Version: @PUGIXML_VERSION_STRING@
- Cflags: -I${includedir}
--Libs: -L${libdir} -lpugixml
-\ No newline at end of file
-+Libs: -L${libdir} -lpugixml
diff --git a/dev-libs/pugixml/files/pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch b/dev-libs/pugixml/files/pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch
deleted file mode 100644
index 7a9b0c139cd2..000000000000
--- a/dev-libs/pugixml/files/pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b3db08ffccb78d680d8f7665ad9ed4cff6f92fcf Mon Sep 17 00:00:00 2001
-From: Millian Poquet <millian.poquet@inria.fr>
-Date: Mon, 10 Dec 2018 18:54:40 +0100
-Subject: [PATCH] pkg-config: Use CMake GnuInstallDirs FULL vars
-
-Fixes an installation problem in Nix packages, as non-FULL variables are
-already absolute paths in this case.
----
- CMakeLists.txt        | 2 +-
- scripts/pugixml.pc.in | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ddc5a5ad..e8c4f592 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,7 @@ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX
- install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
- 
- configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
--install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
- 
- if(BUILD_TESTS)
- 	file(GLOB TEST_SOURCES tests/*.cpp)
-diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
-index a1678272..f9c3fd45 100644
---- a/scripts/pugixml.pc.in
-+++ b/scripts/pugixml.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--includedir=${prefix}/include@INSTALL_SUFFIX@
--libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@@INSTALL_SUFFIX@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@@INSTALL_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@@INSTALL_SUFFIX@
- 
- Name: pugixml
- Description: Light-weight, simple and fast XML parser for C++ with XPath support.
diff --git a/dev-libs/s2n/Manifest b/dev-libs/s2n/Manifest
new file mode 100644
index 000000000000..5886f4cb2415
--- /dev/null
+++ b/dev-libs/s2n/Manifest
@@ -0,0 +1 @@
+DIST s2n-0.10.21.tar.gz 6150129 BLAKE2B cf598ef02b4aa9a2a69f11a47b2a691055575b7398ba0a833081da704ebc7564d30abda5f2ad9ff9858ec2f553b1f332e913494b9e195e2a754f008bab5c11d2 SHA512 26957edf36af088af2cb355dad9281fefd9d54ce8c3c2c26f5682aee8d64338a3677aa81f3a07563b27a938cad2c57e0a86a478c9619cc93552674451d501909
diff --git a/dev-libs/s2n/metadata.xml b/dev-libs/s2n/metadata.xml
new file mode 100644
index 000000000000..239483623775
--- /dev/null
+++ b/dev-libs/s2n/metadata.xml
@@ -0,0 +1,29 @@
+<?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>
+	<longdescription>
+s2n is a C99 implementation of the TLS/SSL protocols that is designed to be simple, small, fast, and with security as a
+priority. It is released and licensed under the Apache License 2.0.
+
+The s2n I/O APIs are designed to be intuitive to developers familiar with the widely-used POSIX I/O APIs, and s2n
+supports blocking, non-blocking, and full-duplex I/O. Additionally there are no locks or mutexes within s2n.
+
+s2n implements SSLv3, TLS1.0, TLS1.1, and TLS1.2. For encryption, s2n supports 128-bit and 256-bit AES, in the CBC and
+GCM modes, ChaCha20, 3DES, and RC4. For forward secrecy, s2n supports both DHE and ECDHE. s2n also supports the Server
+Name Indicator (SNI), Application-Layer Protocol Negotiation (ALPN) and the Online Certificate Status Protocol (OCSP)
+TLS extensions. SSLv3, RC4, 3DES and DHE are each disabled by default for security reasons.
+
+As it can be difficult to keep track of which encryption algorithms and protocols are best to use, s2n features a
+simple API to use the latest "default" set of preferences. If you prefer to remain on a specific version for backwards
+compatibility, that is also supported.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-libs/s2n/s2n-0.10.21.ebuild b/dev-libs/s2n/s2n-0.10.21.ebuild
new file mode 100644
index 000000000000..225dc5144615
--- /dev/null
+++ b/dev-libs/s2n/s2n-0.10.21.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="simple, small, fast and secure C99 implementation of the TLS/SSL protocols"
+HOMEPAGE="https://github.com/awslabs/s2n"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[static-libs=] )
+	libressl? ( dev-libs/libressl:0=[static-libs=] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Fix
+	# QA Notice: The following files contain writable and executable sections (...)
+	sed \
+		-e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
+		-i "${S}"/pq-crypto/sike_r2/fp_x64_asm.S || die "sed failed"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
index 48c037627d8d..3555c1cf8789 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
index e213b1a3f94a..5e5756e95b7d 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -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 ~riscv ~s390 sparc x86 ~x64-macos ~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/zziplib/zziplib-0.13.71_p20201021.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
index b7fa9612498f..6d73a38e0bdf 100644
--- a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.t
 
 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="sdl static-libs"
 
 # Tests require internet access