gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 75 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 48a8382581a0..973c8b2bed22 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,7 +1,4 @@
-AUX spdlog-1.0.0-unbundle-fmt.patch 700 BLAKE2B d98e7dc4ad4b2911192053d1aec564f1e07c5dd7a5bfca39f30fd08e7210bc79749fed03b6e6137671156f814f4c07b6e47f56e11c69806cdb28a1a478cae8dd SHA512 cf86983ccbb975df3804f10fd581a4edbe11ba1d2b43312fb27c05ffc95269c8eeca75e38970697f34d9c5861b925537bc0a9b0bcfd84617d328d640cf668db8
-DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
-EBUILD spdlog-1.3.1.ebuild 810 BLAKE2B 7f495e88a4f8bd7f7818f22f6addaee6ed9895b7e9fb740eb2bd0bd6a0faf348f64a8259f7422ba5c0c31eda4840d31abd2971b1dd8cb79655664518df7a8305 SHA512 629167cf132eec58078359c08198afc6c67ce7c2e8049248ca9e5780a81b02d489c059803fcfb913c3cb638e4aa91bad07049dc67e6430590fd4131a996b6a5e
-EBUILD spdlog-1.5.0.ebuild 925 BLAKE2B 56768dd167a3c34ac4bf677e3a9eb8e5ed512323c6e2d451f71e7d228ebcfec1e0aaecca628f3b1e6a2a7e246e0828c1b331ac221a4f1975cd0317dea86a323f SHA512 b3e01691f3c64409dc155ab4baa4f9a7a9b7076a22b905f69241cc58edbabf797ab35a0bd73138fb1b10c5ba897099820ff378917e47b6a4952b3f88cff48b7c
+EBUILD spdlog-1.5.0.ebuild 941 BLAKE2B f70b860f6c8f28b203bb96c7bf9ec0e067feeb0629447ab580b7a17a2635bb855a66b12a71b42b39a4f495331baaa51c0932f721d7c088a6d7b6d875eb23be0f SHA512 437af08057c0023a43473cf1d046d92dc0e8335cf387e8dad7b58d77ccf068fb57a89747e28de348f4c21d5623bc2b002438d8addd1b94e3a4a20e80a6d85444
 EBUILD spdlog-9999.ebuild 913 BLAKE2B 1f0b536a67333e5d86ad9434c66323f5571e150b232c862a0768b32aa1da731ca58931cb1d548e86c3c52ac11feda5cbe4bec3a93b6850a4acf0b7a2694dad9d SHA512 3c8870bc75eec1f8e9378cea9ea6f8fbef529d50a5a84e1c52a82312b5d92af97f51d6fce683aba4fffd54620a387483e50e473b2368cad69431427ac556334b
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
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 c039dc47a6ae..000000000000
--- 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 <fmt/core.h>
- #include <fmt/format.h>
--#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 <fmt/ostream.h>
- #endif
-+
-+#include <fmt/ostream.h>
diff --git a/dev-libs/spdlog/spdlog-1.3.1.ebuild b/dev-libs/spdlog/spdlog-1.3.1.ebuild
deleted file mode 100644
index 69ab5a2e653a..000000000000
--- a/dev-libs/spdlog/spdlog-1.3.1.ebuild
+++ /dev/null
@@ -1,41 +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/spdlog"
-else
-	SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libfmt:0/5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
-
-src_configure() {
-	rm -r include/spdlog/fmt/bundled || die
-
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_EXAMPLES=no
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.5.0.ebuild b/dev-libs/spdlog/spdlog-1.5.0.ebuild
index 3327a764a463..ad9da48dcf3a 100644
--- a/dev-libs/spdlog/spdlog-1.5.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.5.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	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 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"