gentoo auto-resync : 26:04:2023 - 06:14:16

3 files changed, 75 insertions, 1 deletions

diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index 52961cba0b26..f70b15c106a0 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -1,7 +1,8 @@
+AUX doctest-2.4.11-backport-pr770.patch 2746 BLAKE2B f82437dfc44151b4b155a3e800824247356f666e6d80342096d91f07cbe351198e78b2e4cf6fc23091947ada9b518c4c4fc8b9f0cf56546acb36351ef0e06c40 SHA512 cf4464f9ff66520c4e0b413849d98b775772ff5e039b3921f6165a218f40642e62a5a79ee8e9c7fce3d27bb0a9ff61ccafb075eff82abb35e6950a2abcc94773
 DIST doctest-2.4.10.tar.gz 2297167 BLAKE2B e6d2af9dc9207a1a5d86ebdad16f29a4c4d860334e75f79ded596bf181ff0c334895b5606710993eb9bb1d8c76359063b5ce5c7faa5c371a4315ac53275783e5 SHA512 f3d7c5c45b12a13b5df359727328a519f7a17c92ab868274c8c89e58a573c886ab8da9213ed31634b62a9c92e792e721a71fcb42a3d483b6dff5f6ef7bb03d41
 DIST doctest-2.4.11.tar.gz 2183312 BLAKE2B 277f22f3a9e275dd9f5cfffeeaf8346577223c2b872606f21fe5b8462573917a59a88bb61de145a92be61129396f9b4a87d94f4723e362428b1bd856ed84fcfb SHA512 04425686057079d3f1a6f767c487f1953050f553dbff9fc42b42dde1358fe26e46bf6219881bbfce625f15cb9c229474d82688120eb2cb2b1d8138db0cc91b3c
 DIST doctest-2.4.9.tar.gz 2292632 BLAKE2B 7d501eede5a2311117a04a11da5b518fcac4de53a73ba7b14f47395a759bc5d708438f25df61053a16a256ffcdfa37500a6892ef0890aa4df4d9f23533bfb18d SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb
 EBUILD doctest-2.4.10.ebuild 687 BLAKE2B e35385d2c8b0a748c1d98be01c207816e6bc3a057aacfd292a6fb6d9b1e844f3e729aa4c3b3d618ae3c1bae297fca495e25b7243cb021f1586ec67b305187f48 SHA512 a473db364467a1b54c59a081b530acb8f82978b43a56b1d9b35639c18f055081edc5a6090be780c598d3d881348e5629d1cb16773630e09545e54e0bb3b754a8
-EBUILD doctest-2.4.11.ebuild 693 BLAKE2B d9b642d8d1b0600ee53d7209816d69b28069425307cf061be1f2bc424a483393534277551641f4c9a523310be981f012dbf6c4eab4f41890569a904bcc046bff SHA512 430ba116cb742db60cd98f92a9185b67ff274e691be4f9f193b56fcfcc18c24446d7b509304afbcfa7331bf99d754ce50ebfeff0d9bf62ce6c2a30d23b1a6dda
+EBUILD doctest-2.4.11.ebuild 753 BLAKE2B 9d9699e5213786dd83d5a8fb9602bd12067be8ed4e684e53f0de70530a34da052d93dce41646b0f4213f3a920c453f491ab3d61629cef9f47a2da2644aa0b90b SHA512 f083172f532ffb09fcee45d7c7574abd59c35218f4cd4b27f1720def612d3842606ee108d3948051d0e8ada997d4c7ecf5074939296b7660b7d409b4dcdf88ef
 EBUILD doctest-2.4.9.ebuild 587 BLAKE2B eeaadb18066ff1f52907d6fb01625d72996e1f715640adc080b7f0d88ed9623d65f3baa9945657ea0991da3ca2e14ff518e846de272874e8f1de07577a0b205e SHA512 c16ece60b5c19a7b8c58fcc888942ffd6886f3c71154603df44d38cc491e6eab8bd17eacb20e29a6b4715ad71af48099a5b80e76b001dc8425be075686540dee
 MISC metadata.xml 471 BLAKE2B 530d91c53109b2e99bf3b5ef79fb1343f1cf37bc48aaae35da5468c304c8a2e38c439e79a43c139b5dca5dca8dd9231e7a9020b6f1f12d2074d92b95542bbf31 SHA512 5d143f4ba813a3de07351c5e45cec1aa66d395806fdbc9a04151c0adf1c74dff8192b7993d767e2e82da54090f7c3948ce33c747d6bd030333fc35329203083c
