gentoo resync : 20.03.2022

3 files changed, 70 insertions, 0 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 4f731ddfe3be..bb093ccbed5e 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,4 +1,5 @@
 AUX spdlog-1.8.5-libfmt-8-fix.patch 483 BLAKE2B f0412cf6755ee0a73ec444e5d9bf614e8367f2c71e490af83ee321a242e3eaaed15b77b5da91858a8f90b02cfc1baa43fd89d8472be2d187640fddcfe5f5b6bc SHA512 08c2e0a639eba9b13ef01400d9cf538afc2dc10981b52064e811d89f49c861d29bff12fdb948215581f39a2e868353d478b5c24df8760f3f5d49c50355ff32da
+AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
 DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
 DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
 DIST spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 54615 BLAKE2B 62b707fef02c7876692f7cc67119ea2b1a712d005d5367e5afdc50f42d6762f370a463ca3194e6850c059c679aef0e908471e0362afa2dc44a8bf7aaf19af2b0 SHA512 5d9868de7968ecf2c17b5fbb1199e70b064551bc2474fe563770d1e8d4b5f6d46d371091284c3bd10b47b3c7e94b134252e16f26b1834eff4390896acd773ecb
@@ -6,6 +7,7 @@ DIST spdlog-1.9.2.tar.gz 327799 BLAKE2B 8e4cce17887509512c0d3a63485f9271098bdf7f
 EBUILD spdlog-1.8.2.ebuild 937 BLAKE2B a9db146ab6298a6e26f4766688f44698c0481d92fbbbe4dc55d8fa3e9d49f1daa0e8700f57aef54a1058b12a54f4d2e3c1aa043aa564ea40dd341e736c65cc8d SHA512 00b74e07d570faab50f7ddd15b974eeb555da6bd497872d1b29befc141d7c6bb19f31557def0dd45f7d79c11f56a4e6adb71666c3d75b85627013b766b6437de
 EBUILD spdlog-1.8.5-r1.ebuild 994 BLAKE2B 6ef1bcad152f806226fb961fa9b104b1b6eefa6125d32e417fea3897e6d956f4c8db9285f5af0e09fd496015cce771beee8477f5ee53937e19eb2102c3a921cc SHA512 1b2f31d7a7e3318426d6d40a74979bb089ac37a087e213cfa999642166d959e0b50f97acaec467a3991a174dc52253170e27e26164a70e7f005604f6f206afd1
 EBUILD spdlog-1.8.5.ebuild 943 BLAKE2B a71c7a4086fcd802596747a90a598d9c5007c42fbe0fb350217f8695a4f591b254e4108d93ebfe412ffd60586b0e03021eb15c58aadafea889302347899ead5e SHA512 b8a1ea0a002c2e66fe9617d8779c3df8f69820e9380275c91292e2d86a38cdbdcb74a84f411e08997542faa785e17d4727b06a3f5b46bb14f93b6c7e9d4ac43a
+EBUILD spdlog-1.9.2-r1.ebuild 1217 BLAKE2B 38b19d6543a8f5a16b4772184616e6d23fa2f3c9cce17a5ec383e8fc43a693c5e2a1a3c7b4a2d9c3af3976f515debb9017774dcd28ada0dd35deca2687a23ad6 SHA512 ad839cf006344e954e0c9b2edb4306f70e4f0db61f36c23ce4b7c036767475e87230e73ce9263026351e2b96863a072cc0b63b981bdf733f87c3b6a30c3066b8
 EBUILD spdlog-1.9.2.ebuild 1159 BLAKE2B 8b2a3c7a564ef377e75c36999c21c499857446e6c022af52126863adfde6d7312b9cf3870b2623ef4f5ac41875fc51a79f4b350459f56ec1c3a708e88f51a102 SHA512 12280b7498a4b00806db8edd928a473e9ab557a9d268878e59d0c15b9be72f2f3875f40c24d196dfb2d2fac4c0cc8bf1a80809257c6cd53860c70f4bd077fe4d
 EBUILD spdlog-9999.ebuild 943 BLAKE2B 2648bd5446a12ed2e55af185461a42ce4a02ce83c6dcc97470fb2a4bf4a8fc20526a34773ae8499efb3886e974444e6e1e39785a5f200ce7611432d2ac82fb60 SHA512 e960e95684bcc5c8d73d9fdfd2d45348362fca6c4d991453a7ee64b6dd5014c158bdc3bef11d26ab4e8c68437f9ecd5d53b3e809765a5687a749330f516378fa
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/files/spdlog-force_external_fmt.patch b/dev-libs/spdlog/files/spdlog-force_external_fmt.patch
new file mode 100644
index 000000000000..79bbd94b34cd
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-force_external_fmt.patch
@@ -0,0 +1,15 @@
+diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
+index 24361f30..6b4fc14c 100644
+--- a/include/spdlog/tweakme.h
++++ b/include/spdlog/tweakme.h
+@@ -71,7 +71,9 @@
+ // In this case spdlog will try to include <fmt/format.h> so set your -I flag
+ // accordingly.
+ //
+-// #define SPDLOG_FMT_EXTERNAL
++#ifndef SPDLOG_FMT_EXTERNAL
++#define SPDLOG_FMT_EXTERNAL
++#endif
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ ///////////////////////////////////////////////////////////////////////////////
diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..c8f6d4c67329
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 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} == *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"
+	# Temporary for bug #811750
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-update-catch-glibc-2.34.patch.bz2 )"
+	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-8.0.0:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" )
+
+src_prepare() {
+	use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch
+
+	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
+}