gentoo resync : 16.09.2020

19 files changed, 618 insertions, 181 deletions

diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 06b9522c997a..5c743553dead 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1,3 +1,18 @@
-DIST aws-sdk-cpp-1.7.178.tar.gz 22589166 BLAKE2B 40364307fb676a89cf2b363d02dfa95e03c6e0b02e34c3d5376820dd7721f13108bf1f1713ff5f39dfc7d98f5cd368718601a397f55c4e26a37cd62d346cbf70 SHA512 b5c969d8b0b9ca5aa7b6af762bf79647ee407cae2686b90c4acefb6a113cf4e7a582e4e5aebd2e6289685e6ac373f9f994e57cd34bd12543b2b36142e00df478
-EBUILD aws-sdk-cpp-1.7.178.ebuild 6285 BLAKE2B 8971ad0a063b5a1113f1e15c80bf609d31d81760285e6c158de066bb242591bb3a59ff8cb51525c8d411b0c1a94ae2780aa7d384a56a187e267bd46beb3e8771 SHA512 23a3d8d16ea8d8ff3791e3fd81a52e92c1035432148a8a92c089c19c90f21423cb1064a6555aeaa9ff67c6c234f62a90989814d6c172a7b91d847f0e87c719f6
-MISC metadata.xml 19182 BLAKE2B 32ba87941d8d92149ecb65a8f37f11f032690e9819bd0098e287c9679fec754539d36de4545c4a63a4059b735e1f0fbcbbce75b99395efa6ef67dbdf2b98a103 SHA512 b87ce25db7e3f4b651e6861dff4582265dce1cb42f3bcbe9457b4f25eba5f79ef5c8037c1379c92bff49e9e363d310acfd8ed9b2799115b8333f7f1b2e3a11e5
+AUX aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch 256 BLAKE2B 66653717a66f51d8403367b8471eee9022045ce5340a232c0bce9cb47fd5ce1ab58e097155048ec54d2fbdd072ebd9c9eeb63f7c9a194445c8833cffc224fa84 SHA512 2af8fbf593cd2bbd7acbdb18f994f18b516abe58a4bb9ee215a72932ec62e463c33e04733bc9be6a60539e1ac8a3beaf4b0611cf0fca97fea1eddbcaa9315e53
+AUX aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch 787 BLAKE2B c7a7a0bf1de4041b64e5afa2073fb426659a82a64b10bfaba05ae1dffd8a4819e073692992c49ed66493569dc33ca736c4a27dac2da07d1235be48cffddca16f SHA512 d3246dbbbf8e7598053933d949a1c43b5c5929049eea12aae0ef00182594aba5dea9a5b3ea22bf795d9ecd2f4a6880bc815b83ed4532c0bc94a901894704e73c
+AUX aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch 194 BLAKE2B 7f6d935c5dff0ebb0701003e6daaba0d174cb90c3f39dd6da7dbab5ac5660b4d9685e5a00cfe7977ecbab5f6d27ebb8b3ed05b839a2322a56fb813dda72e02e5 SHA512 7754c2c0a418b8af82129eaea26cea102aa3e529d40d4cecdec2ae5bbf3b7c05ae0dade1d44efd550a8d068db671d15cafb17ced049c430c1589c1cdf8c0ed92
+AUX aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch 192 BLAKE2B 10515a1e1693ee6b9948d14fbf7fc32369f4bc3cb6be700fd7eaae7fa910610d1c15fc9ef87318a6dc0e46c2a0205af759a56780c28f71c830627aa62a2588b3 SHA512 73ecd702f3c48ab28584dfeecdc75939a5bb7cad981145e75200f09c85ba7acd19a59f010f6952849385da9a0cd9f321907f61f60984d7d3d43b5e817437d0e0
+AUX aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch 1189 BLAKE2B 06e22f18204f52e85ad711f34ee592fdb1e307031fda5200890326b1ea53c2063cb9bf41f28958cce5a9882560ade1d8991e87d7bb01728ca538263ece289494 SHA512 138e71ca235d92ef0495b9442d32f622c2863f5c121064cc88b43caf422cadc32fa400d0b269f04cbba3c60b99da1fb0e218632c109a846610710f743f3eeb63
+AUX aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch 703 BLAKE2B 0e279260d96518f2bc37d2864f927db028e72b1053d382d13dfec92832e0a77ac406267b68ee7bda46d229bc0343d842dddb54ccd737f6270fd66f02d35c1d17 SHA512 27e3d293dab3663f2086cbc0c5d5f1396a6fea67762573c35bfee839f843f80fe1664a77ff7122bf79494710daf74ee2f9eef85d8c147b94c7642762c617482e
+AUX aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch 904 BLAKE2B 295c0c15811b6d2fbcb3ea450bc81160deed1812d2a41d8df4e831037c0084a083c3fa59132bd419c6d63798a53527493d8c3617452b9eed453a81d255ec45ba SHA512 5b3e062abec35fff84a651c71844c0d9ea2a4762f286114d968f2034998a18f72cd51bdd09cb70f5e3f2d51fd56feba2c79e04fe091ba55fd0d19822ee3ea3bb
+AUX aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch 3737 BLAKE2B b977ae06b5f4e2f8d2bcd4efc0e20ac003f5491d801a1a6da58758bf17ccbf107956cf1fb26fcfc03c3adccbc086e51e5bc36ff6ebda2166bce74f70bf544252 SHA512 342e65e170adef6b3dc5337fb2526cdf5d06bedd3bcadcc96860f4fd9aee6080b8f797c6694f605629de1b7d7b9e123169d843f2d6d27db35ba81cf30ab793e8
+AUX aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch 861 BLAKE2B e2853b580a3951bb2b611399162b7094fb1a9b72e965cab113737844d24cde45c32c690335829fca7cd5ee34b1aff77d370097a78891929eb9887964b954e9a8 SHA512 42b6711bcb02d36d741e3f9b79f249c6df28201ea5541814fea76b9e6bb54263a7437471591b5e081489d0d35892f70e2184a5c5c3eea5a286bbb5c3af27ac3a
+AUX aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch 777 BLAKE2B 7655be825103d59c0fece0f11c09b065baa7e4b4e15fcd50961b556aaffe91bb7e118ff32b19a1077e1c13a752580b6a624f0e4c6c7fab588c8bd7f2da068ca5 SHA512 99e11c9570d2aaf086317e7c82c45758a8e1ce6d4dbfe9ddc7c4de9a0843ac854e5f7192a3caf2915628b55e24ec7d4b4fa6f9656f08e344753bbc890952a168
+AUX aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch 1268 BLAKE2B d2bb69c98a0e90a9880962a6acb11392ba7e0610e1bedcc97cfe74cbf39fed61df24888987dc4fdb9e1b785f499fdd46e5216da24f2d081051b03e6143e84aa3 SHA512 4c09def5eddef31da4563eeeb6794af217a3badb841c8079d6caf4b9a63460b7a9fb60aa632ac4d4e622e435381705a410d698bc1d19087274612ba00db3474a
+AUX aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch 348 BLAKE2B 99321dd97a9888bab32e41797558c617410d228c64619f19a08052fabc2f9536a1bde1fcfb2232ed442ee788ef338c8cec1a46f25a74e91641d442b2e0189810 SHA512 5cfcfc0b9b13cfa57c5f28a3537a3208d0516fe6aa941ba91f90b294c5e7c95db9699430071c12db5040c3208af318eba16db68ecd2d6feb52ac1c41d2ac6005
+AUX aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch 1243 BLAKE2B f6ecdfae9a6380869f5082bd72d1ba463c052bed59c0fb754b569fa56b35bc8c67172c7669ee90492eacd6e8db50ec1a1374e3106758edfb3c8e6a6e26a9d7be SHA512 2ba7a617f4880cc632b75330afc2890bab3a0dfd0017904ac53c3bfe23535b85ee4228a79ce94c2d908d3a4e8bee6abab97836d15a59c42babdb67a6f9ee5eff
+AUX aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch 319 BLAKE2B ca9b1664bc74bb4aec09efdfd640deda357c5f10e28ed6a3716096067669643436c35b93db0cab6ac9ff0582d77c548aadddc33dde36fb5759921a93127035be SHA512 3cc6ada02f65d97a2351ea4e9700db7ebe532084cbae5934371685d9a424993cbf60e68e6b64aad0d389c9c8774602cd6132cec351e136b5de8249d00ad32023
+AUX aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch 850 BLAKE2B 9ba442243492283f95d92769541dfcd218120e94cc96d857b10380d9cd6adc876a4b3c962dbc5171776be9a02dd236ae220924be7a481f0793927c16709539c2 SHA512 8975a8ea5162a7253c2b2ce64b47848b5ae566eef95ce432df2e8046ef82b66a78ff292e0fefde07a0a128a864716abcf077a6270abb6314ba0c6bd15fc39f7f
+DIST aws-sdk-cpp-1.8.46.tar.gz 28989406 BLAKE2B 47a72d1e0578ecd28e376f3c6688a997faeeae41ba5e4ab5aeff59a2d8f592fc63746445728ab3236952cfc045dc683c816c77dfb8fbe3d98904e50013201ace SHA512 9fedc9de84721189f001a0a5fb2dd63987a366a37ec6354234b244da39929b420e6289bd319d0f056fa4274b7bc682d1aab2dddd5dc823abdf24b69536610ed4
+EBUILD aws-sdk-cpp-1.8.46.ebuild 8302 BLAKE2B c6fdc9002429aaa8edf45aca9ea01cc01bc3232fd36ac399e6e71485dec5b877d783eb3f10458a8979cda562bdd46687867d4c1759750e901847b8df2e380809 SHA512 892b43a1b5027b7a7b33767d3c8307f395b93b5f13eb8e20f70ffd45a5bf80a6fa280cb22a34fccebf2bbccca90fba87b59effc07ee0f4c7dd97a9fe787978ee
+MISC metadata.xml 23851 BLAKE2B af85a4922358eab81028ad9003a39cca87c981a2068aeb26e2be86d5da5d888e2d2611ad15861a6562cf60294b1902e7026aef2ec4f16d862078926147a2896c SHA512 4cc2bbc93a0c396d77e8b506aa0f575523ab0cee5a786774a617c3156af910e49b06abf41b17314cc32968feff4367755812bb681daa4b399ce6da73929a3877
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
deleted file mode 100644
index 1d647355d4e5..000000000000
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="AWS SDK for C++"
-HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
-SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULES=(
-	access-management apigateway backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile
-	cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ec2 ecr ecs eks elasticache
-	elasticbeanstalk elasticloadbalancing elasticmapreduce email es events fsx globalaccelerator iot kinesis kms
-	lambda lex license-manager lightsail machinelearning macie managedblockchain marketplace opsworks organizations
-	other personalize polly queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub
-	serverlessrepo shield sns sqs textract transcribe translate waf
-)
-
-IUSE="+http libressl +rtti +ssl static-libs test unity-build ${MODULES[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	http? ( net-misc/curl:= )
-	polly? ( media-sound/pulseaudio )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	dev-libs/aws-c-common
-	dev-libs/aws-checksums
-	dev-libs/aws-c-event-stream
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local mybuildtargets="core"
-
-	for module in ${MODULES[@]}; do
-		if use ${module}; then
-			if [ "${module}" = "access-management" ] ; then
-				mybuildtargets+=";${module};acm;acm-pca;iam;identity-management;ram;sts"
-			elif [ "${module}" = "apigateway" ] ; then
-				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
-			elif [ "${module}" = "budgets" ] ; then
-				mybuildtargets+=";${module};ce;cur"
-			elif [ "${module}" = "cloud-desktop" ] ; then
-				mybuildtargets+=";appstream;workdocs;worklink;workmail;workspaces"
-			elif [ "${module}" = "cloud-dev" ] ; then
-				mybuildtargets+=";cloud9;codebuild;codecommit;codedeploy;codepipeline;codestar;xray"
-				if ! use "queues"; then
-					mybuildtargets+=";queues"
-				fi
-			elif [ "${module}" = "cloud-media" ] ; then
-				mybuildtargets+=";elastictranscoder;mediaconnect;mediaconvert;medialive;mediapackage"
-				mybuildtargets+=";mediapackage-vod;mediastore;mediastore-data;mediatailor"
-			elif [ "${module}" = "cloud-mobile" ] ; then
-				mybuildtargets+=";amplify;appsync;devicefarm;mobile;mobileanalytics;pinpoint"
-				mybuildtargets+=";pinpoint-email;sms-voice"
-				if ! use "sns"; then
-					mybuildtargets+=";sns"
-				fi
-			elif [ "${module}" = "cloudhsm" ] ; then
-				mybuildtargets+=";${module};cloudhsmv2"
-			elif [ "${module}" = "cloudsearch" ] ; then
-				mybuildtargets+=";${module};cloudsearchdomain"
-			elif [ "${module}" = "cloudwatch" ] ; then
-				mybuildtargets+=";application-insights;appmesh;cloudtrail;guardduty;health;inspector"
-				mybuildtargets+=";logs;monitoring"
-			elif [ "${module}" = "cognito" ] ; then
-				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
-			elif [ "${module}" = "dynamodb" ] ; then
-				mybuildtargets+=";${module};dax;dynamodbstreams"
-			elif [ "${module}" = "ec2" ] ; then
-				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
-				mybuildtargets+=";ec2-instance-connect;elasticfilesystem"
-			elif [ "${module}" = "elasticloadbalancing" ] ; then
-				mybuildtargets+=";${module};elasticloadbalancingv2"
-			elif [ "${module}" = "events" ] ; then
-				mybuildtargets+=";${module};eventbridge"
-			elif [ "${module}" = "iot" ] ; then
-				mybuildtargets+=";${module};greengrass;iot1click-devices;iot1click-projects"
-				mybuildtargets+=";iotanalytics;iot-data;iotevents;iotevents-data;iot-jobs-data"
-				mybuildtargets+=";iotthingsgraph"
-			elif [ "${module}" = "kinesis" ] ; then
-				mybuildtargets+=";${module};firehose;kinesisanalytics;kinesisanalyticsv2;kinesisvideo"
-				mybuildtargets+=";kinesis-video-archived-media;kinesis-video-media"
-			elif [ "${module}" = "lex" ] ; then
-				mybuildtargets+=";${module};lex-models"
-			elif [ "${module}" = "marketplace" ] ; then
-				mybuildtargets+=";marketplacecommerceanalytics;marketplace-entitlement"
-				mybuildtargets+=";meteringmarketplace;pricing"
-			elif [ "${module}" = "opsworks" ] ; then
-				mybuildtargets+=";${module};opsworkscm"
-			elif [ "${module}" = "other" ] ; then
-				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;clouddirectory;comprehend"
-				mybuildtargets+=";comprehendmedical;connect;datapipeline;datasync;directconnect"
-				mybuildtargets+=";discovery;dms;docdb;ds;dynamodb;gamelift;glue;groundstation"
-				mybuildtargets+=";importexport;kafka;lakeformation;mq;mturk-requester;neptune"
-				mybuildtargets+=";quicksight;redshift;robomaker;sdb;service-quotas;servicecatalog"
-				mybuildtargets+=";servicediscovery;signer;sms;snowball;ssm;states;storagegateway"
-				mybuildtargets+=";support;swf"
-			elif [ "${module}" = "personalize" ] ; then
-				mybuildtargets+=";${module};personalize-events;personalize-runtime"
-			elif [ "${module}" = "polly" ] ; then
-				mybuildtargets+=";${module};text-to-speech"
-			elif [ "${module}" = "rds" ] ; then
-				mybuildtargets+=";${module};pi;rds-data"
-			elif [ "${module}" = "resource-groups" ] ; then
-				mybuildtargets+=";${module};resourcegroupstaggingapi"
-			elif [ "${module}" = "route53" ] ; then
-				mybuildtargets+=";${module};route53domains;route53resolver"
-			elif [ "${module}" = "s3" ] ; then
-				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
-			elif [ "${module}" = "sagemaker" ] ; then
-				mybuildtargets+=";${module};sagemaker-runtime"
-			elif [ "${module}" = "transcribe" ] ; then
-				mybuildtargets+=";${module};transcribestreaming"
-			elif [ "${module}" = "waf" ] ; then
-				mybuildtargets+=";${module};fms;waf-regional"
-			else
-				mybuildtargets+=";${module}"
-			fi
-		fi
-	done
-
-	local mycmakeargs=(
-		-DBUILD_DEPS=NO
-		-DBUILD_ONLY="${mybuildtargets}"
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DCPP_STANDARD=17
-		-DENABLE_RTTI=$(usex rtti)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_UNITY_BUILD=$(usex unity-build)
-		-DNO_ENCRYPTION=$(usex !ssl)
-		-DNO_HTTP_CLIENT=$(usex !http)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild
new file mode 100644
index 000000000000..2ac7c4ce7732
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="AWS SDK for C++"
+HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
+SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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 elasticinference 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
+)
+
+IUSE="+http libressl pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	http? ( net-misc/curl:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	dev-libs/aws-c-common
+	dev-libs/aws-checksums
+	dev-libs/aws-c-event-stream
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-upgrade_android-build_build_and_test_android_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_ExtractBuildArgs_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_handle_release_notification_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_move_release_doc_to_models_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_build_3rdparty_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_build_example_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_dummy_web_server_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_endpoints_checker_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_gather_3rdparty_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
+)
+
+src_configure() {
+	local mybuildtargets="core"
+
+	for module in ${MODULES[@]}; do
+		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"
+			elif [ "${module}" = "apigateway" ] ; then
+				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
+			elif [ "${module}" = "budgets" ] ; then
+				mybuildtargets+=";${module};ce;cur"
+			elif [ "${module}" = "cloud-desktop" ] ; then
+				mybuildtargets+=";appstream;workdocs;worklink;workmail;workmailmessageflow;workspaces"
+			elif [ "${module}" = "cloud-dev" ] ; then
+				mybuildtargets+=";cloud9;codeartifact;codebuild;codecommit;codedeploy;codeguruprofiler"
+				mybuildtargets+=";codeguru-reviewer;codepipeline;codestar;codestar-connections"
+				mybuildtargets+=";codestar-notifications;honeycode;xray"
+				if ! use "queues"; then
+					mybuildtargets+=";queues"
+				fi
+			elif [ "${module}" = "cloud-media" ] ; then
+				mybuildtargets+=";elastictranscoder;mediaconnect;mediaconvert;medialive;mediapackage"
+				mybuildtargets+=";mediapackage-vod;mediastore;mediastore-data;mediatailor"
+			elif [ "${module}" = "cloud-mobile" ] ; then
+				mybuildtargets+=";amplify;appsync;devicefarm;mobile;mobileanalytics;pinpoint"
+				mybuildtargets+=";pinpoint-email;sms-voice"
+				if ! use "sns"; then
+					mybuildtargets+=";sns"
+				fi
+			elif [ "${module}" = "cloudhsm" ] ; then
+				mybuildtargets+=";${module};cloudhsmv2"
+			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"
+			elif [ "${module}" = "cognito" ] ; then
+				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
+			elif [ "${module}" = "dynamodb" ] ; then
+				mybuildtargets+=";${module};dax;dynamodbstreams"
+			elif [ "${module}" = "ec2" ] ; then
+				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
+				mybuildtargets+=";ec2-instance-connect;elasticfilesystem;imagebuilder;savingsplans"
+			elif [ "${module}" = "elasticloadbalancing" ] ; then
+				mybuildtargets+=";${module};elasticloadbalancingv2"
+			elif [ "${module}" = "email" ] ; then
+				mybuildtargets+=";${module};sesv2"
+			elif [ "${module}" = "events" ] ; then
+				mybuildtargets+=";${module};eventbridge"
+			elif [ "${module}" = "forecast" ] ; then
+				mybuildtargets+=";${module};forecastquery"
+			elif [ "${module}" = "iot" ] ; then
+				mybuildtargets+=";${module};greengrass;iot1click-devices;iot1click-projects"
+				mybuildtargets+=";iotanalytics;iot-data;iotevents;iotevents-data;iot-jobs-data"
+				mybuildtargets+=";iotsecuretunneling;iotsitewise;iotthingsgraph"
+			elif [ "${module}" = "kinesis" ] ; then
+				mybuildtargets+=";${module};firehose;ivs;kinesisanalytics;kinesisanalyticsv2"
+				mybuildtargets+=";kinesisvideo;kinesis-video-archived-media;kinesis-video-media"
+				mybuildtargets+=";kinesis-video-signaling"
+			elif [ "${module}" = "lex" ] ; then
+				mybuildtargets+=";${module};lex-models"
+			elif [ "${module}" = "macie" ] ; then
+				mybuildtargets+=";${module};macie2"
+			elif [ "${module}" = "marketplace" ] ; then
+				mybuildtargets+=";marketplacecommerceanalytics;marketplace-catalog"
+				mybuildtargets+=";marketplace-entitlement;meteringmarketplace;pricing"
+			elif [ "${module}" = "opsworks" ] ; then
+				mybuildtargets+=";${module};opsworkscm"
+			elif [ "${module}" = "other" ] ; then
+				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;braket;clouddirectory"
+				mybuildtargets+=";comprehend;comprehendmedical;connect;datapipeline;datasync"
+				mybuildtargets+=";directconnect;discovery;dms;docdb;ds;dynamodb;gamelift;glue"
+				mybuildtargets+=";groundstation;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}" = "personalize" ] ; then
+				mybuildtargets+=";${module};personalize-events;personalize-runtime"
+			elif [ "${module}" = "polly" ] ; then
+				mybuildtargets+=";${module};text-to-speech"
+			elif [ "${module}" = "qldb" ] ; then
+				mybuildtargets+=";${module};qldb-session"
+			elif [ "${module}" = "rds" ] ; then
+				mybuildtargets+=";${module};pi;rds-data"
+			elif [ "${module}" = "resource-groups" ] ; then
+				mybuildtargets+=";${module};resourcegroupstaggingapi"
+			elif [ "${module}" = "route53" ] ; then
+				mybuildtargets+=";${module};route53domains;route53resolver"
+			elif [ "${module}" = "s3" ] ; then
+				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
+			elif [ "${module}" = "sagemaker" ] ; then
+				mybuildtargets+=";${module};sagemaker-a2i-runtime;sagemaker-runtime"
+			elif [ "${module}" = "transcribe" ] ; then
+				mybuildtargets+=";${module};transcribestreaming"
+			elif [ "${module}" = "waf" ] ; then
+				mybuildtargets+=";${module};fms;waf-regional;wafv2"
+			else
+				mybuildtargets+=";${module}"
+			fi
+		fi
+	done
+
+	local mycmakeargs=(
+		-DAUTORUN_UNIT_TESTS=$(usex test)
+		-DBUILD_DEPS=NO
+		-DBUILD_ONLY="${mybuildtargets}"
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DCPP_STANDARD=17
+		-DENABLE_RTTI=$(usex rtti)
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_UNITY_BUILD=$(usex unity-build)
+		-DNO_ENCRYPTION=$(usex !ssl)
+		-DNO_HTTP_CLIENT=$(usex !http)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
new file mode 100644
index 000000000000..658abfded785
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
@@ -0,0 +1,10 @@
+--- a/CI/ConstructReleaseDoc.py	(original)
++++ b/CI/ConstructReleaseDoc.py	(refactored)
+@@ -35,6 +35,6 @@
+     releases.append(release)
+     changeDoc["releases"] = releases
+ 
+-    print(json.dumps(changeDoc))
++    print((json.dumps(changeDoc)))
+ 
+ Main()
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch
new file mode 100644
index 000000000000..fb6856abff3c
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch
@@ -0,0 +1,22 @@
+--- a/CI/ExtractBuildArgs.py	(original)
++++ b/CI/ExtractBuildArgs.py	(refactored)
+@@ -3,15 +3,15 @@
+ import json
+ 
+ if len(sys.argv) != 2:
+-    print >> sys.stderr, "    Usage: python ExtractBuildArgs.py <ArgName>"
++    print("    Usage: python ExtractBuildArgs.py <ArgName>", file=sys.stderr)
+     exit (-1)
+ 
+ try:
+     data = json.load(open('BuildSpec.json'))
+     if sys.argv[1] == "cmakeFlags" and data["cmakeFlags"] != "":
+-        print(data["cmakeFlags"])
++        print((data["cmakeFlags"]))
+     elif sys.argv[1] == "branch" and data["branch"] != "":
+-        print(data["branch"])
++        print((data["branch"]))
+ except:
+-    print >> sys.stderr, "No related args found in BuildSpec.json"
++    print("No related args found in BuildSpec.json", file=sys.stderr)
+     exit(-1)
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch
new file mode 100644
index 000000000000..ddd162025b49
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch
@@ -0,0 +1,9 @@
+--- a/CI/handle_release_notification.py	(original)
++++ b/CI/handle_release_notification.py	(refactored)
+@@ -1,5 +1,5 @@
+ 
+-from __future__ import print_function
++
+ 
+ import json
+ import zipfile
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch
new file mode 100644
index 000000000000..ef7a384d7e6e
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch
@@ -0,0 +1,9 @@
+--- a/CI/move_release_doc_to_models.py	(original)
++++ b/CI/move_release_doc_to_models.py	(refactored)
+@@ -1,5 +1,5 @@
+ 
+-from __future__ import print_function
++
+ 
+ import json
+ import zipfile
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch
new file mode 100644
index 000000000000..e77436236c9d
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch
@@ -0,0 +1,28 @@
+--- a/android-build/build_and_test_android.py	(original)
++++ b/android-build/build_and_test_android.py	(refactored)
+@@ -120,13 +120,13 @@
+  
+     validTests = GetTestList( buildSharedObjects )
+     if runTest not in validTests:
+-        print( 'Invalid value for runtest option: ' + runTest )
++        print(( 'Invalid value for runtest option: ' + runTest ))
+         print( 'Valid values are: ' )
+-        print( '  ' + ", ".join( validTests ) )
++        print(( '  ' + ", ".join( validTests ) ))
+         raise ArgumentException('runtest', runTest)
+         
+     if not IsValidABI(abi):
+-        print('Invalid argument value for abi: ', abi)
++        print(('Invalid argument value for abi: ', abi))
+         print('  Valid values are "armeabi-v7a"')
+         raise ArgumentException('abi', abi)
+ 
+@@ -140,7 +140,7 @@
+         avd = FindAVDForABI(abi, avdABIs)
+ 
+     if not IsValidAVD(avd, abi, avdABIs):
+-        print('Invalid virtual device: ', avd)
++        print(('Invalid virtual device: ', avd))
+         print('  Use --avd to set the virtual device')
+         print('  Use "android lists avds" to see all usable virtual devices')
+         raise ArgumentException('avd', avd)
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
new file mode 100644
index 000000000000..5322430bfb38
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
@@ -0,0 +1,14 @@
+--- a/CI/binary-release-pipeline/lambda_publish.py	(original)
++++ b/CI/binary-release-pipeline/lambda_publish.py	(refactored)
+@@ -39,9 +39,9 @@
+                 prefix = publish_key_prefix,
+                 config = config
+             )
+-            print('Uploading artifacts to https://s3.console.aws.amazon.com/s3/object/{bucket}/{key}'.format(
++            print(('Uploading artifacts to https://s3.console.aws.amazon.com/s3/object/{bucket}/{key}'.format(
+                 bucket = publish_bucket,
+-                key = publish_key))
++                key = publish_key)))
+ 
+             s3.meta.client.copy(
+                 { 'Bucket': input_artifacts[i]['location']['s3Location']['bucketName'],
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
new file mode 100644
index 000000000000..f17f05b3d3d5
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
@@ -0,0 +1,19 @@
+--- a/doc_crosslinks/generate_cross_link_data.py	(original)
++++ b/doc_crosslinks/generate_cross_link_data.py	(refactored)
+@@ -17,14 +17,14 @@
+         if match:
+             with codecs.open(join(apiDefinitionsPath, file), 'rb', 'utf-8') as api_definition:
+                 api_content = json.loads(api_definition.read())
+-                if "uid" in api_content["metadata"].keys():
++                if "uid" in list(api_content["metadata"].keys()):
+                     sdks[api_content["metadata"]["uid"]] = getServiceNameFromMetadata(api_content["metadata"])
+            
+     return sdks
+     
+ def getServiceNameFromMetadata(metadataNode):
+     toSanitize = ""
+-    if "serviceAbbreviation" in metadataNode.keys():
++    if "serviceAbbreviation" in list(metadataNode.keys()):
+         toSanitize = metadataNode["serviceAbbreviation"]
+     else: 
+         toSanitize = metadataNode["serviceFullName"]
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch
new file mode 100644
index 000000000000..885f94800c17
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch
@@ -0,0 +1,70 @@
+--- a/scripts/build_3rdparty.py	(original)
++++ b/scripts/build_3rdparty.py	(refactored)
+@@ -237,7 +237,7 @@
+         dependentInstallFile = os.path.join( uppercaseLib + "-prefix", "src", uppercaseLib + "-build", "cmake_install.cmake" )
+         dependentInstallDirectory = '"' + os.path.join( installDirectory, "external", dependentLib ) + '"'
+         dependent_install_call = "cmake -DCMAKE_INSTALL_CONFIG_NAME=" + config + " -DCMAKE_INSTALL_PREFIX=" + dependentInstallDirectory + " -P " + dependentInstallFile + " .."
+-        print( "dependent install call = " + dependent_install_call )
++        print(( "dependent install call = " + dependent_install_call ))
+         subprocess.check_call( dependent_install_call, shell = True )
+ 
+ 
+@@ -254,7 +254,7 @@
+ 
+     sourcePlatform = platform.system()
+     if not sourcePlatform in platformEnvironments:
+-        print( "Platform " + sourcePlatform + " not supported as a build platform" )
++        print(( "Platform " + sourcePlatform + " not supported as a build platform" ))
+         return 1
+ 
+     platformEnv = platformEnvironments[ sourcePlatform ]
+@@ -292,12 +292,12 @@
+         shutil.rmtree( installDirectory )
+ 
+     if not architecture in platformBuildTargets:
+-        print( "No definition for target architecture " + architecture )
++        print(( "No definition for target architecture " + architecture ))
+         return 1
+ 
+     targetPlatformDef = platformBuildTargets[ architecture ]
+     if not sourcePlatform in targetPlatformDef[ 'buildPlatforms' ]:
+-        print( "Platform " + sourcePlatform + " does not support building for architecture " + architecture )
++        print(( "Platform " + sourcePlatform + " does not support building for architecture " + architecture ))
+         return 1
+ 
+     buildEnvironment = buildEnvironments[ targetPlatformDef[ 'build_environment' ] ]
+@@ -338,18 +338,18 @@
+                 cmake_call_list = cmake_call_list + " -DCUSTOM_PLATFORM_DIR=\"" + customPlatformDir + "\""
+ 
+             cmake_call_list = cmake_call_list + " " + quotedSourceDir
+-            print( "cmake call = " + cmake_call_list )
++            print(( "cmake call = " + cmake_call_list ))
+             subprocess.check_call( cmake_call_list, shell = True )
+ 
+             parallelBuildOption = buildEnvironment[ 'parallel_option' ].replace("??", str(parallelJobs))
+             build_call_list = buildEnvironment[ 'global_build_call' ] + archConfig[ 'build_params' ]
+             if parallelBuildOption != "":
+                 build_call_list = build_call_list + [ parallelBuildOption ]
+-            print( "build call = " + str( build_call_list ) )
++            print(( "build call = " + str( build_call_list ) ))
+             subprocess.check_call( build_call_list )
+ 
+             install_call = "cmake -DCMAKE_INSTALL_CONFIG_NAME=" + archConfig[ 'config' ] + " -DCMAKE_INSTALL_PREFIX=" + quotedInstallDirectory + " -P cmake_install.cmake " + quotedSourceDir
+-            print( "install call = " + install_call )
++            print(( "install call = " + install_call ))
+             subprocess.check_call( install_call, shell = True )
+ 
+             # platform specific stuff
+@@ -365,9 +365,9 @@
+             os.chdir( ".." )
+ 
+         else:
+-            print("Build target config " + targetConfig + " does not exist for architecture " + architecture)
+-
+-    print( "Aws SDK for C++  finished 3rd party installation into: " + installDirectory )
++            print(("Build target config " + targetConfig + " does not exist for architecture " + architecture))
++
++    print(( "Aws SDK for C++  finished 3rd party installation into: " + installDirectory ))
+     
+ 
+ # On windows: Run from powershell; make sure msbuild is in PATH environment variable  
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch
new file mode 100644
index 000000000000..8596e41c5f27
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch
@@ -0,0 +1,18 @@
+--- a/scripts/build_example.py	(original)
++++ b/scripts/build_example.py	(refactored)
+@@ -56,13 +56,13 @@
+     cmake_call = cmake_call + " -DCMAKE_PREFIX_PATH=" + sdkInstallDir
+     cmake_call = cmake_call + " -DAWSSDK_ROOT_DIR=" + sdkInstallDir
+     cmake_call = cmake_call + " " + sourceDir
+-    print("cmake call = " + cmake_call)
++    print(("cmake call = " + cmake_call))
+     subprocess.check_call(cmake_call, shell = True)
+     
+     build_call = buildEnvironment[ platform ][ 'global_build_call' ]
+     build_call = build_call + buildEnvironment[ platform ][ 'configs' ].replace("??", buildType)
+     build_call = build_call + buildEnvironment[ platform ][ 'parallel_option' ].replace("??", parallel)
+-    print("build call = " + build_call)
++    print(("build call = " + build_call))
+     subprocess.check_call(build_call, shell = True)
+ 
+ def Main():
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch
new file mode 100644
index 000000000000..396d1b134ebd
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch
@@ -0,0 +1,20 @@
+--- a/scripts/dummy_web_server.py	(original)
++++ b/scripts/dummy_web_server.py	(refactored)
+@@ -78,7 +78,7 @@
+             self._set_headers()
+             self.wfile.write(self._html("hi!"))
+         except socket.error as e:
+-            print ("socket.error : Connection broke. Aborting" + str(e))
++            print(("socket.error : Connection broke. Aborting" + str(e)))
+             self.wfile._sock.close()
+             self.wfile._sock = None
+             return False
+@@ -111,7 +111,7 @@
+     server_address = (addr, port)
+     httpd = server_class(server_address, handler_class)
+ 
+-    print("Starting httpd server on {}:{}.".format(addr, port))
++    print(("Starting httpd server on {}:{}.".format(addr, port)))
+     httpd.serve_forever()
+     httpd.stop_server()
+ 
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch
new file mode 100644
index 000000000000..3fd67591c098
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch
@@ -0,0 +1,29 @@
+--- a/scripts/endpoints_checker.py	(original)
++++ b/scripts/endpoints_checker.py	(refactored)
+@@ -64,8 +64,8 @@
+     strippedContent = RemoveCPPComments(content);
+     match = ScanContent(strippedContent);
+     if match:
+-        print inputFile;
+-        print "..." + strippedContent[match.start() : match.end()] + "...";
++        print(inputFile);
++        print("..." + strippedContent[match.start() : match.end()] + "...");
+         return True;
+ 
+     return False;
+@@ -109,7 +109,7 @@
+ assert ScanContent("\"cn-north-2 doesn't exist\"") == None;
+ 
+ ###################Test End######################################
+-print "Start checking hard coded endpoints in source files...";
++print("Start checking hard coded endpoints in source files...");
+ exitCode = 0;
+ RootDir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)));
+ for root, dirnames, fileNames in os.walk(RootDir):
+@@ -117,5 +117,5 @@
+         if fileName.endswith(('.h', '.cpp')):
+             targetFile = os.path.join(root, fileName);
+             exitCode |= CheckFile(targetFile);
+-print "Finished checking hard coded endpoints in source files with exit code",exitCode,".";
++print("Finished checking hard coded endpoints in source files with exit code",exitCode,".");
+ exit(exitCode);
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch
new file mode 100644
index 000000000000..c1141bdf53e5
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch
@@ -0,0 +1,11 @@
+--- a/scripts/gather_3rdparty.py	(original)
++++ b/scripts/gather_3rdparty.py	(refactored)
+@@ -200,7 +200,7 @@
+ 
+     # shutil.rmtree( destDir )
+ 
+-    print( "Aws SDK for C++  finished 3rd party pre-build gather into: " + uploadZipFile )
++    print(( "Aws SDK for C++  finished 3rd party pre-build gather into: " + uploadZipFile ))
+     
+ 
+ Main()
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch
new file mode 100644
index 000000000000..12b910425bf5
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch
@@ -0,0 +1,25 @@
+--- a/scripts/generate_sdks.py	(original)
++++ b/scripts/generate_sdks.py	(refactored)
+@@ -94,7 +94,7 @@
+                  with zipfile.ZipFile(output.strip().decode('utf-8'), 'r') as zip:
+                      zip.extractall(outputDir)
+     except EnvironmentError as  ex:
+-        print('Error generating sdk {} with error {}'.format(sdk, ex))
++        print(('Error generating sdk {} with error {}'.format(sdk, ex)))
+ 
+ def Main():
+     arguments = ParseArguments()
+@@ -105,11 +105,11 @@
+     sdks = DiscoverAllAvailableSDKs(arguments['pathToApiDefinitions'])
+ 
+     if arguments['listAll']:
+-        for key, value in sdks.iteritems():
++        for key, value in sdks.items():
+             print(value)
+ 
+     if arguments['serviceName']:
+-        print('Generating {} api version {}.'.format(arguments['serviceName'], arguments['apiVersion']))
++        print(('Generating {} api version {}.'.format(arguments['serviceName'], arguments['apiVersion'])))
+         key = '{}-{}'.format(arguments['serviceName'], arguments['apiVersion'])
+         GenerateSdk(arguments['pathToGenerator'], sdks[key], arguments['outputLocation'], arguments['namespace'], arguments['licenseText'], arguments['standalone'], arguments['enableVirtualOperations'])
+ 
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch
new file mode 100644
index 000000000000..d73fa82ff1c0
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch
@@ -0,0 +1,11 @@
+--- a/scripts/renew_license.py	(original)
++++ b/scripts/renew_license.py	(refactored)
+@@ -55,7 +55,7 @@
+     if (skipFile(inputFile)):
+         return False;
+ 
+-    print ("Process file: " + inputFile)
++    print(("Process file: " + inputFile))
+     with open(inputFile) as ftarget:
+         content = ftarget.read()
+ 
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch
new file mode 100644
index 000000000000..f451e707f40b
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch
@@ -0,0 +1,17 @@
+--- a/scripts/run_integration_tests.py	(original)
++++ b/scripts/run_integration_tests.py	(refactored)
+@@ -52,11 +52,11 @@
+         testExe = os.path.join(arguments[ "testDir" ], testName if testHasParentDir else "", testName) + exeExtension
+         # when build with BUILD_ONLY, not all test binaries will be generated.
+         if not os.path.isfile(testExe):
+-            print("Test: \"{}\" doesn't exist, skipped.".format(testExe))
++            print(("Test: \"{}\" doesn't exist, skipped.".format(testExe)))
+             continue
+         prefix = "--aws_resource_prefix=" + platform.system().lower()
+-        print("testExe = " + testExe)
+-        print("prefix = " + prefix)
++        print(("testExe = " + testExe))
++        print(("prefix = " + prefix))
+         AddExecutableBit(testExe)
+         subprocess.check_call([testExe, prefix])
+ 
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
index 3995d6c12b58..d9d348be77d8 100644
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>amit.prakash.ambasta@gmail.com</email>
 	</maintainer>
