gentoo resync : 03.11.2018

4 files changed, 5 insertions, 82 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 95f1f64ca01b..3ead241f43f5 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,10 +1,7 @@
-AUX spdlog-0.17.0-unbundle-fmt.patch 790 BLAKE2B 68a51e9dde9d25f0ec8978f4037c10fb6c8aa6cdc24d6a9b374b51ae85a0ff78a5bb6803c4a6ee1c9b2a68134e7ece90832c79dd0c86ef615b4e469dcb97cb05 SHA512 884893c67e3753efc7565aaa30694dcd0709cd472cd2e08a47584aca6b8aed4385b7f1da860777ba7f93eaf96c068b270f520c5a7aaa21c0d279994edc2addd1
-AUX spdlog-1.0.0-unbundle-fmt.patch 707 BLAKE2B a62f2c48007de2a48fb1f6f28bd0aa6066a80162043671a0469ced1d6f3cbb694adae7c527f78e5b03834698757bc81b1df364030d24b7ef3590088c5c0a6bd7 SHA512 331df98d98d76c5452321710f5ff0927ec9b10e27065e259118b1d4ec1b723853ca13e0930f7054b0bb9b411bb60f57f2dd3015481c26a6c886eca4da1c33c27
-DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
+AUX spdlog-1.0.0-unbundle-fmt.patch 700 BLAKE2B d98e7dc4ad4b2911192053d1aec564f1e07c5dd7a5bfca39f30fd08e7210bc79749fed03b6e6137671156f814f4c07b6e47f56e11c69806cdb28a1a478cae8dd SHA512 cf86983ccbb975df3804f10fd581a4edbe11ba1d2b43312fb27c05ffc95269c8eeca75e38970697f34d9c5861b925537bc0a9b0bcfd84617d328d640cf668db8
 DIST spdlog-1.0.0.tar.gz 183855 BLAKE2B 30d54fef03a83f968cfebacf95a484ff397126771a7ea022556aebd07e2f7694af35b278f75ee24372283ff1428e21247fd4329794d64a65bd6220a93f21db3c SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1
 DIST spdlog-1.1.0.tar.gz 183937 BLAKE2B 51af49f641df69e78835bd6b9545da53c0e111bab60a5f0dbf4a1d0e70101309394ffea195176ea371f08b772c2be1c22c2da16006fc9699f47593cf82a6c0fd SHA512 65fbe6e9dffb25e814f72f2ef7982eed213fc16edfabb1377f865c94fd0488190e160dfea83ac06979a41f2fb2fa47a454989ebee0a2c5012bd404b977648439
 DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
-EBUILD spdlog-0.17.0.ebuild 778 BLAKE2B ca2793ad8aae142f0d08453d22f0369fd11d5cde01d7c94055af10d24bd987cf7ef995d142d43bcbb06961a693677f6b332373fe145d5e3270517f99ea2bf18d SHA512 f07f53320df02c39b51683d4ad461be31f8362f087e8c5f3d15112f14468df9bd8a881404bc1d75c0ddadecdae4301fa275ce8fdad17be5dddf92a7ce49f8e2d
 EBUILD spdlog-1.0.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 EBUILD spdlog-1.1.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 EBUILD spdlog-1.2.1.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
diff --git a/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch
deleted file mode 100644
index e3e0df833537..000000000000
--- a/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch
+++ /dev/null
@@ -1,35 +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
-@@ -18,16 +18,11 @@
- #ifndef FMT_USE_WINDOWS_H
- #define FMT_USE_WINDOWS_H 0
- #endif
--#include "bundled/format.h"
--#if defined(SPDLOG_FMT_PRINTF)
--#include "bundled/printf.h"
--#endif
- 
--#else // external fmtlib
-+#endif // external fmtlib
- 
- #include <fmt/format.h>
- #if defined(SPDLOG_FMT_PRINTF)
- #include <fmt/printf.h>
- #endif
- 
--#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/files/spdlog-1.0.0-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
index 9b04f276ba55..c039dc47a6ae 100644
--- a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
+++ b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch
@@ -1,18 +1,18 @@
 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
-@@ -16,10 +16,7 @@
- #endif
+@@ -17,9 +17,7 @@
  #ifndef FMT_USE_WINDOWS_H
  #define FMT_USE_WINDOWS_H 0
--#endif
+ #endif
 -#include "bundled/core.h"
 -#include "bundled/format.h"
 -#else // external fmtlib
 +#endif // external fmtlib
++
  #include <fmt/core.h>
  #include <fmt/format.h>
- #endif
+-#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
diff --git a/dev-libs/spdlog/spdlog-0.17.0.ebuild b/dev-libs/spdlog/spdlog-0.17.0.ebuild
deleted file mode 100644
index e42aaade7db6..000000000000
--- a/dev-libs/spdlog/spdlog-0.17.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-IUSE="test"
-
-DEPEND="
-	<=dev-libs/libfmt-4.1.0
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.17.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
-}