gentoo resync : 21.01.2020

5 files changed, 29 insertions, 105 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index e7ced24fd87a..a035ccb49d3b 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,10 +1,7 @@
 AUX spdlog-1.0.0-unbundle-fmt.patch 700 BLAKE2B d98e7dc4ad4b2911192053d1aec564f1e07c5dd7a5bfca39f30fd08e7210bc79749fed03b6e6137671156f814f4c07b6e47f56e11c69806cdb28a1a478cae8dd SHA512 cf86983ccbb975df3804f10fd581a4edbe11ba1d2b43312fb27c05ffc95269c8eeca75e38970697f34d9c5861b925537bc0a9b0bcfd84617d328d640cf668db8
-AUX spdlog-9999-unbundle-fmt.patch 1307 BLAKE2B 40bdef65614b1c3f0bf288a7b8bc35294abbae4c9f46ba0499594865f47b3b73bdce4915f652d97f5088aa51a9922ed32a4874f318dd9e426ea6a5a0a0b02896 SHA512 15c12c44fce33f65a0068a790e3deaa120c3ff3eb8820b62b95d424a1190957d346f0bec0725132c818e3a6184da81681c4766da9b7d09f11d2d76f5be88ec4c
-DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
-DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 97027a3672b826e294dbdc202afa913a42ddae5a02a569ac28c41d79b96128de045ac5df30a76d888d6b3bea5093fb75b006365d7b1b296842750a39f43835d6 SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f
 DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
-EBUILD spdlog-1.2.1.ebuild 798 BLAKE2B 8ffe4e5f77b92df1224f720f5b3fa80343d2e4ebd358601993c55cc2a461e50acef7edf02a3114d0c6131d178a9ec5dd8e5307b0a09fae5077ddb756bdd0df35 SHA512 f9aff80aa1788c66653038857412a90b8b117f6d49a624f4b59734f8eb0dcc292914b42090389e3a2781543ae87193b7e4546398e6e1a988c7daf99769bb4610
-EBUILD spdlog-1.3.0.ebuild 815 BLAKE2B 2520532be01f53bb3d8d0456a9fc4d5b089c8afe47856875aa430836114b49c58f62f5de9cfe61b126d0d5ee52ff88f89da8ea69d54007f675fea7cd3b950917 SHA512 c63ca281d591f47bf05cf08097cba70a339935c002a71e214c1e36e49de03a208d0114fac7e21dbd3bcb5d4c5d626cb1b428e4245a109a01e6d97fd2cf73dc60
+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-9999.ebuild 813 BLAKE2B 71b8a277040b9d9a2f481c1ca81ca7672cae9e3a98e347755dd5dd4bec11e6b33a9e755ec116c5743662369d7f3427f5339d84324c646784c4873bf83314a970 SHA512 854576a2045b682983ed166c16558789ae3db138b480dc28f0dfb0b73a2f8fbaa3936d43159691f71d86b86ea3b4614f073f9402258946ae9f37637f423f6b32
+EBUILD spdlog-1.5.0.ebuild 913 BLAKE2B 1f0b536a67333e5d86ad9434c66323f5571e150b232c862a0768b32aa1da731ca58931cb1d548e86c3c52ac11feda5cbe4bec3a93b6850a4acf0b7a2694dad9d SHA512 3c8870bc75eec1f8e9378cea9ea6f8fbef529d50a5a84e1c52a82312b5d92af97f51d6fce683aba4fffd54620a387483e50e473b2368cad69431427ac556334b
+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-9999-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch
deleted file mode 100644
index f6f37b5e493c..000000000000
--- a/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
-index 5d039b8c..8107b19a 100644
---- a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -19,9 +19,6 @@
- #ifndef FMT_USE_WINDOWS_H
- #define FMT_USE_WINDOWS_H 0
- #endif
--#include "bundled/core.h"
--#include "bundled/format.h"
--#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
--#include "fmt/core.h"
--#include "fmt/format.h"
--#endif
-+#endif // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
-+#include <fmt/core.h>
-+#include <fmt/format.h>
-diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
-index 9902898f..5e92a592 100644
---- 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/src/spdlog.cpp b/src/spdlog.cpp
-index be91412d..d68dd522 100644
---- a/src/spdlog.cpp
-+++ b/src/spdlog.cpp
-@@ -104,7 +104,7 @@ template std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_
- // All rights reserved.
- 
- #if !defined(SPDLOG_FMT_EXTERNAL)
--#include "spdlog/fmt/bundled/format-inl.h"
-+#include <fmt/format-inl.h>
- 
- FMT_BEGIN_NAMESPACE
- template struct internal::basic_data<void>;
diff --git a/dev-libs/spdlog/spdlog-1.2.1.ebuild b/dev-libs/spdlog/spdlog-1.2.1.ebuild
deleted file mode 100644
index 3d2b30260e2e..000000000000
--- a/dev-libs/spdlog/spdlog-1.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.3.0.ebuild b/dev-libs/spdlog/spdlog-1.5.0.ebuild
index f6cb54548b9b..060e167a8afd 100644
--- a/dev-libs/spdlog/spdlog-1.3.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.5.0.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/gabime/spdlog"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/spdlog"
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
-	SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -21,19 +21,25 @@ SLOT="0/1"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	virtual/pkgconfig
+"
 DEPEND="
-	>=dev-libs/libfmt-5.0.0
+	>=dev-libs/libfmt-5.3.0:=
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
+src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
 
 src_configure() {
-	rm -r include/spdlog/fmt/bundled || die
-
 	local mycmakeargs=(
-		-DSPDLOG_BUILD_EXAMPLES=no
 		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=no
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
 
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index f0b80109ac4a..060e167a8afd 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/gabime/spdlog"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/spdlog"
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
-	SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -21,19 +21,25 @@ SLOT="0/1"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	virtual/pkgconfig
+"
 DEPEND="
-	>=dev-libs/libfmt-5.0.0
+	>=dev-libs/libfmt-5.3.0:=
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-9999-unbundle-fmt.patch" )
+src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
 
 src_configure() {
-	rm -r include/spdlog/fmt/bundled || die
-
 	local mycmakeargs=(
-		-DSPDLOG_BUILD_EXAMPLE=no
 		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=no
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)