summaryrefslogtreecommitdiff
path: root/dev-libs/spdlog
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/spdlog')
-rw-r--r--dev-libs/spdlog/Manifest17
-rw-r--r--dev-libs/spdlog/files/spdlog-fmt-10.patch121
-rw-r--r--dev-libs/spdlog/files/spdlog-musl-1.2.4.patch30
-rw-r--r--dev-libs/spdlog/metadata.xml4
-rw-r--r--dev-libs/spdlog/spdlog-1.11.0-r3.ebuild55
-rw-r--r--dev-libs/spdlog/spdlog-1.12.0-r2.ebuild2
-rw-r--r--dev-libs/spdlog/spdlog-1.12.0-r3.ebuild2
-rw-r--r--dev-libs/spdlog/spdlog-1.13.0-r2.ebuild2
-rw-r--r--dev-libs/spdlog/spdlog-1.14.1.ebuild (renamed from dev-libs/spdlog/spdlog-1.11.0-r4.ebuild)14
-rw-r--r--dev-libs/spdlog/spdlog-9999.ebuild2
10 files changed, 21 insertions, 228 deletions
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 6c3dfc4e3291..306ef1f9c1a9 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,14 +1,11 @@
AUX spdlog-1.12.0-fix-tests.patch 554 BLAKE2B 233cadf694bbfea4aa538d3b1f5241682aaa74fccbcce94441180f5ce3374332ac77ae6c08461a118861924d84056d2075fcd8fcc7beccc81e41b1101909e223 SHA512 b78640666c940ac49f0db375544c22b6778a8e2c38208530c7a8b2fb7ed70526a212efc49a94f3498b82f9681039e97c304f956010c16913ca052369dbe56935
-AUX spdlog-fmt-10.patch 5199 BLAKE2B 1e2593faf291f2f366897fd2eb1764b442627a86ced6195454f283e9e2a17807386f55d5c33f31dccdabcda0bf4bd6aab60388a4f6cc281e3506344984a90a3e SHA512 8af2a62939eb39de667af8d7082230b696243510648577abc786ea5b8e9ee87a830e2e5972bc92431c692cd508c76eec592374b1fa599dea4cd52ac0dbfd4496
AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
-AUX spdlog-musl-1.2.4.patch 1428 BLAKE2B 22d1c0ada761c52f29e1a4dff0c16140741d78f878d14fc78fbfde9dbf7a73fe08e3b0bfa22c9e0ccfa4f631459bb6349c6a33f0e6ba5f646c2e56e731831bbe SHA512 8cc281e126eb0246a13880487a667e8672eb190810698b0737dd1211153e3b158e13a0bba8c57f8e72f5f3f0532b856c9ef9ab6c5825c694cb96c02877a73151
-DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf3967cfbd619234ab0ca2d0c15bddb27b73ce43c33623d02fb046f621933cd52cf39f377f354182d9cdab33340f28 SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
DIST spdlog-1.12.0.tar.gz 251037 BLAKE2B 3170f1e680fc4652ed8ddc0f74627aec22149f028def599fc5ed4db3a942d840006963789577f2e3df0e2b8ca1d98a881f3b96be5e1174fdf0acea15b3676d6e SHA512 db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d
DIST spdlog-1.13.0.tar.gz 264003 BLAKE2B 8ffeec847f082a0932f406ab44b4653661fdbe95a15f7b736367ee6d8f45ab36ca2182a9e9c6fba5c0688ab5436c16932b130541a8532cc2e5f4980e6340b929 SHA512 44fcb414ad9fbbe2a6d72c29143eeeae477b687ed30ae870d661b032a029ad4214ef43e7ef6350d02791d05504492978ade2d6733fab12ce4884d8f0bc4c6340
-EBUILD spdlog-1.11.0-r3.ebuild 1066 BLAKE2B 2f9e5013ded134257381f8be7a545677ff1950018cbee2d6e56a1c668890c0d5c2a1f606473cfed9858155ee1e7ba15fc147bd0c0a2f54480be35d58525989ab SHA512 07fa9eb7b51213654f012761aa0d3c107499bcf9f07371b5fdfcccfefba5d378cb825bea61c618c8284759091030cd995fc454e132b541c8bf95cad043d78689
-EBUILD spdlog-1.11.0-r4.ebuild 1180 BLAKE2B 1553c6ad46a09283746e4b4e4c62f28e50e1f5a8af44fc40b20da9cdd0ddb0ed25095454ca22edb9b6ed2303b14d0bd92ce27401a9731a041af99bcf14e5936a SHA512 490b12a8cc566e7fec04b528dcbeb035a1a5ac62068c11a41fb106ba0125b4ed8a0cc5fe12a13bc74cc4e591505ca4bbef9e292b3d47d2d6de1f3f468f540696
-EBUILD spdlog-1.12.0-r2.ebuild 1106 BLAKE2B 3c56c2e447e6812acbaaed28f1544501a23a60b8a398f4172af6ba03b1564bb2211120eee98353d5b97fe11a2ee28c8b4dfa756171170e55cf89f0ef2a3dbb59 SHA512 fc12e864b6d4d4b159fb61572eadfb7872aab7108621359a277e872268511c5e48bc2cb10feb1b29b1f3c8f8ec3baae4be98cd176b50c513f81f05494b6b5a41
-EBUILD spdlog-1.12.0-r3.ebuild 1190 BLAKE2B 24771d7f021dbdf6fd70ef37c567fb8da71ff62bcb1b3e6c5a1f981deada76453a4d8a1c518948ae44b06acd242bc33397eeaa63495f91b2efd74722276cb1df SHA512 394c5a964278fcdeb199956fb37c1de9d23727d59733f4f35ec603b5759093f41815c24fe33990a77cb0d7ea2fedeea8fe4f7ae48c38bd5a7496bc3cb7d491f4
-EBUILD spdlog-1.13.0-r2.ebuild 1154 BLAKE2B c15cb279b3eec7d6fc2df15ad7e2053bf0377b2599a1843679e1811aef16c87bdc91d77d59e0bfcdbea4ff5841d7ad38b8150051b1ee20656f9d72fad3b15e80 SHA512 26b977f7e86e887249481022a50ff03e7950fecf5e473ddd04e908a2b21925b27edab6454582eed87fb467ceb7166fb5574ea987340683f4311c60a3700493bd
-EBUILD spdlog-9999.ebuild 1154 BLAKE2B c15cb279b3eec7d6fc2df15ad7e2053bf0377b2599a1843679e1811aef16c87bdc91d77d59e0bfcdbea4ff5841d7ad38b8150051b1ee20656f9d72fad3b15e80 SHA512 26b977f7e86e887249481022a50ff03e7950fecf5e473ddd04e908a2b21925b27edab6454582eed87fb467ceb7166fb5574ea987340683f4311c60a3700493bd
-MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
+DIST spdlog-1.14.1.tar.gz 270896 BLAKE2B 70ac5142acfd765c649f2e34286bae3b5082db284dd1ca7c3d7424a53dd658f7d308bef0b5e0c89192fc3931f1fe5efdba91e460c7b3df836dffc22b66f821fa SHA512 d8f36a3d65a43d8c64900e46137827aadb05559948b2f5a389bea16ed1bfac07d113ee11cf47970913298d6c37400355fe6895cda8fa6dcf6abd9da0d8f199e9
+EBUILD spdlog-1.12.0-r2.ebuild 1100 BLAKE2B 151b93e91f8a474e7c69ac4d231424ab424be4df432ccf0ad00c0a89bbfa9d4c604e14767f67ff41e513dd770580155db2cbe2b933bc23854c91948e5279e8c4 SHA512 892a5c4c0ae4e46b9b1bd28ff3b4c090198ad7dd36cbf0361169f636975f36cf9151d50c21576c8251c7006af37d8dac90d77d42ff2dea8ffb2ca99207757ac4
+EBUILD spdlog-1.12.0-r3.ebuild 1184 BLAKE2B e0f69a6ebbf36e1c6fd743a3bb7025750f47bf47f54b5eaa441f42d0c55fb5a258fc60d3e1a374041d2225873dfda3e0d2db7dc5403e29a2b6318d53d36337c1 SHA512 b59aa9a7077f5a6426f9cc1fbe336937f572f886999c095c1f198f54e4c3899be7bda61aed49313de9f7185b9e4784783449ae86b493ea74732e8cc97816ea36
+EBUILD spdlog-1.13.0-r2.ebuild 1148 BLAKE2B c05d4caa5a789fe2bf54195224f9360c4b473e8b2a433791089a4e99d12081bff664457b51c3006536de953f753871786570d8d12d9d27115c6cbdeefffcde77 SHA512 88869a4cf396b4e9841a1b5f0639daa3eccb346b93159f07405e0dd34c13252adee0ef44fe8fa9cb121dbffcaa3780573938d13b1e4e4c8464d7e3bdef5b5252
+EBUILD spdlog-1.14.1.ebuild 1138 BLAKE2B 03e3fe3ae1a03b094be2efc798783706155bd6437cca3ccc09e2757d5bf1013f368d3c7403725352107abf8c8a9dce0da37f5988417f6bbf3cebde482b2e40ef SHA512 4f7bf562caa84f1472edaab0dda5c704cbbb447f19574ff96e4e9ca6e904368f1015da8f688636b40f71ea45b00865d3bcaa1b7efc3082b7587b7d2077ae0777
+EBUILD spdlog-9999.ebuild 1148 BLAKE2B c05d4caa5a789fe2bf54195224f9360c4b473e8b2a433791089a4e99d12081bff664457b51c3006536de953f753871786570d8d12d9d27115c6cbdeefffcde77 SHA512 88869a4cf396b4e9841a1b5f0639daa3eccb346b93159f07405e0dd34c13252adee0ef44fe8fa9cb121dbffcaa3780573938d13b1e4e4c8464d7e3bdef5b5252
+MISC metadata.xml 615 BLAKE2B ab757ecbeac9856b7cc207e721f93bf96edd010dcc7a3e71a28e15809e1973a52ade211133302cd19378016c2384daacef574334e2d50afa8a950c210f69d1be SHA512 ad2a893a3644ac81cbd21c89cadb9676e4fb5024a706ecdc21356012a2981eca9729f8e066b4dcb34be95995c7984f1061f8007171b2d8c46953207ee71a91f0
diff --git a/dev-libs/spdlog/files/spdlog-fmt-10.patch b/dev-libs/spdlog/files/spdlog-fmt-10.patch
deleted file mode 100644
index 5ee44c41ea6a..000000000000
--- a/dev-libs/spdlog/files/spdlog-fmt-10.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff --git a/include/spdlog/sinks/daily_file_sink.h b/include/spdlog/sinks/daily_file_sink.h
-index f6f1bb1d..90af9676 100644
---- a/include/spdlog/sinks/daily_file_sink.h
-+++ b/include/spdlog/sinks/daily_file_sink.h
-@@ -13,6 +13,9 @@
- #include <spdlog/details/circular_q.h>
- #include <spdlog/details/synchronous_factory.h>
-
-+#include <iostream>
-+#include <sstream>
-+#include <iomanip>
- #include <chrono>
- #include <cstdio>
- #include <ctime>
-@@ -46,46 +49,15 @@ struct daily_filename_calculator
- */
- struct daily_filename_format_calculator
- {
-- static filename_t calc_filename(const filename_t &filename, const tm &now_tm)
-+ static filename_t calc_filename(const filename_t &file_path, const tm &now_tm)
- {
--#ifdef SPDLOG_USE_STD_FORMAT
-- // adapted from fmtlib: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/chrono.h#L522-L546
--
-- filename_t tm_format;
-- tm_format.append(filename);
-- // By appending an extra space we can distinguish an empty result that
-- // indicates insufficient buffer size from a guaranteed non-empty result
-- // https://github.com/fmtlib/fmt/issues/2238
-- tm_format.push_back(' ');
--
-- const size_t MIN_SIZE = 10;
-- filename_t buf;
-- buf.resize(MIN_SIZE);
-- for (;;)
-- {
-- size_t count = strftime(buf.data(), buf.size(), tm_format.c_str(), &now_tm);
-- if (count != 0)
-- {
-- // Remove the extra space.
-- buf.resize(count - 1);
-- break;
-- }
-- buf.resize(buf.size() * 2);
-- }
--
-- return buf;
-+#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
-+ std::wstringstream stream;
- #else
-- // generate fmt datetime format string, e.g. {:%Y-%m-%d}.
-- filename_t fmt_filename = fmt::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{{:{}}}")), filename);
--
-- // MSVC doesn't allow fmt::runtime(..) with wchar, with fmtlib versions < 9.1.x
--# if defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) && FMT_VERSION < 90101
-- return fmt::format(fmt_filename, now_tm);
--# else
-- return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm);
--# endif
--
-+ std::stringstream stream;
- #endif
-+ stream << std::put_time(&now_tm, file_path.c_str());
-+ return stream.str();
- }
-
- private:
-diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h
-index 71544e84..1d802f32 100644
---- a/include/spdlog/logger.h
-+++ b/include/spdlog/logger.h
-@@ -369,9 +369,9 @@ protected:
- {
- memory_buf_t buf;
- #ifdef SPDLOG_USE_STD_FORMAT
-- fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward<Args>(args)...));
-+ fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(args...));
- #else
-- fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward<Args>(args)...));
-+ fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(args...));
- #endif
-
- details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size()));
-@@ -395,10 +395,9 @@ protected:
- // format to wmemory_buffer and convert to utf8
- wmemory_buf_t wbuf;
- # ifdef SPDLOG_USE_STD_FORMAT
-- fmt_lib::vformat_to(
-- std::back_inserter(wbuf), fmt, fmt_lib::make_format_args<fmt_lib::wformat_context>(std::forward<Args>(args)...));
-+ fmt_lib::vformat_to(std::back_inserter(wbuf), fmt, fmt_lib::make_format_args<fmt_lib::wformat_context>(args...));
- # else
-- fmt::vformat_to(std::back_inserter(wbuf), fmt, fmt::make_format_args<fmt::wformat_context>(std::forward<Args>(args)...));
-+ fmt::vformat_to(std::back_inserter(wbuf), fmt, fmt::make_format_args<fmt::wformat_context>(args...));
- # endif
-
- memory_buf_t buf;
-diff --git a/include/spdlog/common.h b/include/spdlog/common.h
-index e69201a8..5f671c5c 100644
---- a/include/spdlog/common.h
-+++ b/include/spdlog/common.h
-@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>;
- template<class T>
- using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-+template <typename Char>
-+#if FMT_VERSION >= 90101
-+using fmt_runtime_string = fmt::runtime_format_string<Char>;
-+#else
-+using fmt_runtime_string = fmt::basic_runtime<Char>;
-+#endif
-+
- // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here,
- // in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char>
- template<class T, class Char = char>
- struct is_convertible_to_basic_format_string
- : std::integral_constant<bool,
-- std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value>
-+ std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value>
- {};
-
- # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
diff --git a/dev-libs/spdlog/files/spdlog-musl-1.2.4.patch b/dev-libs/spdlog/files/spdlog-musl-1.2.4.patch
deleted file mode 100644
index cd1240d36f46..000000000000
--- a/dev-libs/spdlog/files/spdlog-musl-1.2.4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/906954
-https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96
-
-From 287a00d364990edbb621fe5e392aeb550135fb96 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 3 Jan 2023 09:54:50 -0800
-Subject: [PATCH] Do not use LFS64 functions on linux/musl (#2589)
-
-On musl, off_t is 64bit always ( even on 32bit platforms ), therefore
-using LFS64 funcitons is not needed on such platforms. Moreover, musl
-has stopped providing aliases for these functions [1] which means it
-wont compile on newer musl systems. Therefore only use it on 32bit
-glibc/linux platforms and exclude musl like cygwin or OSX
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/include/spdlog/details/os-inl.h
-+++ b/include/spdlog/details/os-inl.h
-@@ -236,8 +236,8 @@ SPDLOG_INLINE size_t filesize(FILE *f)
- # else
- int fd = ::fileno(f);
- # endif
--// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
--# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
-+// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
-+# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
- struct stat64 st;
- if (::fstat64(fd, &st) == 0)
- {
-
diff --git a/dev-libs/spdlog/metadata.xml b/dev-libs/spdlog/metadata.xml
index b07153ebc2ef..ad30e5ed64da 100644
--- a/dev-libs/spdlog/metadata.xml
+++ b/dev-libs/spdlog/metadata.xml
@@ -5,6 +5,10 @@
<email>davidroman96@gmail.com</email>
<name>David Roman</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>gonegrier.duarte@gmail.com</email>
+ <name>Gonçalo Negrier Duarte</name>
+ </maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
diff --git a/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild b/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild
deleted file mode 100644
index 508bcb7398b0..000000000000
--- a/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Fast C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gabime/${PN}"
-else
- SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- virtual/pkgconfig
-"
-
-DEPEND="
- dev-libs/libfmt
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-force_external_fmt.patch"
- "${FILESDIR}/${PN}-fmt-10.patch"
- "${FILESDIR}/${PN}-musl-1.2.4.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSPDLOG_BUILD_BENCH=no
- -DSPDLOG_BUILD_EXAMPLE=no
- -DSPDLOG_FMT_EXTERNAL=yes
- -DSPDLOG_BUILD_SHARED=yes
- -DSPDLOG_BUILD_TESTS=$(usex test)
- )
-
- cmake_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild b/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
index 7c8d0692cb59..7a9afb0cf9a3 100644
--- a/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/gabime/${PN}"
else
SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild b/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild
index 298801759f76..fc69c94cbca2 100644
--- a/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild
+++ b/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/gabime/${PN}"
else
SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild b/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
index 3ece901957d2..70357b7d6a09 100644
--- a/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/gabime/${PN}"
else
SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild b/dev-libs/spdlog/spdlog-1.14.1.ebuild
index 02a505623954..334077e49e45 100644
--- a/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild
+++ b/dev-libs/spdlog/spdlog-1.14.1.ebuild
@@ -13,29 +13,27 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/gabime/${PN}"
else
SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="MIT"
-SLOT="0/1"
+SLOT="0/$(ver_cut 1-2)"
IUSE="test static-libs"
RESTRICT="!test? ( test )"
BDEPEND="
virtual/pkgconfig
+ test? (
+ >=dev-cpp/catch-3.4.0
+ )
"
-
DEPEND="
- >=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
+ dev-libs/libfmt:=[${MULTILIB_USEDEP}]
"
-
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-force_external_fmt.patch"
- "${FILESDIR}/${PN}-fmt-10.patch"
- "${FILESDIR}/${PN}-musl-1.2.4.patch"
)
multilib_src_prepare() {
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 3ece901957d2..70357b7d6a09 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/gabime/${PN}"
else
SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="MIT"