gentoo auto-resync : 23:11:2022 - 01:07:24

4 files changed, 4 insertions, 110 deletions

diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index c3e2f2172b9e..0e593156fcae 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,10 +1,9 @@
-AUX rocksdb-6.14.6-libatomic.patch 2994 BLAKE2B cac08dfa6fd490645e341148701ba0372aa97f76c84010e3ed94e3aa3a501762c7b2ea09cccc9e895912204e79d7430694b5ab7302fccb7b25f1c7f2ebba4afc SHA512 9f3814133699d7069ebff35b0513ad113a744d7adf21d7ec1d7975fc4fbd114430618760fd38dea69c6948dbf1dc4f5a994f7b347b40423c0244d2867276e448
 AUX rocksdb-6.17.3-add_timer_for_riscv.patch 1647 BLAKE2B d1e78c98149f534ce8d02754f5e15b5aeccadb99cf82586bd24c44c68aef5134bdd5d00f5f81699bae59f27ae9f565f40069afedba081f7a76ec54d90a37462b SHA512 ebcf6c5df091860bf53edf54af47678e90da251f28d0ed46be7ac1cf32f50528f8185e94d82ec770c97aa23d24dfcbba634ffcf2671a5dad5fcfd6104115bb69
 AUX rocksdb-6.17.3-libatomic.patch 2131 BLAKE2B 2f12fee9b062cf4bf633d784bd4234a1076d0b763f85b9ab0332c828661674944251098e7784b07118e95aa2f4729360cfe3b7b0c95afe58772ea0d3579afd96 SHA512 4717fb67b322f34a2fa351eac1d8fdcbf239acedefd8bcb69c07f11f472f0adc8579e7ddf01be6ba9239009f81d8df4b1cbfb1b88e996ad63fc1d3ff8b801526
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d072ee4de1f2850628854af4b5672ff7072ab5c41de84bca9ad0713a1eea7ad7c5cca5ba9b3b96c4bd492a01b5e859 SHA512 c0918fd48bc1e57be9e30452c5cd0c2ba627a15012ab6922404d6cddffdf80799e4442b14d03cbe13a9a9acbdf1736c505cc6f5406efefbf68aba71ec05cf5f0
 DIST rocksdb-6.17.3.tar.gz 6651009 BLAKE2B c032bdf61d93a35e84c65146ad6d1f8639e9f36a323c142fe4131b501051bfb9c4c4edb13b69c86e35740117029996bb4c94887ea690d1957926bdfd347c744a SHA512 085adab94b7eb22859b4119b0356f148231800413571e932a7248967b1866d40a0be4b8265f2a9c6c21c600d3b2254c36e64ce7851171ff7c439a17306a84981