+	<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>
@@ -27,19 +31,28 @@
 
 		<flag name="access-management">
 			AWS Access Management, a meta-flag that enables:
-			AWS Certificate Manager (ACM): Provision, manage, and deploy SSL/TLS certificates on AWS managed
-				resources.
+			AWS Certificate Manager (ACM): Provision, manage, and deploy SSL/TLS certificates on AWS
+				managed resources.
+			AWS Data Exchange            : A service that makes it easy for customers to find, subscribe
+				to, and use third-party data in the AWS Cloud.
+			AWS IAM Access Analyzer      : Identify any policies that grant access to an external
+				principal.
 			Identity and Access Management (IAM): A web service for securely controlling access to AWS
 				services.
 			Resource Access Manager (RAM): Customers who operate multiple accounts can create resources
-				centrally and use AWS RAM to share them with all of their accounts to reduce operational
-				overhead.
-			Also enables acm-pca, identity-management and sts (Security Token Service).
+				centrally and use AWS RAM to share them with all of their accounts to reduce
+				operational overhead.
+			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).
 		</flag>
 		<flag name="apigateway">
 			Create and deploy your own REST and WebSocket APIs at any scale.
 			Also enables apigatewaymanagementapi and apigatewayv2.
 		</flag>
+		<flag name="appconfig">Quickly deploy application configurations to applications of any size.</flag>
 		<flag name="backup">AWS Backup is a fully managed backup service</flag>
 		<flag name="batch">Run batch computing workloads on the AWS Cloud</flag>
 		<flag name="budgets">
