[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2023-09-04 Thread Sam James 
commit: 8aa7e6a5f417cbbead816aef2de1213cce27947c
Author: David Roman  gmail  com>
AuthorDate: Sat Aug 12 17:10:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep  4 12:29:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa7e6a5

dev-libs/spdlog: fix tests

Closes: https://bugs.gentoo.org/911322
Signed-off-by: David Roman  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32274
Signed-off-by: Sam James  gentoo.org>

 dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch | 13 +
 dev-libs/spdlog/spdlog-1.12.0-r2.ebuild |  1 +
 2 files changed, 14 insertions(+)

diff --git a/dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch 
b/dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch
new file mode 100644
index ..8ad33f4fc8d0
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.12.0-fix-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_misc.cpp b/tests/test_misc.cpp
+index 9f3cb1744..6199641ff 100644
+--- a/tests/test_misc.cpp
 b/tests/test_misc.cpp
+@@ -43,7 +43,7 @@ TEST_CASE("log_levels", "[log_levels]")
+ REQUIRE(log_info("Hello", spdlog::level::trace) == "Hello");
+ }
+ 
+-TEST_CASE("level_to_string_view", "[convert_to_string_view")
++TEST_CASE("level_to_string_view", "[convert_to_string_view]")
+ {
+ REQUIRE(spdlog::level::to_string_view(spdlog::level::trace) == "trace");
+ REQUIRE(spdlog::level::to_string_view(spdlog::level::debug) == "debug");

diff --git a/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild 
b/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
index 55c4ac137dc1..86c85fff7203 100644
--- a/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.12.0-r2.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-force_external_fmt.patch"
+   "${FILESDIR}/${P}-fix-tests.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2023-07-15 Thread Sam James 
commit: 682906906c17c3127b5f9dfd984bbd4ea91902bc
Author: David Roman  ifae  es>
AuthorDate: Mon Jun 26 22:25:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 15 06:02:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68290690

dev-libs/spdlog: fix fmt-10.x compatibility

Closes: https://bugs.gentoo.org/906069
Signed-off-by: David Roman  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/spdlog/files/spdlog-fmt-10.patch  | 121 +
 ...og-1.11.0-r2.ebuild => spdlog-1.11.0-r3.ebuild} |   5 +-
 2 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/dev-libs/spdlog/files/spdlog-fmt-10.patch 