-EBUILD rocksdb-6.14.6-r1.ebuild 1167 BLAKE2B 689f94d975baa644daafcd5b004f283a662d0f2b277b4564795a78655e3ba3b58ebc0fc32e5f75970759540bbaaa951e4ac7e7c322c027985fe9dc38294048f7 SHA512 58c533f43c56a5a72d6eb6b8232acf57b480b6f96abfbeb05dd3101564efcfe003c4421a9c84b9079a5c6a042193849aba59369e6764f321c08d75d13a36bdd3
-EBUILD rocksdb-6.15.5.ebuild 1159 BLAKE2B 310b58288ce4cb2aafca99d6f332b7edea4857830709d7aac0286aefc6d5855247edfa244e7dff1f89dea8835ff6b4ebb9d6eca79efe51344225cef6f2f4fe25 SHA512 fec43421218ae9233371703311adcef6920bd43715b573443cd01ab4f1f1766ab907b332aa84b8d729cae35e9f352b79813172d9750be337ee6b85b079a7bc22
+EBUILD rocksdb-6.14.6-r1.ebuild 1167 BLAKE2B 5a363861d7ee4bd6288b5720d4742a9acf65b0935a3fd96caadf70832e9a1659678bd2b3adf7098c9b291dca5122e67fdb05977e4b6334dd4bd94871c4b020d4 SHA512 3b3f8595b2a376a2c09c6595c38c7f53ee0011b8535ab7b4cfafabe270ff830c98d390dde7d1e8c5a54a615ba2e298b66fd69aad2e7036ff705f12e91b80c00c
+EBUILD rocksdb-6.15.5.ebuild 1159 BLAKE2B 044f63cea6a65d2e4edd7a16eea61c8bb77faf346443ecc1b7d9e41747a7fe52a1bd45d3663acde188fde63405be75927c550b471dbf05f5ed1a29c39d529bb3 SHA512 9d4a7374293868883600b82ab4ddd0e0928aa7eeb6bda56845376f4fb93cad80e7d2a44c45297a13110756e48409a67e85ae7a6b49d813b0e0e34ccf2e0bd065
 EBUILD rocksdb-6.17.3.ebuild 1220 BLAKE2B 75e7df60533eb9793f8c5a95f795a2b7c47097624ce7f8bf7b5c3648f3cd71a09625a6ab25ebdcd38e7152c00fc174eafe25af982cff30c8b8b96da555977e29 SHA512 2d739631429ad720c697082b45ed6fa4e622fc1ac20c975a93a19142a9eca0db2a39bb786a81906177c3063096baceed23efb1570b7192cf5324ed28823d3990
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch b/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
deleted file mode 100644
index 27f17aab8933..000000000000
--- a/dev-libs/rocksdb/files/rocksdb-6.14.6-libatomic.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 38d79de10da65d234c70cbb36c24c58d189f76db Mon Sep 17 00:00:00 2001
-From: mrambacher <mrambach@gmail.com>
-Date: Mon, 12 Apr 2021 20:06:57 -0400
-Subject: [PATCH 1/3] Add check to cmake to see if we need to link against
- -latomic
-
-For some compilers/environments (e.g. Clang, riscv64), we need to link against -latomic.  Check if this is a requirement and add the library to the third-party libs if it is.
----
- CMakeLists.txt | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 984c6197cb..460d350054 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,7 +312,6 @@ int main() {
-   auto d = _mm_cvtsi128_si64(c);
- }
- " HAVE_SSE42)
--unset(CMAKE_REQUIRED_FLAGS)
- if(HAVE_SSE42)
-   add_definitions(-DHAVE_SSE42)
-   add_definitions(-DHAVE_PCLMUL)
-@@ -320,6 +319,26 @@ elseif(FORCE_SSE42)
-   message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
- endif()
- 
-+# Check if -latomic is required or not
-+if (NOT MSVC)
-+  set(CMAKE_REQUIRED_FLAGS "--std=c++11")
-+  CHECK_CXX_SOURCE_COMPILES("
-+#include <atomic>
-+std::atomic<uint64_t> x(0);
-+int main() {
-+  uint64_t i = x.load(std::memory_order_relaxed);
-+  bool b = x.is_lock_free();
-+  return 0;
-+}
-+" BUILTIN_ATOMIC)
-+if (NOT BUILTIN_ATOMIC)
-+  #TODO: Check if -latomic exists 
-+  list(APPEND THIRDPARTY_LIBS atomic)
-+endif()
-+endif()
-+
-+unset(CMAKE_REQUIRED_FLAGS)
-+
- CHECK_CXX_SOURCE_COMPILES("
- #if defined(_MSC_VER) && !defined(__thread)
- #define __thread __declspec(thread)
-
-From df7fdd69ac19f26601a80e35f70ec51913838a6e Mon Sep 17 00:00:00 2001
-From: mrambacher <mrambach@gmail.com>
-Date: Wed, 14 Apr 2021 10:33:47 -0400
-Subject: [PATCH 2/3] Reset CMAKE_REQUIRED_FLAGS after compilation checks
-
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 460d350054..5d167855a7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -296,6 +296,7 @@ else()
- endif()
- 
- include(CheckCXXSourceCompiles)
-+set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
- if(NOT MSVC)
-   set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
- endif()
-@@ -337,7 +338,8 @@ if (NOT BUILTIN_ATOMIC)
- endif()
- endif()
- 
--unset(CMAKE_REQUIRED_FLAGS)
-+# Reset the required flags
-+set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
- 
- CHECK_CXX_SOURCE_COMPILES("
- #if defined(_MSC_VER) && !defined(__thread)
-
-From 4793c5c75351d5d7c609c27d0243c2138729c7b0 Mon Sep 17 00:00:00 2001
-From: mrambacher <mrambach@gmail.com>
-Date: Fri, 16 Apr 2021 08:53:48 -0400
-Subject: [PATCH 3/3] Fix lint warning
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5d167855a7..558b985073 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -333,7 +333,7 @@ int main() {
- }
- " BUILTIN_ATOMIC)
- if (NOT BUILTIN_ATOMIC)
--  #TODO: Check if -latomic exists 
-+  #TODO: Check if -latomic exists
-   list(APPEND THIRDPARTY_LIBS atomic)
- endif()
- endif()
diff --git a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
index e35631d5477c..3ec9e9aee852 100644
--- a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+	"${FILESDIR}"/${PN}-6.17.3-libatomic.patch
 )
 
 src_configure() {
diff --git a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
index f583da0da773..cb835069c451 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+	"${FILESDIR}"/${PN}-6.17.3-libatomic.patch
 )
 
 src_configure() {