@@ -58,16 +71,22 @@
 				internal websites and web apps from mobile devices.
 			WorkMail     : Managed email and calendaring service.
 			WorkSpaces   : Cloud-based desktop experience for end users.
+			Also enabled workmailmessageflow.
 		</flag>
 		<flag name="cloud-dev">
 			Enables in-cloud developer tools:
 			Cloud9      : Cloud-based integrated development environment IDE to write, run, and debug code.
+			CodeArtifact: Secure and scalable artifact management service for software development.
 			CodeBuild   : Managed build service that compiles, runs unit tests and produces artifacts.
 			CodeCommit  : Privately store and manage Git repositories in the AWS cloud.
 			CodeDeploy  : Automate the deployment and updating of applications.
+			CodeGuru    : Provides intelligent recommendations for improving application performance,
+				efficiency, and code quality in your Java applications.
 			CodePipeline: Continuous delivery service to model, visualize, and automate the steps required
 				to release software.
-			CodeStar    : Quickly develop, build, and deploy applications on AWS.
+			CodeStar    : Quickly develop, build, and deploy applications on AWS. Also enables
+				codestar-connections and codestar-notifications.
+			Honey Code  : Fully managed service to quickly build mobile and web apps for teams.
 			Queues      : Simple queue class. Allows standard queue operations top, delete, and push. Also
 				has higher level, asynchronous interface with callbacks.
 			X-Ray       : Provides request tracing, exception collection, and profiling capabilities.
