dev-libs/aws-sdk-cpp: treeclean

Closes: https://bugs.gentoo.org/845654
Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>

17 files changed, 0 insertions, 359 deletions

diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch
deleted file mode 100644
index 8130066cc391..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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()
- 
- macro(set_gcc_warnings)
--    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra")
-+    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra")
-     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-12-12 15:31:17.703362345 +0100
-+++ b/cspell.json	2020-12-12 15:31:42.488363228 +0100
-@@ -13,7 +13,7 @@
-         // 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", "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-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")
- target_link_libraries(${PROJECT_NAME} ${AWSSDK_LINK_LIBRARIES})
--target_compile_options(${PROJECT_NAME} PRIVATE "-Wall" "-Werror")
-+target_compile_options(${PROJECT_NAME} PRIVATE "-Wall")
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.160-disable_http_testing.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.160-disable_http_testing.patch
deleted file mode 100644
index 8bf926148e52..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.160-disable_http_testing.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp	2021-03-14 12:52:01.193340560 +0100
-+++ b/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp	2021-03-14 12:52:42.684342951 +0100
-@@ -18,7 +18,7 @@
- using namespace Aws::Utils;
- using namespace Aws::Client;
- 
--#ifndef NO_HTTP_CLIENT
-+#if !defined(NO_HTTP_CLIENT) && ENABLE_HTTP_CLIENT_TESTING
- static void makeRandomHttpRequest(std::shared_ptr<HttpClient> httpClient)
- {
-     auto request = CreateHttpRequest(Aws::String("http://some.unknown1234xxx.test.aws"),
-@@ -319,4 +319,4 @@
- }
- #endif // ENABLE_CURL_CLIENT
- #endif // ENABLE_HTTP_CLIENT_TESTING
--#endif // NO_HTTP_CLIENT
-+#endif // !defined(NO_HTTP_CLIENT) && ENABLE_HTTP_CLIENT_TESTING
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
deleted file mode 100644
index 658abfded785..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index fb6856abff3c..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index ddd162025b49..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
deleted file mode 100644
index ef7a384d7e6e..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
deleted file mode 100644
index e77436236c9d..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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
deleted file mode 100644
index 5322430bfb38..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index f17f05b3d3d5..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index 885f94800c17..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- 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
deleted file mode 100644
index 8596e41c5f27..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index 396d1b134ebd..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 3fd67591c098..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index c1141bdf53e5..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 12b910425bf5..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644
index d73fa82ff1c0..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index f451e707f40b..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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])
-