gentoo auto-resync : 13:01:2025 - 06:41:32

5 files changed, 133 insertions, 6 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index ae59dee11a92..c391b663a77f 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,10 +1,12 @@
+AUX spdlog-1.15.0-libfmt-11.1.0-fixups.patch 2613 BLAKE2B 2b78db16dbd91b0577265762a4813928c003a8f3e13900b783d472ad0b286b79d9cb98efc191da655a3d35419123ae6e1d62397236049ec8e9db6a0c07d5a856 SHA512 d7f9736c305ae67cd613a48394b009c7d9d9e3f91574304f099118034ba6bfab86e993ded13bd6bcac21985e033fdcbe4e7e60b6a6773baddc7cbfacc29d8549
 AUX spdlog-1.15.0-libfmt-11.1.0.patch 1151 BLAKE2B f6d23df7a3f24d44cc4db0926a04c9dde1efc3c67d9f14f76ddb675f71fb0ac585d4a2ee3d513516e9fd25f7bc672aed06328a7cc5d9aa2dae319e267fa81d60 SHA512 61f43cdd72544c6f694226cd37d4bf56478234d4a6539536ce97aa371c3adea8012e8a4a3d66eb3435761cccbb8cbbef2872ca4214388df2d645265f04078043
 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
 DIST spdlog-1.13.0.tar.gz 264003 BLAKE2B 8ffeec847f082a0932f406ab44b4653661fdbe95a15f7b736367ee6d8f45ab36ca2182a9e9c6fba5c0688ab5436c16932b130541a8532cc2e5f4980e6340b929 SHA512 44fcb414ad9fbbe2a6d72c29143eeeae477b687ed30ae870d661b032a029ad4214ef43e7ef6350d02791d05504492978ade2d6733fab12ce4884d8f0bc4c6340
 DIST spdlog-1.14.1.tar.gz 270896 BLAKE2B 70ac5142acfd765c649f2e34286bae3b5082db284dd1ca7c3d7424a53dd658f7d308bef0b5e0c89192fc3931f1fe5efdba91e460c7b3df836dffc22b66f821fa SHA512 d8f36a3d65a43d8c64900e46137827aadb05559948b2f5a389bea16ed1bfac07d113ee11cf47970913298d6c37400355fe6895cda8fa6dcf6abd9da0d8f199e9
 DIST spdlog-1.15.0.tar.gz 276012 BLAKE2B a9d15725f63d5426a13b6f13ba4281ab70b7f6166344d8d12900fe8ba63898280ffd852b16e48b81352c4632598438fbd02f1a78d6f17e06d66c4bdc309f4b37 SHA512 3dd98409f4625ae4d46ef5f59a2fc22a6e151a13dba9d37433363e5d84eab7cca73b379eeb637d8f9b1f0f5a42221c0cc9a2a70414dc2b6af6a162e19fba0647
-EBUILD spdlog-1.13.0-r2.ebuild 1148 BLAKE2B c05d4caa5a789fe2bf54195224f9360c4b473e8b2a433791089a4e99d12081bff664457b51c3006536de953f753871786570d8d12d9d27115c6cbdeefffcde77 SHA512 88869a4cf396b4e9841a1b5f0639daa3eccb346b93159f07405e0dd34c13252adee0ef44fe8fa9cb121dbffcaa3780573938d13b1e4e4c8464d7e3bdef5b5252
+EBUILD spdlog-1.13.0-r2.ebuild 1150 BLAKE2B 6b60fa0cbfd830a26916a2763cc1a6661d5ad3142415753f5d1bf52f3fc0e6b9b994c2ae096500f8fc5e1c93168c12f985eb39cc304216fe8e2aae23a4a6dbfe SHA512 f7ae020d167dbb7ebb19d078c41ce0d6671e36daca993220682270b88dc216806c125bea7f7fdf712a3dd3b4fd07bb3a57f284662dcf86360233fd00acead263
 EBUILD spdlog-1.14.1.ebuild 1185 BLAKE2B c247999bd1d09230fa336b1a9a21cdab9e776c5e623aad1837dc2fd2cb8a77249605163439cccbdb5f8afb58948a36c7ceb90330ceafc729f2f5e3d0d0c3d1ac SHA512 7641c865afe71e47efa0f2029823e165279053ab66d826c47c62a8589a69730a6c3f62b0b0ad63b925317d18595de24aec06f55069ead49e64de5d6516b76b9c
+EBUILD spdlog-1.15.0-r1.ebuild 1248 BLAKE2B a3d3d02362803d26415ec4d3c54f3f17405a25be3a8d21d0a6a081e243d6bb401174fc461bd2d84d93c49c91c54a247934aff691ff08ae470db6ba91c034d492 SHA512 0de054974a88eca0399a675dedf389990e6bf6327feea662ed052567d146cd6d5019d913a6092b9fea3e1a2bb3d86040fcc80e546467b99b86e788cd4e403885
 EBUILD spdlog-1.15.0.ebuild 1185 BLAKE2B c247999bd1d09230fa336b1a9a21cdab9e776c5e623aad1837dc2fd2cb8a77249605163439cccbdb5f8afb58948a36c7ceb90330ceafc729f2f5e3d0d0c3d1ac SHA512 7641c865afe71e47efa0f2029823e165279053ab66d826c47c62a8589a69730a6c3f62b0b0ad63b925317d18595de24aec06f55069ead49e64de5d6516b76b9c