@@ -127,15 +146,18 @@
 			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.
 			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 of
-				issues that affect AWS resources and accounts.
+				infrastructure, guides through scheduled changes, and accelerates the troubleshooting
+				of issues that affect AWS resources and accounts.
 			Inspector           : A security vulnerability assessment service that helps improve the
 				security and compliance of
 			AWS resources.
 			Logs                : Monitor, store, and access log files from Amazon EC2 instances, AWS
 				CloudTrail, or other sources.
+			Synthetics          : Create canaries, configurable scripts that run on a schedule, to monitor
+				your endpoints and APIs.
 		</flag>
 		<flag name="cognito">
 			Create unique identities, authenticate these identities with identity providers and save mobile
@@ -152,13 +174,23 @@
 			Manage the lifecycle of AWS resources. Create lifecycle policies to automate operations on
 			specified resources.
 		</flag>
+		<flag name="ebs">
+			Amazon Elastic Block Store (Amazon EBS) is a web service that provides block level storage
+			volumes for use with EC2 instances. EBS volumes are highly available and reliable storage
+			volumes that can be attached to any running instance and used like a hard drive.
+		</flag>
 		<flag name="ec2">
 			Amazon Elastic Compute Cloud (EC2) is a web service that provides resizeable computing capacity.
 			This flag also enables the following modules:
 			Auto Scaling       : Set up dynamic and predictive scaling for scalable AWS resources. Also
 				enables autoscaling-plans and application-autoscaling.
