gentoo auto-resync : 09:08:2024 - 11:04:52

3 files changed, 16 insertions, 1 deletions

diff --git a/dev-libs/dynolog/Manifest b/dev-libs/dynolog/Manifest
index d8fe34927055..764a27a00fe2 100644
--- a/dev-libs/dynolog/Manifest
+++ b/dev-libs/dynolog/Manifest
@@ -1,4 +1,5 @@
 AUX dynolog-0.3.1_p20230126-gcc13.patch 549 BLAKE2B ba45c5f8314cff93011b21209ab8f7ed6ad50cce254f27ca69a640db21a982e59ca580c3dd7e957a0231e7356a554de28f1a7ba9bd6e73bb216810e281a3422b SHA512 637d972a84c05fec703333b5d339050d0171e811673b1d8ffd6609e1b54b1baeca61cb4a6a0d3a1423c99ac6d211425c8e684712bc0847788138a83f7721ed80
+AUX dynolog-0.3.1_p20230126-libcxx.patch 578 BLAKE2B 763722f4ea2c199cededef4bbade034edd6c68ec9a501c4c5b8eb44d8fff11fc5dfeca3ba49f86deaf971b572f897bfdb4fe13b71d8a30d70c358ea737b82719 SHA512 71e64d8d1612223c20b3f3e999e9f5ea0be1c41ac9fc2c88e4c24cb0b9fb3c182bf7a88da7164d56436a8d01ac2f604fe9e1bb7295d08cc1bae68dc1fc94e0b9
 AUX dynolog-0.3.1_p20230126-musl.patch 1238 BLAKE2B 9aae6d8c053bab3639e849b614f37b45f3189c802205d1d97ff118c34d15468d7ec373c802d76804364dc76e939162d86b057db1a69c849a9990727a78ecf5d3 SHA512 7a18cbda096ae0f3a7dd59b4f34c2292a21d39e0ce020dd97956d316caccd3b67e9f2aa4a4f94cc9e8869a9943edc93391d3999684cd8c4ea5a0cf6e43750cf3
 AUX dynolog-0.3.1_p20230126-noWerror.patch 779 BLAKE2B 0fe81d2e75f6c891a4f3f2e6fe137a82e7fd92f64d563b4078383e225b98dcacc1ae94b3f213c485c6cc7925d8b1bb8dec810633f37972c3fe40c1de34af9e7d SHA512 7f4a35d57c4f4576ce3268437c9a9bd1d64ff16e31e71167e70f40c9de764f3270c621c40e195369c7236d4e269095333bf4f3492277f44ddc54b2d146f0aff1
 AUX dynolog-0.3.1_p20230126-riscv.patch 529 BLAKE2B dd58da903717c0d3337840567337978bc9996e8f05bb3b3362bffedfb31ca2d6104a9494a246c553bb0a18d8449733c6b342d6d3f787de644585dd14e3260310 SHA512 8aa050b9cf3cadbea92f547d481b1bc7a83864b0a0dd56891b2c4749253ae3a23cfe49103d8fc0c88912446b9dba86f7fb71a1955a898e9968bd9097f5a91ccd
@@ -38,5 +39,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD dynolog-0.3.1_p20230126-r2.ebuild 2408 BLAKE2B 584fb37b754726d98df698dfff3ebea1888cf350a4adb2dae5ae70b72ccd7c643ac381108e7ae739ced5d2cb0139329291e2e9afc2569678ee52061aa0463305 SHA512 a4f32f21883e854c7d569b450934cf74ec9cef3a9e1c383c929f95a7bdf7c37b60eeda8c69997f5ec3362f86acb355bfb74d20b5caee1d69cccf11c33f6e398f
+EBUILD dynolog-0.3.1_p20230126-r2.ebuild 2441 BLAKE2B b4f90016ba377fa212e43a7fb052f76a3c7ffb6834fe1f5f6e5ebee0125e571983b988551fd060c3489162578c78aa76726d282f1d6b525a4661667240134b1f SHA512 a50b061763cc346efa6e1bd13180f156ec4629472354a68041a7e4ee7ac2f0bdb4fb6033a30560317ac6ec75812f3a0e611f2c2f4a826ce10aa09dc7d4939fde
 MISC metadata.xml 338 BLAKE2B 0822b3b3d714781580cb971977d83cbfecc581ff88b42dd1cb964d7365b2f738c9a41c1f4cc3f3dd8240baa23c7d339dcd6b1a9169a97bd79aa92e5e838f892d SHA512 5895f072dc775f8d871f19d987869c015b5a2412af0636a7d9caf1c10817a67c9126eb9f56d86e22be1c75fc165ac6c348010e32cfdbaec32eec73f827af7be2
diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild
index 806fe0946869..0df5a58659f9 100644
--- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild
+++ b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r2.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-noWerror.patch
 	"${FILESDIR}"/${P}-riscv.patch
 	"${FILESDIR}"/${P}-musl.patch
+	"${FILESDIR}"/${P}-libcxx.patch
 )
 
 CMAKE_SKIP_TESTS=( "Defs.CpuSet" "KernelCollecterTest.NetworkStatsTest" )
diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-libcxx.patch b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-libcxx.patch
new file mode 100644
index 000000000000..64e51ae8c633
--- /dev/null
+++ b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-libcxx.patch
@@ -0,0 +1,13 @@
+dynolog mixes high_resolution_clock with system_clock, which is not allowed
+Upstream PR: https://github.com/facebookincubator/dynolog/pull/276
+--- a/hbt/src/common/Defs.h
++++ b/hbt/src/common/Defs.h
+@@ -40,7 +40,7 @@ template <class TStream>
+ TStream& LogCtxt(TStream& oss) {
+   oss << "pid: " << gettid() << " on ";
+   // Put date and time.
+-  auto p = std::chrono::high_resolution_clock::now();
++  auto p = std::chrono::system_clock::now();
+   auto t_c = std::chrono::system_clock::to_time_t(p);
+   oss << std::put_time(std::localtime(&t_c), "%F %T");
+   // Put microseconds.