gentoo resync : 30.09.2020

4 files changed, 39 insertions, 7 deletions

diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 5c743553dead..b5e35fde0bec 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1,3 +1,4 @@
+AUX aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch 1454 BLAKE2B 882ead67d2fa49ba8e44a9d0722912cb1cd7723dee05c03972df8a24ef34621adad3d8c14ddd44236c1afd3132d98367b27132260b8f68f371ed6340de43ef1b SHA512 d3c0c46ef67874980436e1e29e98f39ce0bdbf3d351464d69d99a3ffb0bbfb5055807c99a6f47fec3f26874ac6641d474bcefd354807e7cf36033422f1ebee87
 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
@@ -14,5 +15,5 @@ AUX aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch 1243 BLAKE2B f6ecdfae
 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
+EBUILD aws-sdk-cpp-1.8.46-r2.ebuild 8427 BLAKE2B 5d0fdb32e9f035fb77991dc3c31b94ad4dd506e44226d023ab3e7d932b7d6f64575baf3165293b2c964bb63a7517fc81a450dbae940003594fb2404c5b883f73 SHA512 4528cd4e62686d6a54cb96366c6bb1e50e1b1cd9ac34d5a88b7f24ab4e1094bc8df5381264c9f44ee6579f80373b1292e6b2f548ebb7deff8d051fd718dfed48
+MISC metadata.xml 23852 BLAKE2B a36bd66ac6baada3f9cb6926a642fdaae54e2ce1b4f577b4b91913d6d2e0529aceac4801c80a8462aebe72b6750d2d4f4353e979e2f6dfa55a8aee4b871fc10b SHA512 c0ce3534d965630881d4a306dfcb243aa241e1cd6d7fe3f21f062ce2f29222b5bcac20cb50b93b15a5c4cfcdd69c9b5511bf9eeea1b7785ca2dcd9325c57dbab
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-r2.ebuild
index 2ac7c4ce7732..a2d30d7fccdd 100644
--- 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-r2.ebuild
@@ -18,7 +18,7 @@ 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
+	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
@@ -36,9 +36,9 @@ DEPEND="
 		!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
+	>=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=]
 	sys-libs/zlib
 "
 RDEPEND="
@@ -62,6 +62,7 @@ PATCHES=(
 	"${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
+	"${FILESDIR}"/${P}-remove_Werror_from_FLAGS.patch
 )
 
 src_configure() {
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.46-remove_Werror_from_FLAGS.patch
new file mode 100644
index 000000000000..9c8ff79e311e
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch
@@ -0,0 +1,30 @@
+--- 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
+@@ -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-09-29 10:19:23.102712472 +0200
++++ b/cspell.json	2020-09-29 10:20:32.195714931 +0200
+@@ -11,7 +11,7 @@
+         // CMake
+         "cmake",
+         // Compiler and linker
+-        "Wpedantic", "Wextra", "Werror", "xldscope", "Wtype", "Wunused",
++        "Wpedantic", "Wextra", "xldscope", "Wtype", "Wunused",
+         // 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
+@@ -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/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
index d9d348be77d8..632e0dfe1944 100644
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -206,7 +206,7 @@
 			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">
+		<flag name="elastic-inference">
 			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