2025-07-26 07:40:56+00:00

7 files changed, 2 insertions, 222 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fa7a8598b3963..c539eb9b88199 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index d9c2eec190802..64bb135b06099 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,13 +1,7 @@
-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.15.0.tar.gz 276012 BLAKE2B a9d15725f63d5426a13b6f13ba4281ab70b7f6166344d8d12900fe8ba63898280ffd852b16e48b81352c4632598438fbd02f1a78d6f17e06d66c4bdc309f4b37 SHA512 3dd98409f4625ae4d46ef5f59a2fc22a6e151a13dba9d37433363e5d84eab7cca73b379eeb637d8f9b1f0f5a42221c0cc9a2a70414dc2b6af6a162e19fba0647
 DIST spdlog-1.15.1.tar.gz 275521 BLAKE2B 1c5c6330c7abd2f204ec345c0173fe997f0063b8da301494fda5c1424bdc7a7066cf8a3a75b217638211bb795550cf7ae87afa71c478f1568db10c5e1f58020e SHA512 d6575b5cd53638345078a1c6a886293892359a07ee6de45e23d0c805bb33f59350f33060bce38824e09ce84525b575acdae7b94fc6e82191f5fd576f6c9252b2
-DIST spdlog-1.15.2.tar.gz 275744 BLAKE2B 4e78dfcd364f792d6ed829bd17a472ea469eede10075b58531f04dbc3926ded02dd6316bf0e9b8f15f7fd9fbc5c3e5c5bcf749f73e82361efd4914aaece84099 SHA512 4e86d79dea4f08b9e4755ada7c9395e03246d00cdc11df8951d32b5f5e823fec103091d11154f32b261a29574784b761efb32477ec6385ffdb2069413e2c91a0
 DIST spdlog-1.15.3.tar.gz 277691 BLAKE2B fd49c90fa086c6472b0658b26547727af1142b1bb5210b2fbaa4854737592cb75c823de1d066b52189da7c95fe9c29981919c1a2927f15e45e1acb70171b4b7d SHA512 21c35f4091850ea3a0cd6a24867e06e943df70d76cd5a7ec0b15a33e0e9e0cc3584ed7930e1ac6f347e7e06f0e002d0e759884eaf05310014e24ea0e0419fcc4
-EBUILD spdlog-1.15.0-r1.ebuild 1240 BLAKE2B 363d35ef333eac0a17e28ec08f086a272b7b6934152e39d7ce7468179da9c701fd981318c152d0390c9a43d96998480490ad153634366a9313064d7d103bb181 SHA512 6ae7a2be64099d098af4a5b3c0650ccb55ea3485760d983f22bf4d858a29e24efcd588cc349ed41d4304759d2e7634e6dcab3f48173d0aaa2135f6d6c7e60f69
 EBUILD spdlog-1.15.1.ebuild 1109 BLAKE2B 2be512ccca154c25c8ff77184454de5ad6a4439dffa7aee69cedb16591eee75a1fa52a0c4243cd8fe56e1b859ac71a4cbef0aad8775a2c99a00cdf65836db6bb SHA512 9e09f16ee4042f42e9e783aded46fac49e5f21e036afe58697f439933c07039cb91f147a60c3811fad29583076bfe40831c2a188bba38a5dde00060deafea89e
-EBUILD spdlog-1.15.2.ebuild 1117 BLAKE2B ec2d9170e86d0410ea49478a3d32bbe6bc19e7f15f3d7fe39106cdcb0f2324a0cd38dbc4af4939408f19315a74d1504ee7bb614c45ab54230ed365481a1c379f SHA512 78965393f016fb4dd52a88e3fc91abe250352aa6de163923d93709e80761eb77cdfe1deacbf111b8213dd8e2a4bb8b0f7401e52b18e6dcf4a1f1ce731ea7fa31
-EBUILD spdlog-1.15.3.ebuild 1111 BLAKE2B a26d40ceeb3f6f18ff3627934623ef625d8256e61aa3c62e6c5c3e50396d0ae9da448dc0ce7e99c276359be79f68fef59334a07caf5d450f5eaa8c9cdab04371 SHA512 588cc912c65f42dd544283228ce269498819deaf25b548cdf3ba233fc14bbe70dee279d87139e6c619e137071edbc52898644f309d5c620c90a0baaafba6c037
+EBUILD spdlog-1.15.3.ebuild 1120 BLAKE2B 78c9aa36a4915ff9e32be2b1cf8d576342f897c36a12b9aa6e581243a9835442b184c2d34f18be6b8b67db9206d7be8b3601dd0687a991ce1bea6e5a232b390e SHA512 c03139407eafcae485d9a17712b39a5290787cf9a2d50890e133f682b871a69c1c02408d52d3bccda17b52b34763f6b7679462e2cc4810292a55ca6d5c659fd6
 EBUILD spdlog-9999.ebuild 1117 BLAKE2B ec2d9170e86d0410ea49478a3d32bbe6bc19e7f15f3d7fe39106cdcb0f2324a0cd38dbc4af4939408f19315a74d1504ee7bb614c45ab54230ed365481a1c379f SHA512 78965393f016fb4dd52a88e3fc91abe250352aa6de163923d93709e80761eb77cdfe1deacbf111b8213dd8e2a4bb8b0f7401e52b18e6dcf4a1f1ce731ea7fa31
 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
deleted file mode 100644
index afada8092f377..0000000000000
--- a/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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/files/spdlog-1.15.0-libfmt-11.1.0.patch b/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch
deleted file mode 100644
index 12b8beb219fab..0000000000000
--- a/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/gabime/spdlog/pull/3301
-
-From e693420a38b58d29a56b3ea921e15b175a5f2843 Mon Sep 17 00:00:00 2001
-From: Rui Chen <rui@chenrui.dev>
-Date: Wed, 25 Dec 2024 19:00:36 -0500
-Subject: [PATCH] fix: update to_string_view function for fmt 11.1
-
-Signed-off-by: Rui Chen <rui@chenrui.dev>
----
- include/spdlog/common.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/include/spdlog/common.h b/include/spdlog/common.h
-index aca483c20..2d73f8300 100644
---- a/include/spdlog/common.h
-+++ b/include/spdlog/common.h
-@@ -365,10 +365,17 @@ 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
- template <typename T, typename... Args>
- SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
-
diff --git a/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild b/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild
deleted file mode 100644
index 88d80aea6ddba..0000000000000
--- a/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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-1.15.2.ebuild b/dev-libs/spdlog/spdlog-1.15.2.ebuild
deleted file mode 100644
index cfc1de0279b70..0000000000000
--- a/dev-libs/spdlog/spdlog-1.15.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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"
-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"
-)
-
-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=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.15.3.ebuild b/dev-libs/spdlog/spdlog-1.15.3.ebuild
index 93c1f36397490..69e1af2d75ba4 100644
--- a/dev-libs/spdlog/spdlog-1.15.3.ebuild
+++ b/dev-libs/spdlog/spdlog-1.15.3.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	)
 "
 DEPEND="
-	dev-libs/libfmt:=[${MULTILIB_USEDEP}]
+	>=dev-libs/libfmt-11.0.2:=[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"