+			EC2 Image Builder  : Fully-managed AWS service that makes it easier to automate the creation,
+				management, and deployment of customized, secure, and up-to-date “golden” server images
+				that are pre-installed and pre-configured with software and settings to meet specific IT
+				standards.
 			Elastic File System: EFS provides file storage for Amazon EC2 instances.
-
+			Savings Plan       : Flexible pricing model that helps you save a significant percentage on
+				Amazon EC2 and Fargate usage.
 		</flag>
 		<flag name="ecr">
 			Amazon Elastic Container Registry (ECR) is a fully managed Docker container registry.
@@ -167,12 +199,19 @@
 			Amazon Elastic Container Service (ECS) is a highly scalable, fast, container management service.
 		</flag>
 		<flag name="eks">
-			Amazon Elastic Kubernetes Service (EKS) is a managed service to run Kubernetes on AWS without own Kubernetes clusters.
+			Amazon Elastic Kubernetes Service (EKS) is a managed service to run Kubernetes on AWS without
+			own Kubernetes clusters.
 		</flag>
 		<flag name="elasticache">
 			Set up, manage, and scale distributed in-memory cache environments in the AWS Cloud
 		</flag>
 		<flag name="elasticbeanstalk">Quickly deploy and manage applications in the AWS Cloud.</flag>