b/dev-libs/spdlog/files/spdlog-fmt-10.patch
new file mode 100644
index ..5ee44c41ea6a
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-fmt-10.patch
@@ -0,0 +1,121 @@
+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 
+ #include 
+ 
++#include 
++#include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -46,46 +49,15 @@ struct daily_filename_calculator
+  */
+ struct daily_filename_format_calculator
+ {
+-static filename_t calc_filename(const filename_t , const tm 
_tm)
++static filename_t calc_filename(const filename_t _path, const tm 
_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(), _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(_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)...));
++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)...));
++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(std::forward(args)...));
++fmt_lib::vformat_to(std::back_inserter(wbuf), fmt, 
fmt_lib::make_format_args(args...));
+ #else
+-fmt::vformat_to(std::back_inserter(wbuf), fmt, 
fmt::make_format_args(std::forward(args)...));
++fmt::vformat_to(std::back_inserter(wbuf), fmt, 
fmt::make_format_args(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;
+ template
+ using remove_cvref_t = typename std::remove_cv::type>::type;
+ 
++template 
++#if FMT_VERSION >= 90101
++using

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

2023-05-10 Thread Sam James 
commit: 71f385b11af6bcbf09f59a970c531771650d9c2f
Author: Sam James  gentoo  org>
AuthorDate: Wed May 10 16:09:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 10 16:09:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f385b1

Revert "dev-libs/spdlog: add patch metadata"

This reverts commit f6ca1358c59588198f05aa99b61fdac26dfad42b.

Bug: https://bugs.gentoo.org/906069
Bug: https://bugs.gentoo.org/906071
Signed-off-by: Sam James  gentoo.org>

 dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch | 14 ++
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch 
b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
index 03ef4e591048..185fb12fb727 100644
--- a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
+++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
@@ -3,18 +3,8 @@ Upstream: https://github.com/gabime/spdlog/pull/2694
 
 Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0
 
-https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05
-
-From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001
-From: H1X4 <10332146+h1x4...@users.noreply.github.com>
-Date: Fri, 31 Mar 2023 20:39:32 +0300
-Subject: [PATCH] fix build for master fmt (non-bundled) (#2694)
-
-* fix build for master fmt (non-bundled)
-
-* update fmt_runtime_string macro
-
-* fix build of updated macro
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index e69201a81..5f671c5c6 100644
 --- a/include/spdlog/common.h
 +++ b/include/spdlog/common.h
 @@ -173,12 +173,19 @@ using format_string_t = fmt::format_string;

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

2023-05-10 Thread Sam James 
commit: f6ca1358c59588198f05aa99b61fdac26dfad42b
Author: Sam James  gentoo  org>
AuthorDate: Wed May 10 15:21:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 10 15:21:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ca1358

dev-libs/spdlog: add patch metadata

Signed-off-by: Sam James  gentoo.org>

 dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch 
b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
index 185fb12fb727..03ef4e591048 100644
--- a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
+++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
@@ -3,8 +3,18 @@ Upstream: https://github.com/gabime/spdlog/pull/2694
 
 Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0
 
-diff --git a/include/spdlog/common.h b/include/spdlog/common.h
-index e69201a81..5f671c5c6 100644
+https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05
+
+From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001
+From: H1X4 <10332146+h1x4...@users.noreply.github.com>
+Date: Fri, 31 Mar 2023 20:39:32 +0300
+Subject: [PATCH] fix build for master fmt (non-bundled) (#2694)
+
+* fix build for master fmt (non-bundled)
+
+* update fmt_runtime_string macro
+
+* fix build of updated macro
 --- a/include/spdlog/common.h
 +++ b/include/spdlog/common.h
 @@ -173,12 +173,19 @@ using format_string_t = fmt::format_string;

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2023-05-10 Thread Sam James 
commit: 03d7b984817fbf07c4d830f30e34ae20a79af7b4
Author: jinqiang zhang  0x0  ee>
AuthorDate: Wed May 10 15:15:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 10 15:21:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d7b984

dev-libs/spdlog: fix fails compile with libfmt-10.0.0

Closes: https://bugs.gentoo.org/906069
Signed-off-by: jinqiang zhang  0x0.ee>
Closes: https://github.com/gentoo/gentoo/pull/30974
Signed-off-by: Sam James  gentoo.org>

 dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch | 30 
 dev-libs/spdlog/spdlog-1.11.0.ebuild |  1 +
 2 files changed, 31 insertions(+)

diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch 
b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
new file mode 100644
index ..185fb12fb727
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
@@ -0,0 +1,30 @@
+Bug: https://bugs.gentoo.org/906069
+Upstream: https://github.com/gabime/spdlog/pull/2694
+
+Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0
+
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index e69201a81..5f671c5c6 100644
+--- a/include/spdlog/common.h
 b/include/spdlog/common.h
+@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string;
+ template
+ using remove_cvref_t = typename std::remove_cv::type>::type;
+ 
++template 
++#if FMT_VERSION >= 90101
++using fmt_runtime_string = fmt::runtime_format_string;
++#else
++using fmt_runtime_string = fmt::basic_runtime;
++#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 is only convertible to 
basic_format_string but not basic_string_view
+ template
+ struct is_convertible_to_basic_format_string
+ : std::integral_constant>::value || 
std::is_same, fmt::basic_runtime>::value>
++  std::is_convertible>::value || 
std::is_same, fmt_runtime_string>::value>
+ {};
+ 
+ #if defined(SPDLOG_WCHAR_FILENAMES) || 
defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)

diff --git a/dev-libs/spdlog/spdlog-1.11.0.ebuild 
b/dev-libs/spdlog/spdlog-1.11.0.ebuild
index ebda7ae2f4a2..6759c44b79f8 100644
--- a/dev-libs/spdlog/spdlog-1.11.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.11.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-force_external_fmt.patch"
+   "${FILESDIR}/${PN}-libfmt-10.0.0.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2022-05-10 Thread Sam James 
commit: cc5eb0f1c465faa4d7e4b00efcad2f8feeb020ae
Author: David Roman  gmail  com>
AuthorDate: Fri May  6 19:28:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 11 01:04:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5eb0f1

dev-libs/spdlog: fix clone async test

Closes: https://bugs.gentoo.org/840764
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: David Roman  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25355
Signed-off-by: Sam James  gentoo.org>

 dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch | 13 +
 dev-libs/spdlog/spdlog-1.9.2-r1.ebuild  |  5 -
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch 
b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
new file mode 100644
index ..a224969d9025
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.9.2-fix-clone-test.patch
@@ -0,0 +1,13 @@
+See https://bugs.gentoo.org/840764
+
+--- a/tests/test_misc.cpp
 b/tests/test_misc.cpp
+@@ -131,7 +131,7 @@ TEST_CASE("clone async", "[clone]")
+ logger->info("Some message 1");
+ cloned->info("Some message 2");
+ 
+-spdlog::details::os::sleep_for_millis(10);
++spdlog::details::os::sleep_for_millis(100);
+ 
+ REQUIRE(test_sink->lines().size() == 2);
+ REQUIRE(test_sink->lines()[0] == "Some message 1");

diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild 
b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
index c8f6d4c67329..d1522c98ebf1 100644
--- a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
@@ -31,7 +31,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-force_external_fmt.patch"
+   "${FILESDIR}/${P}-fix-clone-test.patch"
+)
 
 src_prepare() {
use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2021-06-24 Thread Sam James 
commit: 64d8afb7f3cd0f431e5b40fe486e1e89965131e5
Author: Hank Leininger  korelogic  com>
AuthorDate: Thu Jun 24 18:25:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 25 00:31:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d8afb7

dev-libs/spdlog: fix compiling with libfmt-8 installed

See also upstream https://github.com/gabime/spdlog/issues/1975

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/797394
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/21413
Signed-off-by: Sam James  gentoo.org>

 .../spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch   | 13 ++
 dev-libs/spdlog/spdlog-1.8.5-r1.ebuild | 49 ++
 2 files changed, 62 insertions(+)

diff --git a/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch 
b/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch
new file mode 100644
index 000..f59a9bca4b3
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch
@@ -0,0 +1,13 @@
+See upstream https://github.com/gabime/spdlog/issues/1975
+
+--- a/include/spdlog/common-inl.h  2021-06-21 17:15:26.695992698 -0600
 b/include/spdlog/common-inl.h  2021-06-21 17:15:52.205992496 -0600
+@@ -60,7 +60,7 @@
+ SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string , int last_errno)
+ {
+ memory_buf_t outbuf;
+-fmt::format_system_error(outbuf, last_errno, msg);
++fmt::format_system_error(outbuf, last_errno, msg.c_str());
+ msg_ = fmt::to_string(outbuf);
+ }
+ 

diff --git a/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild 
b/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild
new file mode 100644
index 000..26e7cb42bce
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog;
+
+if [[ ${PV} == * ]]; 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 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   virtual/pkgconfig
+"
+DEPEND="
+   >=dev-libs/libfmt-6.1.2:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-libfmt-8-fix.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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

2020-11-09 Thread Patrice Clement 
commit: 908775ac57bb25bce3cc14b1058a49f81ff87b05
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Nov  8 19:06:31 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Nov  9 20:30:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908775ac

dev-libs/spdlog: remove unused patch(es).

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18193
Signed-off-by: Patrice Clement  gentoo.org>

 .../spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch   | 33 --
 dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch | 13 -
 2 files changed, 46 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch 
b/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
deleted file mode 100644
index 422a507a6d8..000
--- a/dev-libs/spdlog/files/spdlog-1.6.1-libfmt-7.0.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/gabime/spdlog/pull/1606
-
-From 22bee8128a4150ce37cf761ed9a609ad891848a6 Mon Sep 17 00:00:00 2001
-From: Craig Andrews 
-Date: Mon, 6 Jul 2020 13:01:52 -0400
-Subject: [PATCH] fmt 7.0.0 renamed the internal namespace to detail.
-
-See: https://github.com/fmtlib/fmt/issues/1538

- include/spdlog/details/fmt_helper.h | 10 +-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/include/spdlog/details/fmt_helper.h 
b/include/spdlog/details/fmt_helper.h
-index cbc0bdf3..4f363858 100644
 a/include/spdlog/details/fmt_helper.h
-+++ b/include/spdlog/details/fmt_helper.h
-@@ -34,7 +34,15 @@ template
- inline unsigned int count_digits(T n)
- {
- using count_type = typename std::conditional<(sizeof(T) > 
sizeof(uint32_t)), uint64_t, uint32_t>::type;
--return static_cast(fmt::internal::count_digits(static_cast(n)));
-+return static_cast(fmt::
-+// fmt 7.0.0 renamed the internal namespace to detail.
-+// See: https://github.com/fmtlib/fmt/issues/1538
-+#if FMT_VERSION < 7
-+internal
-+#else
-+detail
-+#endif
-+::count_digits(static_cast(n)));
- }
- 
- inline void pad2(int n, memory_buf_t )

diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch 
b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
deleted file mode 100644
index 8a6aa8020f7..000
--- a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h
-index e974cf51..5393dcac 100644
 a/include/spdlog/fmt/bin_to_hex.h
-+++ b/include/spdlog/fmt/bin_to_hex.h
-@@ -92,7 +92,7 @@ struct formatter>
- auto parse(ParseContext ) -> decltype(ctx.begin())
- {
- auto it = ctx.begin();
--while (*it && *it != '}')
-+while (it != ctx.end() && *it != '}')
- {
- switch (*it)
- {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2020-08-08 Thread Joonas Niilola 
commit: c680482145f31b0e20aae17bb9fbb2984e102aae
Author: David Roman  gmail  com>
AuthorDate: Sun Jul 12 14:18:44 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Aug  8 09:04:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6804821

dev-libs/spdlog: fix tests segfault

Closes: https://bugs.gentoo.org/731238
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Roman  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16678
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch | 13 +
 dev-libs/spdlog/spdlog-1.6.1-r1.ebuild |  1 +
 2 files changed, 14 insertions(+)

diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch 
b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
new file mode 100644
index 000..8a6aa8020f7
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h
+index e974cf51..5393dcac 100644
+--- a/include/spdlog/fmt/bin_to_hex.h
 b/include/spdlog/fmt/bin_to_hex.h
+@@ -92,7 +92,7 @@ struct formatter>
+ auto parse(ParseContext ) -> decltype(ctx.begin())
+ {
+ auto it = ctx.begin();
+-while (*it && *it != '}')
++while (it != ctx.end() && *it != '}')
+ {
+ switch (*it)
+ {

diff --git a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild 
b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
index 04237834f6c..6d996c6f8ea 100644
--- a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${P}-libfmt-7.0.0.patch"
+   "${FILESDIR}/${P}-tests-fix.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

2020-04-10 Thread Andreas Sturmlechner 
commit: 706d1a3c5d2df832221d877f9f17fe9f680d8e17
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Apr 10 13:01:16 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 10 20:49:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706d1a3c

dev-libs/spdlog: remove unused patch(es)

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15288
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../spdlog/files/spdlog-1.0.0-unbundle-fmt.patch   | 29 --
 1 file changed, 29 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch 
b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
deleted file mode 100644
index c039dc47a6a..000
--- a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
 a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -17,9 +17,7 @@
- #ifndef FMT_USE_WINDOWS_H
- #define FMT_USE_WINDOWS_H 0
- #endif
--#include "bundled/core.h"
--#include "bundled/format.h"
--#else // external fmtlib
-+#endif // external fmtlib
-+
- #include 
- #include 
--#endif
-diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
 a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
-@@ -11,8 +11,6 @@
- #ifndef FMT_HEADER_ONLY
- #define FMT_HEADER_ONLY
- #endif
--#include "bundled/ostream.h"
--#include "fmt.h"
--#else
--#include 
- #endif
-+
-+#include

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2020-01-20 Thread Craig Andrews 
commit: cb4209494b05520fa84511c0ec3df825085af73e
Author: David Roman  gmail  com>
AuthorDate: Mon Jan 20 21:08:54 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Tue Jan 21 02:12:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb420949

dev-libs/spdlog: bump to 1.5.0

Closes: https://bugs.gentoo.org/696710
Closes: https://bugs.gentoo.org/699346
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Roman  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14113
Signed-off-by: Craig Andrews  gentoo.org>

 dev-libs/spdlog/Manifest   |  1 +
 .../spdlog/files/spdlog--unbundle-fmt.patch| 45 --
 .../{spdlog-.ebuild => spdlog-1.5.0.ebuild}| 20 ++
 dev-libs/spdlog/spdlog-.ebuild | 20 ++
 4 files changed, 27 insertions(+), 59 deletions(-)

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 9beed729a3b..9c5db7b8547 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,3 +1,4 @@
 DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B 
c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe
 SHA512 
418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
 DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 
97027a3672b826e294dbdc202afa913a42ddae5a02a569ac28c41d79b96128de045ac5df30a76d888d6b3bea5093fb75b006365d7b1b296842750a39f43835d6
 SHA512 
019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f
 DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 
2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9
 SHA512 
a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
+DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B 
bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28
 SHA512 
78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34

diff --git a/dev-libs/spdlog/files/spdlog--unbundle-fmt.patch 
b/dev-libs/spdlog/files/spdlog--unbundle-fmt.patch
deleted file mode 100644
index f6f37b5e493..000
--- a/dev-libs/spdlog/files/spdlog--unbundle-fmt.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
-index 5d039b8c..8107b19a 100644
 a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -19,9 +19,6 @@
- #ifndef FMT_USE_WINDOWS_H
- #define FMT_USE_WINDOWS_H 0
- #endif
--#include "bundled/core.h"
--#include "bundled/format.h"
--#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
--#include "fmt/core.h"
--#include "fmt/format.h"
--#endif
-+#endif // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
-+#include 
-+#include 
-diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
-index 9902898f..5e92a592 100644
 a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
-@@ -11,8 +11,6 @@
- #ifndef FMT_HEADER_ONLY
- #define FMT_HEADER_ONLY
- #endif
--#include "bundled/ostream.h"
--#include "fmt.h"
--#else
--#include 
- #endif
-+
-+#include 
-diff --git a/src/spdlog.cpp b/src/spdlog.cpp
-index be91412d..d68dd522 100644
 a/src/spdlog.cpp
-+++ b/src/spdlog.cpp
-@@ -104,7 +104,7 @@ template std::shared_ptr 
spdlog::stderr_logger_st
- 
- FMT_BEGIN_NAMESPACE
- template struct internal::basic_data;

diff --git a/dev-libs/spdlog/spdlog-.ebuild 
b/dev-libs/spdlog/spdlog-1.5.0.ebuild
similarity index 61%
copy from dev-libs/spdlog/spdlog-.ebuild
copy to dev-libs/spdlog/spdlog-1.5.0.ebuild
index f0b80109ac4..060e167a8af 100644
--- a/dev-libs/spdlog/spdlog-.ebuild
+++ b/dev-libs/spdlog/spdlog-1.5.0.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/gabime/spdlog;
 
 if [[ ${PV} == * ]]; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/gabime/spdlog;
+   EGIT_REPO_URI="https://github.com/gabime/${PN};
 else
-   SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64"
 fi
 
@@ -21,19 +21,25 @@ SLOT="0/1"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+   virtual/pkgconfig
+"
 DEPEND="
-   >=dev-libs/libfmt-5.0.0
+   >=dev-libs/libfmt-5.3.0:=
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}--unbundle-fmt.patch" )
+src_prepare() {
+   cmake_src_prepare
+   rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled 
libfmt"
+}
 
 src_configure() {
-   rm -r include/spdlog/fmt/bundled || die
-
local mycmakeargs=(
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2019-07-21 Thread Andreas Sturmlechner 
commit: 5bd1526cf0e8b971ebd3f5101f5f707bc6e33bf9
Author: David Roman  gmail  com>
AuthorDate: Sun Jul 21 00:46:20 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 21 12:01:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd1526c

dev-libs/spdlog: fix patch of live ebuild

Closes: https://bugs.gentoo.org/689788
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: David Roman  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12486
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../spdlog/files/spdlog--unbundle-fmt.patch| 45 ++
 dev-libs/spdlog/spdlog-.ebuild |  4 +-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog--unbundle-fmt.patch 
b/dev-libs/spdlog/files/spdlog--unbundle-fmt.patch
new file mode 100644
index 000..f6f37b5e493
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog--unbundle-fmt.patch
@@ -0,0 +1,45 @@
+diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
+index 5d039b8c..8107b19a 100644
+--- a/include/spdlog/fmt/fmt.h
 b/include/spdlog/fmt/fmt.h
+@@ -19,9 +19,6 @@
+ #ifndef FMT_USE_WINDOWS_H
+ #define FMT_USE_WINDOWS_H 0
+ #endif
+-#include "bundled/core.h"
+-#include "bundled/format.h"
+-#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
+-#include "fmt/core.h"
+-#include "fmt/format.h"
+-#endif
++#endif // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
++#include 
++#include 
+diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
+index 9902898f..5e92a592 100644
+--- a/include/spdlog/fmt/ostr.h
 b/include/spdlog/fmt/ostr.h
+@@ -11,8 +11,6 @@
+ #ifndef FMT_HEADER_ONLY
+ #define FMT_HEADER_ONLY
+ #endif
+-#include "bundled/ostream.h"
+-#include "fmt.h"
+-#else
+-#include 
+ #endif
++
++#include 
+diff --git a/src/spdlog.cpp b/src/spdlog.cpp
+index be91412d..d68dd522 100644
+--- a/src/spdlog.cpp
 b/src/spdlog.cpp
+@@ -104,7 +104,7 @@ template std::shared_ptr 
spdlog::stderr_logger_st
+ 
+ FMT_BEGIN_NAMESPACE
+ template struct internal::basic_data;

diff --git a/dev-libs/spdlog/spdlog-.ebuild 
b/dev-libs/spdlog/spdlog-.ebuild
index 497e7da9b41..a9cbb03ae99 100644
--- a/dev-libs/spdlog/spdlog-.ebuild
+++ b/dev-libs/spdlog/spdlog-.ebuild
@@ -25,13 +25,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
+PATCHES=( "${FILESDIR}/${PN}--unbundle-fmt.patch" )
 
 src_configure() {
rm -r include/spdlog/fmt/bundled || die
 
local mycmakeargs=(
-   -DSPDLOG_BUILD_EXAMPLES=no
+   -DSPDLOG_BUILD_EXAMPLE=no
-DSPDLOG_BUILD_BENCH=no
-DSPDLOG_BUILD_TESTS=$(usex test)
)

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

2018-10-31 Thread Andreas Sturmlechner 
commit: 880e765a4b6522076168432e914189066b1ef774
Author: David Roman  gmail  com>
AuthorDate: Sun Oct 28 14:09:32 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 31 18:54:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880e765a

dev-libs/spdlog: fix compilation error

Closes: https://bugs.gentoo.org/656350
Signed-off-by: David Roman  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch 
b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
index 9b04f276ba5..c039dc47a6a 100644
--- a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
+++ b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
@@ -1,18 +1,18 @@
 diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
 --- a/include/spdlog/fmt/fmt.h
 +++ b/include/spdlog/fmt/fmt.h
-@@ -16,10 +16,7 @@
- #endif
+@@ -17,9 +17,7 @@
  #ifndef FMT_USE_WINDOWS_H
  #define FMT_USE_WINDOWS_H 0
--#endif
+ #endif
 -#include "bundled/core.h"
 -#include "bundled/format.h"
 -#else // external fmtlib
 +#endif // external fmtlib
++
  #include 
  #include 
- #endif
+-#endif
 diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
 --- a/include/spdlog/fmt/ostr.h
 +++ b/include/spdlog/fmt/ostr.h

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2018-08-09 Thread Craig Andrews 
commit: 8b0c05c847d692cc5f6d6c47caa5b9f29a925b2c
Author: David Roman  gmail  com>
AuthorDate: Tue Aug  7 10:25:23 2018 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  8 21:21:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0c05c8

dev-libs/spdlog: bump to 1.0.0

Closes: https://bugs.gentoo.org/662942

 dev-libs/spdlog/Manifest   |  1 +
 .../spdlog/files/spdlog-1.0.0-unbundle-fmt.patch   | 29 ++
 .../{spdlog-.ebuild => spdlog-1.0.0.ebuild}|  6 ++---
 dev-libs/spdlog/spdlog-.ebuild |  6 ++---
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 3f7a4c11c29..2291d1dbf3b 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1 +1,2 @@
 DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 
2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6
 SHA512 
c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
+DIST spdlog-1.0.0.tar.gz 183855 BLAKE2B 
30d54fef03a83f968cfebacf95a484ff397126771a7ea022556aebd07e2f7694af35b278f75ee24372283ff1428e21247fd4329794d64a65bd6220a93f21db3c
 SHA512 
4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1

diff --git a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch 
b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
new file mode 100644
index 000..9b04f276ba5
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
@@ -0,0 +1,29 @@
+diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
+--- a/include/spdlog/fmt/fmt.h
 b/include/spdlog/fmt/fmt.h
+@@ -16,10 +16,7 @@
+ #endif
+ #ifndef FMT_USE_WINDOWS_H
+ #define FMT_USE_WINDOWS_H 0
+-#endif
+-#include "bundled/core.h"
+-#include "bundled/format.h"
+-#else // external fmtlib
++#endif // external fmtlib
+ #include 
+ #include 
+ #endif
+diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
+--- a/include/spdlog/fmt/ostr.h
 b/include/spdlog/fmt/ostr.h
+@@ -11,8 +11,6 @@
+ #ifndef FMT_HEADER_ONLY
+ #define FMT_HEADER_ONLY
+ #endif
+-#include "bundled/ostream.h"
+-#include "fmt.h"
+-#else
+-#include 
+ #endif
++
++#include 

diff --git a/dev-libs/spdlog/spdlog-.ebuild 
b/dev-libs/spdlog/spdlog-1.0.0.ebuild
similarity index 88%
copy from dev-libs/spdlog/spdlog-.ebuild
copy to dev-libs/spdlog/spdlog-1.0.0.ebuild
index e42aaade7db..03aaec9bd60 100644
--- a/dev-libs/spdlog/spdlog-.ebuild
+++ b/dev-libs/spdlog/spdlog-1.0.0.ebuild
@@ -17,15 +17,15 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/1"
 IUSE="test"
 
 DEPEND="
-   <=dev-libs/libfmt-4.1.0
+   >=dev-libs/libfmt-5.0.0
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
 
 src_configure() {
rm -r include/spdlog/fmt/bundled || die

diff --git a/dev-libs/spdlog/spdlog-.ebuild 
b/dev-libs/spdlog/spdlog-.ebuild
index e42aaade7db..03aaec9bd60 100644
--- a/dev-libs/spdlog/spdlog-.ebuild
+++ b/dev-libs/spdlog/spdlog-.ebuild
@@ -17,15 +17,15 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/1"
 IUSE="test"
 
 DEPEND="
-   <=dev-libs/libfmt-4.1.0
+   >=dev-libs/libfmt-5.0.0
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
 
 src_configure() {
rm -r include/spdlog/fmt/bundled || die

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/

2018-06-12 Thread Michał Górny 
commit: 163972c7fddc08a68b1b9b4aa50a61e94df60716
Author: David Roman  gmail  com>
AuthorDate: Tue Jun 12 16:07:40 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jun 12 17:38:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163972c7

dev-libs/spdlog: clean old ebuilds

Closes: https://github.com/gentoo/gentoo/pull/8525

 dev-libs/spdlog/Manifest|  2 -
 dev-libs/spdlog/files/spdlog-unbundle-fmt.patch | 90 -
 dev-libs/spdlog/spdlog-0.16.2.ebuild| 38 ---
 dev-libs/spdlog/spdlog-0.16.3.ebuild| 38 ---
 4 files changed, 168 deletions(-)

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 68f096c7142..3f7a4c11c29 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,3 +1 @@
-DIST spdlog-0.16.2.tar.gz 162709 BLAKE2B 
7cd031bd9b1e01aa11186334ada9aad50cdc063942e0eb5b9d36e918e305db4c0e5657a215f24f458dbf792e05c38f74409bc7f5f88049bd1c4a759ccab0167e
 SHA512 
454da17d75fa6dae074fb2ef10d93a1f9ccbf23b625521d32ce463a1362411ffc35ca33b081bee3cfb27bb647472de73899c9a15d24f09c8a3c9222560bcf559
-DIST spdlog-0.16.3.tar.gz 163636 BLAKE2B 
bebed0811976c5000481d9fa70107f79c3fb6180484afec611df9b3621349a91809e0f824583171a1c8bc89dae58a659c990fb4c6761da404f01a70868494f06
 SHA512 
6e08473825cf97dfb10b0e919b77996c1023bbfb583d851e961ec4a95094e4afffd1fc6f6e7e728ce8c2c69c9fb280c59f8d6494b50224bdf8cc68914ffd21e8
 DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 
2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6
 SHA512 
c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef

diff --git a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch 
b/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
deleted file mode 100644
index 1b2449949bf..000
--- a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 52d2953..d132d26 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,6 +80,7 @@ install(
- install(
- DIRECTORY "${HEADER_BASE}/${PROJECT_NAME}"
- DESTINATION "${include_install_dir}"
-+PATTERN "bundled*" EXCLUDE
- )
- 
- # install project version file
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
-index 92ca4e5..55f1fa8 100644
 a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -10,25 +10,7 @@
- // By default spdlog include its own copy.
- //
- 
--#if !defined(SPDLOG_FMT_EXTERNAL)
--
--#ifndef FMT_HEADER_ONLY
--#define FMT_HEADER_ONLY
--#endif
--#ifndef FMT_USE_WINDOWS_H
--#define FMT_USE_WINDOWS_H 0
--#endif
--#include "bundled/format.h"
--#if defined(SPDLOG_FMT_PRINTF)
--#include "bundled/printf.h"
--#endif
--
--#else //external fmtlib
--
- #include 
- #if defined(SPDLOG_FMT_PRINTF)
- #include 
- #endif
--
--#endif
--
-diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
-index 5cdd5cd..d70c6b3 100644
 a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
-@@ -7,11 +7,6 @@
- 
- // include external or bundled copy of fmtlib's ostream support
- //
--#if !defined(SPDLOG_FMT_EXTERNAL)
--#include "fmt.h"
--#include "bundled/ostream.h"
--#else
- #include 
--#endif
- 
- 
-diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
-index ad01a09..9a1bec4 100644
 a/include/spdlog/tweakme.h
-+++ b/include/spdlog/tweakme.h
-@@ -98,14 +98,6 @@
- 
///
- 
- 
--///
--// Uncomment to use your own copy of the fmt library instead of spdlog's copy.
--// In this case spdlog will try to include  so set your -I flag 
accordingly.
--//
--// #define SPDLOG_FMT_EXTERNAL
--///
--
--
- 
///
- // Uncomment to use printf-style messages in your logs instead of the usual
- // format-style used by default.
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 22329b4..44dad86 100644
 a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -13,7 +13,7 @@ target_include_directories(catch INTERFACE 
${CMAKE_CURRENT_SOURCE_DIR})
- file(GLOB catch_tests LIST_DIRECTORIES false RELATIVE 
${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h *.hpp)
- 
- add_executable(catch_tests ${catch_tests})
--target_link_libraries(catch_tests spdlog ${CMAKE_THREAD_LIBS_INIT})
-+target_link_libraries(catch_tests spdlog fmt ${CMAKE_THREAD_LIBS_INIT})
- add_test(NAME catch_tests COMMAND catch_tests)
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")
- 

diff --git a/dev-libs/spdlog/spdlog-0.16.2.ebuild 
b/dev-libs/spdlog/spdlog-0.16.2.ebuild
deleted file mode 100644
index b22d880ad03..000
---

[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/

2018-01-08 Thread Craig Andrews 
commit: d081341290444856a0cf2fc988310dc4a38acd88
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jan  7 08:01:36 2018 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Mon Jan  8 17:25:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0813412

dev-libs/spdlog: remove unused patch

 dev-libs/spdlog/files/spdlog-0.14.0-CMakeLists.txt | 116 -
 1 file changed, 116 deletions(-)

diff --git a/dev-libs/spdlog/files/spdlog-0.14.0-CMakeLists.txt 
b/dev-libs/spdlog/files/spdlog-0.14.0-CMakeLists.txt
deleted file mode 100644
index ad8062edda9..000
--- a/dev-libs/spdlog/files/spdlog-0.14.0-CMakeLists.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright(c) 2015 Ruslan Baratov.
-# Distributed under the MIT License (http://opensource.org/licenses/MIT)
-#
-
-cmake_minimum_required(VERSION 3.1)
-project(spdlog VERSION 0.14.0)
-include(CTest)
-include(CMakeDependentOption)
-include(GNUInstallDirs)
-
-#---
-# compiler config
-#---
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" 
MATCHES "Clang")
-set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
-endif()
-
-#---
-# spdlog target
-#---
-add_library(spdlog INTERFACE)
-
-option(SPDLOG_BUILD_EXAMPLES "Build examples" OFF)
-cmake_dependent_option(SPDLOG_BUILD_TESTING
-"Build spdlog tests" ON
-"BUILD_TESTING" OFF
-)
-
-target_include_directories(
-spdlog
-INTERFACE
-"$"
-"$"
-)
-
-set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include")
-
-if(SPDLOG_BUILD_EXAMPLES)
-add_subdirectory(example)
-endif()
-
-if(SPDLOG_BUILD_TESTING)
-add_subdirectory(tests)
-endif()
-
-#---
-# Install/export targets and files
-#---
-# set files and directories
-set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-set(include_install_dir "${CMAKE_INSTALL_INCLUDEDIR}")
-set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-set(version_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
-set(project_config "${PROJECT_NAME}Config.cmake")
-set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
-set(targets_export_name "${PROJECT_NAME}Targets")
-set(namespace "${PROJECT_NAME}::")
-
-# generate package version file
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(
-"${version_config}" COMPATIBILITY SameMajorVersion
-)
-
-# configure pkg config file
-configure_file("cmake/spdlog.pc.in" "${pkg_config}" @ONLY)
-
-# install targets
-install(
-TARGETS spdlog
-EXPORT "${targets_export_name}"
-INCLUDES DESTINATION "${include_install_dir}"
-)
-
-# install headers
-install(
-DIRECTORY "${HEADER_BASE}/${PROJECT_NAME}"
-DESTINATION "${include_install_dir}"
-)
-
-# install project version file
-install(
-FILES "${version_config}"
-DESTINATION "${config_install_dir}"
-)
-
-# install pkg config file
-install(
-FILES "${pkg_config}"
-DESTINATION "${pkgconfig_install_dir}"
-)
-
-# install project config file
-install(
-EXPORT "${targets_export_name}"
-NAMESPACE "${namespace}"
-DESTINATION "${config_install_dir}"
-FILE ${project_config}
-)
-
-# export build directory config file
-export(
-EXPORT ${targets_export_name}
-NAMESPACE "${namespace}"
-FILE ${project_config}
-)
-
-# register project in CMake user registry
-export(PACKAGE ${PROJECT_NAME})
-
-file(GLOB_RECURSE spdlog_include_SRCS "${HEADER_BASE}/*.h")
-add_custom_target(spdlog_headers_for_ide SOURCES ${spdlog_include_SRCS})