gentoo resync : 16.06.2018

6 files changed, 55 insertions, 148 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index fe182e4301b8..0db89a277723 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,7 +1,5 @@
-AUX spdlog-unbundle-fmt.patch 2765 BLAKE2B 0ef7974992efcd82442dd658ffd93c2605b4ae6eb6a63dee0892b5c9ec1fbec22f76821ba7c4715ec4f42f88f4bc626c0b5b92b656ff7f8e4f4b299dac4f85c6 SHA512 14e3dd4cf5c3604547d01c0e940c0ee4771667039601c769e941a4719bef7a23fcb6e14455abda0365e708b81d1fd36160c238dba3c01b4124866a59de4e3991
-DIST spdlog-0.16.2.tar.gz 162709 BLAKE2B 7cd031bd9b1e01aa11186334ada9aad50cdc063942e0eb5b9d36e918e305db4c0e5657a215f24f458dbf792e05c38f74409bc7f5f88049bd1c4a759ccab0167e SHA512 454da17d75fa6dae074fb2ef10d93a1f9ccbf23b625521d32ce463a1362411ffc35ca33b081bee3cfb27bb647472de73899c9a15d24f09c8a3c9222560bcf559
-DIST spdlog-0.16.3.tar.gz 163636 BLAKE2B bebed0811976c5000481d9fa70107f79c3fb6180484afec611df9b3621349a91809e0f824583171a1c8bc89dae58a659c990fb4c6761da404f01a70868494f06 SHA512 6e08473825cf97dfb10b0e919b77996c1023bbfb583d851e961ec4a95094e4afffd1fc6f6e7e728ce8c2c69c9fb280c59f8d6494b50224bdf8cc68914ffd21e8
-EBUILD spdlog-0.16.2.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
-EBUILD spdlog-0.16.3.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
-EBUILD spdlog-9999.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
+AUX spdlog-0.17.0-unbundle-fmt.patch 790 BLAKE2B 68a51e9dde9d25f0ec8978f4037c10fb6c8aa6cdc24d6a9b374b51ae85a0ff78a5bb6803c4a6ee1c9b2a68134e7ece90832c79dd0c86ef615b4e469dcb97cb05 SHA512 884893c67e3753efc7565aaa30694dcd0709cd472cd2e08a47584aca6b8aed4385b7f1da860777ba7f93eaf96c068b270f520c5a7aaa21c0d279994edc2addd1
+DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
+EBUILD spdlog-0.17.0.ebuild 778 BLAKE2B ca2793ad8aae142f0d08453d22f0369fd11d5cde01d7c94055af10d24bd987cf7ef995d142d43bcbb06961a693677f6b332373fe145d5e3270517f99ea2bf18d SHA512 f07f53320df02c39b51683d4ad461be31f8362f087e8c5f3d15112f14468df9bd8a881404bc1d75c0ddadecdae4301fa275ce8fdad17be5dddf92a7ce49f8e2d
+EBUILD spdlog-9999.ebuild 778 BLAKE2B ca2793ad8aae142f0d08453d22f0369fd11d5cde01d7c94055af10d24bd987cf7ef995d142d43bcbb06961a693677f6b332373fe145d5e3270517f99ea2bf18d SHA512 f07f53320df02c39b51683d4ad461be31f8362f087e8c5f3d15112f14468df9bd8a881404bc1d75c0ddadecdae4301fa275ce8fdad17be5dddf92a7ce49f8e2d
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
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
new file mode 100644
index 000000000000..e3e0df833537
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch
@@ -0,0 +1,35 @@
+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-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
deleted file mode 100644
index 1b2449949bfe..000000000000
--- a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 52d2953..d132d26 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,6 +80,7 @@ install(
- install(
-     DIRECTORY "${HEADER_BASE}/${PROJECT_NAME}"
-     DESTINATION "${include_install_dir}"
-+    PATTERN "bundled*" EXCLUDE
- )
- 
- # install project version file
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
-index 92ca4e5..55f1fa8 100644
---- a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -10,25 +10,7 @@
- // By default spdlog include its own copy.
- //
- 
--#if !defined(SPDLOG_FMT_EXTERNAL)
--
--#ifndef FMT_HEADER_ONLY
--#define FMT_HEADER_ONLY
--#endif
--#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
--
- #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
-index 5cdd5cd..d70c6b3 100644
---- a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
-@@ -7,11 +7,6 @@
- 
- // include external or bundled copy of fmtlib's ostream support
- //
--#if !defined(SPDLOG_FMT_EXTERNAL)
--#include "fmt.h"
--#include "bundled/ostream.h"
--#else
- #include <fmt/ostream.h>
--#endif
- 
- 
-diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
-index ad01a09..9a1bec4 100644
---- a/include/spdlog/tweakme.h
-+++ b/include/spdlog/tweakme.h
-@@ -98,14 +98,6 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- 
--///////////////////////////////////////////////////////////////////////////////
--// Uncomment to use your own copy of the fmt library instead of spdlog's copy.
--// In this case spdlog will try to include <fmt/format.h> so set your -I flag accordingly.
--//
--// #define SPDLOG_FMT_EXTERNAL
--///////////////////////////////////////////////////////////////////////////////
--
--
- ///////////////////////////////////////////////////////////////////////////////
- // Uncomment to use printf-style messages in your logs instead of the usual
- // format-style used by default.
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 22329b4..44dad86 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -13,7 +13,7 @@ target_include_directories(catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
- file(GLOB catch_tests LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h *.hpp)

- 

- add_executable(catch_tests ${catch_tests})

--target_link_libraries(catch_tests spdlog ${CMAKE_THREAD_LIBS_INIT})

-+target_link_libraries(catch_tests spdlog fmt ${CMAKE_THREAD_LIBS_INIT})

- add_test(NAME catch_tests COMMAND catch_tests)

- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")

- 

diff --git a/dev-libs/spdlog/spdlog-0.16.3.ebuild b/dev-libs/spdlog/spdlog-0.16.3.ebuild
deleted file mode 100644
index b22d880ad039..000000000000
--- a/dev-libs/spdlog/spdlog-0.16.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 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
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-			-DSPDLOG_BUILD_EXAMPLES=no
-			-DSPDLOG_BUILD_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-
-}
diff --git a/dev-libs/spdlog/spdlog-0.16.2.ebuild b/dev-libs/spdlog/spdlog-0.17.0.ebuild
index b22d880ad039..e42aaade7db6 100644
--- a/dev-libs/spdlog/spdlog-0.16.2.ebuild
+++ b/dev-libs/spdlog/spdlog-0.17.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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."
+DESCRIPTION="Very fast, header only, C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
 
 if [[ ${PV} == *9999 ]]; then
@@ -21,18 +21,19 @@ SLOT="0"
 IUSE="test"
 
 DEPEND="
-	dev-libs/libfmt
+	<=dev-libs/libfmt-4.1.0
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
+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)
+		-DSPDLOG_BUILD_EXAMPLES=no
+		-DSPDLOG_BUILD_TESTING=$(usex test)
 	)
 
 	cmake-utils_src_configure
-
 }
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index b22d880ad039..e42aaade7db6 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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."
+DESCRIPTION="Very fast, header only, C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
 
 if [[ ${PV} == *9999 ]]; then
@@ -21,18 +21,19 @@ SLOT="0"
 IUSE="test"
 
 DEPEND="
-	dev-libs/libfmt
+	<=dev-libs/libfmt-4.1.0
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
+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)
+		-DSPDLOG_BUILD_EXAMPLES=no
+		-DSPDLOG_BUILD_TESTING=$(usex test)
 	)
 
 	cmake-utils_src_configure
-
 }