-EBUILD spdlog-9999.ebuild 1148 BLAKE2B c05d4caa5a789fe2bf54195224f9360c4b473e8b2a433791089a4e99d12081bff664457b51c3006536de953f753871786570d8d12d9d27115c6cbdeefffcde77 SHA512 88869a4cf396b4e9841a1b5f0639daa3eccb346b93159f07405e0dd34c13252adee0ef44fe8fa9cb121dbffcaa3780573938d13b1e4e4c8464d7e3bdef5b5252
+EBUILD spdlog-9999.ebuild 1150 BLAKE2B 6b60fa0cbfd830a26916a2763cc1a6661d5ad3142415753f5d1bf52f3fc0e6b9b994c2ae096500f8fc5e1c93168c12f985eb39cc304216fe8e2aae23a4a6dbfe SHA512 f7ae020d167dbb7ebb19d078c41ce0d6671e36daca993220682270b88dc216806c125bea7f7fdf712a3dd3b4fd07bb3a57f284662dcf86360233fd00acead263
 MISC metadata.xml 615 BLAKE2B ab757ecbeac9856b7cc207e721f93bf96edd010dcc7a3e71a28e15809e1973a52ade211133302cd19378016c2384daacef574334e2d50afa8a950c210f69d1be SHA512 ad2a893a3644ac81cbd21c89cadb9676e4fb5024a706ecdc21356012a2981eca9729f8e066b4dcb34be95995c7984f1061f8007171b2d8c46953207ee71a91f0
diff --git a/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch b/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch
new file mode 100644
index 000000000000..afada8092f37
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch
@@ -0,0 +1,69 @@
+https://github.com/gabime/spdlog/commit/7f8060d5b280eac9786f92ac74d263cc8359c5ed
+https://github.com/gabime/spdlog/commit/96a8f6250cbf4e8c76387c614f666710a2fa9bad
+
+From 7f8060d5b280eac9786f92ac74d263cc8359c5ed Mon Sep 17 00:00:00 2001
+From: Christian Blichmann <cblichmann@users.noreply.github.com>
+Date: Tue, 7 Jan 2025 23:59:12 +0100
+Subject: [PATCH] fix: Compatibility with external fmtlib 11.1.1 (#3312)
+
+Include fmtlib's `xchar` header to include `fmt::basic_format_string`.
+Otherwise, compilation with an external fmtlib 11.1.1 fails with
+
+```
+In file included from include/spdlog/spdlog.h:12:
+include/spdlog/common.h:369:49: error: no template named 'basic_format_string' in namespace 'fmt'; did you mean 'std::basic_format_string'?
+  369 | inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
+      |                                                 ^~~~~
+```
+
+Signed-off-by: Christian Blichmann <cblichmann@google.com>
+---
+ include/spdlog/fmt/fmt.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
+index 7fa6b0933..2f09c15ed 100644
+--- a/include/spdlog/fmt/fmt.h
++++ b/include/spdlog/fmt/fmt.h
+@@ -27,4 +27,5 @@
+ #else  // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
+     #include <fmt/core.h>
+     #include <fmt/format.h>
++    #include <fmt/xchar.h>
+ #endif
+
+From 96a8f6250cbf4e8c76387c614f666710a2fa9bad Mon Sep 17 00:00:00 2001
+From: jdrouhard <john@drouhard.dev>
+Date: Thu, 9 Jan 2025 16:58:46 -0600
+Subject: [PATCH] fix: remove unused to_string_view overload in fmt >= 11.1
+ (#3314)
+
+---
+ include/spdlog/common.h | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index 2d73f8300..71ffd2403 100644
+--- a/include/spdlog/common.h
++++ b/include/spdlog/common.h
+@@ -364,19 +364,7 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view
+ }
+ #endif
+ 
+-#ifndef SPDLOG_USE_STD_FORMAT
+-#if FMT_VERSION >= 110100
+-template <typename T, typename... Args>
+-inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_arg<T> fmt) {
+-    return fmt;
+-}
+-#else
+-template <typename T, typename... Args>
+-inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
+-    return fmt;
+-}
+-#endif
+-#elif __cpp_lib_format >= 202207L
++#if defined(SPDLOG_USE_STD_FORMAT) &&  __cpp_lib_format >= 202207L
+ template <typename T, typename... Args>
+ SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
+     std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT {
diff --git a/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild b/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
index 70357b7d6a09..e6b260871621 100644
--- a/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ BDEPEND="
 	)
 "
 DEPEND="
-	>=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
+	>=dev-libs/libfmt-9.1.0-r2:=[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild b/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild
new file mode 100644
index 000000000000..cefd2edefc7e
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+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:=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${PN}-1.15.0-libfmt-11.1.0.patch"
+	"${FILESDIR}/${PN}-1.15.0-libfmt-11.1.0-fixups.patch"
+)
+
+multilib_src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=$(usex static-libs)
+		-DSPDLOG_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 70357b7d6a09..e6b260871621 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ BDEPEND="
 	)
 "
 DEPEND="
-	>=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
+	>=dev-libs/libfmt-9.1.0-r2:=[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"