gentoo resync : 25.11.2020

6 files changed, 5 insertions, 106 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 0fa8abcafc23..4a256ea2d352 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,11 +1,8 @@
-AUX spdlog-1.6.1-libfmt-7.0.0.patch 1218 BLAKE2B 2d3dce85374db1489c5a94eab92b24e947334b7e56345eac17d0e71a0fcce9c99d886f36695023d3af872bf76d5e325b50f5b82cbe979ef539e4db52eb8db1ee SHA512 bc3beb83654ca6c69d6732ccc62c33df202e14e53e0ac5a762d163efb933ba6ebb0d169c53067ba724216886f4036ebfdea1a86a21c3ff3f06a26049e85fac32
-AUX spdlog-1.6.1-tests-fix.patch 486 BLAKE2B 07ba02aa06ce18ffa0cba7f6c7b1a981733161e118c2a19dae0a6efaaa59f449036d43e87fefbf3ae1e51ba13f164987b82f87fa2409d68035d88f4e0b98bfb5 SHA512 798529555072bca9f720678cd4b7a9da8c83802aadc5e88c183a4a1278759ae23b4759ae94f3008b90cf11bbc6df371fac03f4f12967e013165a06ad13647fe8
 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
-DIST spdlog-1.6.1.tar.gz 285531 BLAKE2B 525f29098fd0f771e14cc7c4bd8bf5d4054a0f68255aea29ef5158ce61516d9e5f0ae0fb72a2f54303d18194a54acb5c1731f53ee6edcd74ff487227bc332236 SHA512 1e15e7710744212240d79897af8c3bde14fe3b745a1377643d18dc0038f18fc7582236ff21836d3eae2c75cf1f4820ca4c642c5c3f63f9ae138289aa4d00e22e
 DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a91d17b014abec26fd0f2ce3d25dd33cfb925f4468fa32da394f6efaca033290bdcf66abe8b067444999b87b63 SHA512 e15d461ac7a6d3d3186fe4283e4fbaf56b2ce3011babf892e3b2d3dbdd7e999a861f1f6f67a9d88a5cf488a440add087ea78e96131f49b52ed6c7815a972799a
+DIST spdlog-1.8.1.tar.gz 293528 BLAKE2B f5568a52489d9f6db459dd7733c493720551f7cb53be5f25fd7e02ec89de88b968bacd3eacb390473258cba2686e2614f21a700e3b3faf66d9b8eb74cfa263cb SHA512 ef855f4f91ed8aba89ef0191a9fd70f73a49567332f7eb42da1604e3a7dda3bbe48db3fd0fae317bb11ee95315d8cd62bf586d2de919ca0978d91e5a971b1c3f
 EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
-EBUILD spdlog-1.6.1-r1.ebuild 1031 BLAKE2B 8f524b4048ea904c75af6305fddbdadfc7db39bad605b43f4991df718955d1ca3a753e6c116c4c9e7566c08e3da5c2be1260901a504e6af963b70cbc5a65bbc7 SHA512 c51dea37423c49256ca17d12d3882b6babe2a3653a82122e03f9bdaeb7c3fe2e11535769a410c7fb6fd89472187d40cd111e18a15e79df2ebaffd379b1ee21ae
-EBUILD spdlog-1.6.1.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
 EBUILD spdlog-1.7.0.ebuild 937 BLAKE2B 415b5e6af56a86eb3c204d00f801cbf58d8763f7be2f9fe8a5891aca11dcb4f1b9ae5e748a5276cf052dea08b0e102c279233efd0055fc6fd3f91428d1f534f5 SHA512 714d48d21166541d80de368c508a4d299e2c4e883e0ffb819110c2ac9c722928e8105f94b37f82704b7a7f964ef7b8ec673099fdf0a8f515bef899d1c5edb129
-EBUILD spdlog-9999.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
+EBUILD spdlog-1.8.1.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
+EBUILD spdlog-9999.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
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 422a507a6d86..000000000000
--- 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 <candrews@integralblue.com>
-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<typename T>
- 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<unsigned int>(fmt::internal::count_digits(static_cast<count_type>(n)));
-+    return static_cast<unsigned int>(fmt::
-+// fmt 7.0.0 renamed the internal namespace to detail.
-+// See: https://github.com/fmtlib/fmt/issues/1538
-+#if FMT_VERSION < 70000
-+internal
-+#else
-+detail
-+#endif
-+::count_digits(static_cast<count_type>(n)));
- }
- 
- inline void pad2(int n, memory_buf_t &dest)
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 8a6aa8020f7d..000000000000
--- 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<spdlog::details::dump_info<T>>
-     auto parse(ParseContext &ctx) -> 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
deleted file mode 100644
index 6d996c6f8eae..000000000000
--- a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 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"
-	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-5.3.0:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libfmt-7.0.0.patch"
-	"${FILESDIR}/${P}-tests-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
-}
diff --git a/dev-libs/spdlog/spdlog-1.6.1.ebuild b/dev-libs/spdlog/spdlog-1.8.1.ebuild
index 6da33cbbf3c6..0cd2105637eb 100644
--- a/dev-libs/spdlog/spdlog-1.6.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.8.1.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	>=dev-libs/libfmt-5.3.0:=
+	>=dev-libs/libfmt-6.1.2:=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 6da33cbbf3c6..0cd2105637eb 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	>=dev-libs/libfmt-5.3.0:=
+	>=dev-libs/libfmt-6.1.2:=
 "
 RDEPEND="${DEPEND}"