+		<flag name="elasticinference">
+			Amazon Elastic Inference is a service that allows you to attach low-cost GPU-powered
+			acceleration to many Amazon machine instances in order to reduce the cost of running deep
+			learning inference by up to 75%. Amazon Elastic Inference supports TensorFlow, Apache MXNet, and
+			ONNX models through MXNet.
+		</flag>
 		<flag name="elasticloadbalancing">
 			Automatically distribute incoming application traffic across multiple targets, such as EC2
 			instances.
@@ -186,6 +225,7 @@
 			Amazon Simple Email Service (Amazon SES):
 			An email platform to send and receive email using ones own email addresses and domains.
 			See: https://docs.aws.amazon.com/ses/latest/DeveloperGuide/Welcome.html
+			Also enables sesv2
 		</flag>
 		<flag name="es">
 			Amazon Elasticsearch Configuration Service (ES) is an API to create, configure, and manage
@@ -195,6 +235,18 @@
 			Serverless event bus service to connect applications with data from a variety of sources.
 			Also enables eventbridge.
 		</flag>
+		<flag name="forecast">
+			Amazon Forecast is a fully managed deep learning service for time-series forecasting. Time-
+			series forecasting is useful in multiple domains, including retail, financial planning, supply
+			chain, and healthcare.
+			Also enables the forecastquery module.
+		</flag>
+		<flag name="frauddetector">
+			Amazon Fraud Detector is a fully managed service that helps you detect suspicious online
+			activities such as the creation of fake accounts and online payment fraud. With Amazon Fraud
+			Detector, you can create a fraud detection ML model with just a few clicks and use it to
+			evaluate online activities in milliseconds.
+		</flag>
 		<flag name="fsx">Amazon FSx is a fully managed service to launch and use shared file storage.</flag>
 		<flag name="globalaccelerator">
 			AWS Global Accelerator is a network layer service for accelerators to improve availability and