diff --git a/dev-cpp/doctest/doctest-2.4.11.ebuild b/dev-cpp/doctest/doctest-2.4.11.ebuild
index fa399178375b..c3a3b788415c 100644
--- a/dev-cpp/doctest/doctest-2.4.11.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.11.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-2.4.11-backport-pr770.patch" )
 
 src_prepare() {
 	sed -i '/-Werror/d' scripts/cmake/common.cmake || die
diff --git a/dev-cpp/doctest/files/doctest-2.4.11-backport-pr770.patch b/dev-cpp/doctest/files/doctest-2.4.11-backport-pr770.patch
new file mode 100644
index 000000000000..eb1f8625d34e
--- /dev/null
+++ b/dev-cpp/doctest/files/doctest-2.4.11-backport-pr770.patch
@@ -0,0 +1,72 @@
+https://bugs.gentoo.org/874345
+https://github.com/doctest/doctest/pull/770
+https://github.com/doctest/doctest/issues/711
+
+commit 1ffb66bff7533f7ea42d801facf1b87d72621ac5
+Author: matoro <matoro@users.noreply.github.com>
+Date:   Sat Apr 15 11:15:25 2023 -0400
+
+    Add sleep of one clock-resolution to test which should trigger timeout
+    
+    Fixes https://github.com/doctest/doctest/issues/711 under HPPA, and
+    partially under alpha.
+
+diff --git a/examples/all_features/CMakeLists.txt b/examples/all_features/CMakeLists.txt
+index ebc75c2..4556227 100644
+--- a/examples/all_features/CMakeLists.txt
++++ b/examples/all_features/CMakeLists.txt
+@@ -39,6 +39,12 @@ set(files_all
+ # add the executable
+ add_executable(all_features ${files_all})
+ target_link_libraries(all_features doctest ${CMAKE_THREAD_LIBS_INIT})
++if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
++    target_link_options(all_features PRIVATE "-rtlib=compiler-rt")
++    if(LINUX)
++        target_link_libraries(all_features "-lgcc_s")
++    endif()
++endif()
+ 
+ # easy way to fix test coverage - disable colors and crash handling
+ target_compile_definitions(all_features PRIVATE
+@@ -124,6 +130,12 @@ function(add_test_all_features test_name flags)
+     add_executable(${test_name} ${files_with_output})
+     target_compile_definitions(${test_name} PRIVATE ${flags})
+     target_link_libraries(${test_name} doctest ${CMAKE_THREAD_LIBS_INIT})
++    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
++        target_link_options(${test_name} PRIVATE "-rtlib=compiler-rt")
++        if(LINUX)
++            target_link_libraries(${test_name} "-lgcc_s")
++        endif()
++    endif()
+ 
+     doctest_add_test_impl(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}> --no-skipped-summary --no-version -ob=name)
+ endfunction()
+diff --git a/examples/all_features/test_cases_and_suites.cpp b/examples/all_features/test_cases_and_suites.cpp
+index 13b316d..d87f2fd 100644
+--- a/examples/all_features/test_cases_and_suites.cpp
++++ b/examples/all_features/test_cases_and_suites.cpp
+@@ -2,6 +2,12 @@
+ 
+ #include "header.h"
+ 
++DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
++#include <chrono>
++#include <ctime>
++#include <thread>
++DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
++
+ static int doStuff() {
+     int a = 5;
+     a += 2;
+@@ -46,6 +52,11 @@ TEST_CASE_FIXTURE(SomeFixture, "fixtured test - not part of a test suite") {
+ 
+ TEST_CASE("normal test in a test suite from a decorator" * doctest::test_suite("ts1") *
+           doctest::timeout(0.000001)) {
++#ifndef _WIN32
++    struct timespec res{};
++    clock_getres(CLOCK_MONOTONIC, &res);
++    std::this_thread::sleep_for(std::chrono::nanoseconds(res.tv_nsec));
++#endif
+     MESSAGE("failing because of the timeout decorator!");
+ }
+