gentoo auto-resync : 30:10:2022 - 15:03:33

4 files changed, 5 insertions, 14 deletions

diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 078d8d2b040c..77e7e7c940b8 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,7 +1,7 @@
-AUX abseil-cpp-20200923-arm_no_crypto.patch 1038 BLAKE2B 2443144b968f22e29503fb4a58ac45b623c104d298445b68b5ab34a5a08a5398a9b16cf6563e3127dfc4ba7ed211d53c2e1fb8f72fb120749065dce77fb67158 SHA512 5e2c192379d7190d97065973861d76e3680728a2e723c7cfb8b9ead4e02c94c3b12061c75f2f619cf1c9c217c3f29eaa36b59ff73e23417bf56f600a97128ff3
+AUX abseil-cpp-20200923-arm_no_crypto.patch 1040 BLAKE2B f46ebc05b370e8ecfdaf0a6b409fd08c2a384eb16224709802d7a9e84f038ae0ab51c4638297ed3abb9f6dded86833b710871d3f38d33de4843d5dfcdc149d03 SHA512 fea33008cdab6e229b074f6683f3f688a59d291038d89d96a62e91fee571cc885baf84b8a1435b8f757bb26a2a65b8383b49c874c9e472d229d14b259de874df
 AUX abseil-cpp-20210324.1-glibc-2.34.patch 720 BLAKE2B d24511a6b929d8bc15fce316f46ce6a3f8686357f72d97f2ebc8365ac04cc93afbf801c24ad8a488a4cbefa615ddc3141ccd25890b005bfba8e53e45276ec664 SHA512 05e53e5175328c2907a346ed01163bf8d0c6d51ffb85c58aeed507ca10444fde29adc86dfd259f9cbaafa35aa6723f531fdf05749b6c1248f094ed672d74fa14
-AUX abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch 2439 BLAKE2B 7640ea553046a8935b173d2043dbf2cd0fc26c4918fed0387f8cfdb924a897dba6b25165d154a9bc351d44dd01b971cbbe2705745eaecc432beee32030fa66df SHA512 ab0461284e0e3a1e40a3bf727d52ca6a6fa77b1cb36565cd7466aaba8064522195f0e22217603f4ceb304eb75170418e3fcb5e3a114c58aab29f46a33ad1f99d
-AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 866 BLAKE2B 18c6ebc915080d4851a13763c30f9e3edc8224640546ac0b4cbc26671498bca2b69f55628ec889b00be76ba7a6246684c6273eaf00a967b96faa42c6882afa2b SHA512 b56cd0bd7accd243c0a8b0b759fb1e0c51e6167d8a9882513ed2b21760414b3f3dd329f5965f4c914b16f6d2a2ebe5c34b469401432e2914b5a10316f86a6be2
+AUX abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch 2138 BLAKE2B c52ca02f2cdfe8a843416011f171a1e957321e1a75f2e7f06aaf1591b2144731a6db0c2d65f400af041d25319d5fcce4cbbab75373260719633d82e63e96e665 SHA512 5a9f0a0289a2b7d808fe64cbd4e9bc02a78b50641314a510f66e90bb5f2bb3be9287f0892c93263a914ffa216916a0a154b2631f502b51564a90fb5294257711
+AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 741 BLAKE2B 22bc89e5b0edbcfcb4d4c7552e591d43742f399e6939b8dbf80c8c40e8ba46076265a374dd3d889a77ba9ab4ce747803aa031fe631898d9d90f3a6a30fb88023 SHA512 a4924d9e95c1ec8c1f31a1ead48063a7a6d6295bfa4dbe6ad3902c459e23973e75ec961eeb4ba6c17518cf48d7edeff315e65d0f5c6d3d6f07154127f370977b
 AUX abseil-cpp-20211102.0-r2-gcc-13.patch 951 BLAKE2B ad2a13d2260d7cfdfe95b07f1582bbf5ce627d8d8bf1e32b70834611065359b95d17b198c2b0aef70ff353dc289903c70ee9be95d40ef38f75c1872f08987eb1 SHA512 73aae8c3c90d87da47a8a37b68721fa06f44abcf02e829fecdcc076999f420a513005e946662bfeb073cf19a06916b1b400b3f35811ddfbe9b0fde75b4d87a53
 AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b67e70ced0ebdbf3e2682c273d7022b024a92fedc8d33c781bafe167675a6a1cd592dbaf915c4031e6dca6aca2513451717cdc8 SHA512 d77e896e145e71b96be32779adb12cbaeabb3a69e5e57a0f47fdf428baf3b6ea22484e9a02979bf15f839417b13e74d0629a6d7207ad0bfa4f44eb9e1eb82867
 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
index 762476a10184..d9e9963f5bae 100644
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
@@ -5,8 +5,8 @@ extensions (by passing -DABSL_ARCH_ARM_NO_CRYPTO). This could
 be done by the build system instead in future.
 
 https://bugs.gentoo.org/778926
---- /absl/random/internal/randen_hwaes.cc
-+++ /absl/random/internal/randen_hwaes.cc
+--- a/absl/random/internal/randen_hwaes.cc
++++ b/absl/random/internal/randen_hwaes.cc
 @@ -50,8 +50,11 @@
      (defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO))
  #define ABSL_RANDEN_HWAES_IMPL 1
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
index 45a9fc5406e8..0933c62660a6 100644
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
@@ -25,13 +25,6 @@ Our Linux CI does this, but for some reason was never enabled on macOS
 PiperOrigin-RevId: 425668638
 GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35
 Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea
----
- absl/container/internal/inlined_vector.h |  8 ++++----
- ci/macos_xcode_bazel.sh                  | 10 +++++++++-
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h
-index cd34a413a..2baf26f3e 100644
 --- a/absl/container/internal/inlined_vector.h
 +++ b/absl/container/internal/inlined_vector.h
 @@ -925,8 +925,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
index 59efc0f321e3..28347d489c17 100644
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
@@ -1,5 +1,3 @@
-diff --git a/absl/strings/internal/string_constant.h b/absl/strings/internal/string_constant.h
-index a11336b..e1596b1 100644
 --- a/absl/strings/internal/string_constant.h
 +++ b/absl/strings/internal/string_constant.h
 @@ -35,12 +35,18 @@ namespace strings_internal {