@@ -212,20 +264,28 @@
 			iotanalytics  : Provides advanced data analysis for AWS IoT.
 			iotevents     : Monitor equipment or device fleets for failures or changes in operation, and
 				trigger actions when such events occur.
+			iotsitewise   : Easily collect, organize, and analyze data from industrial equipment at scale.
 			iotthingsgraph: Integrated set of tools that enable developers to build IoT applications using
-				devices and services that use different data representation standards and communication protocols.
-			Also enables iot1click-devices, iot1click-projects, iot-data, iotevents-data and iot-jobs-data.
+				devices and services that use different data representation standards and communication
+				protocols.
+			Also enables iot1click-devices, iot1click-projects, iot-data, iotevents-data, iot-jobs-data and
+			iotsecuretunneling.
+		</flag>
+		<flag name="kendra">
+			Amazon Kendra is a search service, powered by machine learning, that enables users to search
+			unstructured text using natural language.
 		</flag>
 		<flag name="kinesis">
 			Amazon Kinesis
 			Collect, process, and analyze video and data streams in real time. The following modules besides
 			kinesis are enabled:
-			firehose                    : Load data streams into AWS data stores.
-			kinesisanalytics            : Process and analyze streaming data using SQL or Java. (Also
-				enables kinesisanalyticsv2)
-			kinesisvideo                : Capture, process, and store video streams for analytics and
-				machine learning.
-			Additionally kinesis-video-archived-media and kinesis-video-media are enabled.
+			firehose        : Load data streams into AWS data stores.
+			ivs             : Managed live streaming solution for creating interactive video experiences.
+			kinesisanalytics: Process and analyze streaming data using SQL or Java. (Also enables 
+				kinesisanalyticsv2)
+			kinesisvideo    : Capture, process, and store video streams for analytics and machine learning.
+			Additionally kinesis-video-archived-media, kinesis-video-media and kinesis-video-signaling are
+			enabled.
 		</flag>
 		<flag name="kms">
 			AWS Key Management Service (KMS)
@@ -251,6 +311,7 @@
 		<flag name="macie">
 			A security service that uses machine learning to automatically discover, classify, and protect
 			sensitive data in AWS.
+			Also enables macie2
 		</flag>
 		<flag name="managedblockchain">
 			Create and manage scalable blockchain networks using popular open source frameworks. Currently,
@@ -266,7 +327,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 pricing.
+			Also enables marketplace-catalog and pricing.
+		</flag>
+		<flag name="networkmanager">
+			Transit Gateway Network Manager (Network Manager) enables you to create a global network, in
+			which you can monitor your AWS and on-premises networks that are built around transit gateways.
 		</flag>
 		<flag name="organizations">
 			Account management service that to consolidate multiple AWS accounts into an organization to be
@@ -281,11 +346,17 @@
 			you would like to have any of the following modules to have their own USE flag, please open a
 			bug report and it will most probably get one.
 			The modules are:
-			AWSMigrationHub, alexaforbusiness, clouddirectory, comprehend, comprehendmedical, connect,
-			datapipeline, datasync, directconnect, discovery, dms, docdb, ds, dynamodb, gamelift, glue,
-			groundstation, importexport, kafka, lakeformation, mq, mturk-requester, neptune, quicksight,
-			redshift, robomaker, sdb, service-quotas, servicecatalog, servicediscovery, signer, sms,
-			snowball, ssm, states, storagegateway, support and swf.
+			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.
+		</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.
 		</flag>
 		<flag name="personalize">
 			Real-time personalization and recommendations, based on the same technology used at Amazon.com.
@@ -294,7 +365,14 @@
 		<flag name="polly">
 			Amazon Polly
 			A Text-to-Speech (TTS) cloud service that converts text into lifelike speech.
-			Also enables text-to-speech.
+			Also enables text-to-speech, which needs you to enable pulseaudio support to work.
+		</flag>
+		<flag name="qldb">
+			Amazon Quantum Ledger Database (Amazon QLDB) is a fully managed ledger database that provides a
+			transparent, immutable, and cryptographically verifiable transaction log owned by a central
+			trusted authority. You can use Amazon QLDB to track all application data changes, and maintain
+			a complete and verifiable history of changes over time.
+			Also enables qldb-session.
 		</flag>
 		<flag name="queues">
 			AWS Queues is a simple queue class.
@@ -330,7 +408,7 @@
 			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-runtime.
+			Also enables sagemaker-a2i-runtime and sagemaker-runtime.
 		</flag>
 		<flag name="secretsmanager">
 			Encrypt, store, and retrieve credentials for databases and other services.
@@ -367,7 +445,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 and waf-regional.
+			Also enables fms, waf-regional and wafv2
 		</flag>
 	</use>
 </pkgmetadata>