gentoo resync : 06.01.2018

7 files changed, 105 insertions, 118 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 863ca2b86d5c..4d288d8bf6d8 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,10 +1,6 @@
 AUX spdlog-0.14.0-CMakeLists.txt 3333 BLAKE2B 1ea839f706f91d648ae143099599b680f995996732e62325333b97a4a0a9cb4e96dff2cebd7c533a556ac79ff01e2fdb1dcb27cca88510ac0889670bfb3f2169 SHA512 0bd9c7da1ef0a55c82bb3242d894d550e392b921bb50cdd16a842b33c05fffec9be42aef6aa91c3c11f30e6a6924e63c20ac4c89367bdac65dc40556dc60fc36
-DIST spdlog-0.13.0.tar.gz 154551 BLAKE2B 1b20393a305ac020aa422b174d5b707bbffd8efb38708807e40a3a13d3483fe5c73ea8e47a5ded89e49b9699ab844b25ce7bff7fa07bd6f79212bdc9fc0afb64 SHA512 5bb89cbeb17a054832ce70f6013d54e7641c1aa36cbad08388b4a2e63f4851943edfe292551ff01de6de1ed6325617384325a67f3e1024f346c6d22a1148c80c
-DIST spdlog-0.14.0.tar.gz 155590 BLAKE2B fb070e1049977ded34fef4953e743b7a3c4c745093e2d1974d0749f065799d6021046f5e913cee3b17e5ace9cdbd8a787532f7426ffc47bd8a7f1ab8d4fd4869 SHA512 f49b7f26f4fde57fe16f32ab89082f0c590645c627f5b4646f633a16f3eec2926b3465e742bc4899cb802e7b974978c547638205065e9955ed9696fbcaf0b444
-DIST spdlog-0.16.1.tar.gz 162408 BLAKE2B c90b94bac128f8b143d85522d224223b1361f7d552d9caa8b253e494dd72de56a2149cbd8d568eb4305224d7caf80d8067fbce606a1071bd94f74c43b3245782 SHA512 0ef741f2abcae7c925808b44bba7d2e55aa8bd3b07a77ab6e785068beb505cdbcd7835d7d103e8e96094235e262954969a176d9f4977e9d373f1bee8e2716ff2
-EBUILD spdlog-0.13.0.ebuild 655 BLAKE2B 7efc471cc3f96964966c4f85831c2f66e5d643d9da5d5b2d97c3081039bc71407eabedd82f921ecc7ffd02506bdea04ac216d350da0f8f8c78b094738b1cafc3 SHA512 591f8661dbb8c37b15e5206db62bd1b06046e93d0071cbcb4624126561fd4825d37e956e6a7a9e6c9429ff69f0d9be68f3046e0b091f9278820a449043a1274f
-EBUILD spdlog-0.14.0-r1.ebuild 811 BLAKE2B 97445c23b72cd63c4b22a4cd7252a7dd709b9f9539194f291113f9b119259e4244725daa3c0066afba0c9d29a2fd56d40cda8d1192a8520097651ad2b8e313d8 SHA512 36fa654c0130d38e8d0cbe99a9c2e7ead09f611681cbe31e6e6d03101502b4fb0d6633c5a6e1f9edf9853ec065bcaf6f8139146934a74805d3240df9bbc08253
-EBUILD spdlog-0.14.0.ebuild 655 BLAKE2B 7efc471cc3f96964966c4f85831c2f66e5d643d9da5d5b2d97c3081039bc71407eabedd82f921ecc7ffd02506bdea04ac216d350da0f8f8c78b094738b1cafc3 SHA512 591f8661dbb8c37b15e5206db62bd1b06046e93d0071cbcb4624126561fd4825d37e956e6a7a9e6c9429ff69f0d9be68f3046e0b091f9278820a449043a1274f
-EBUILD spdlog-0.16.1.ebuild 655 BLAKE2B 7efc471cc3f96964966c4f85831c2f66e5d643d9da5d5b2d97c3081039bc71407eabedd82f921ecc7ffd02506bdea04ac216d350da0f8f8c78b094738b1cafc3 SHA512 591f8661dbb8c37b15e5206db62bd1b06046e93d0071cbcb4624126561fd4825d37e956e6a7a9e6c9429ff69f0d9be68f3046e0b091f9278820a449043a1274f
-EBUILD spdlog-9999.ebuild 654 BLAKE2B f8096b999c466f452802f5749079324b25a1712f2206a98b7e040ffdec49ba6c19e5c5af8e1a94b9217b8f7a51be6d6785dd8d41a9b7af6cf05713f4a689249f SHA512 9b05944a4315d580517e83876ac4578ccab130b9565699d987cdccf6782f3c2fc9252628ad09f730932e58fb950aa67b721571771d6bc9535e39e29019782915
+AUX spdlog-unbundle-fmt.patch 2765 BLAKE2B 0ef7974992efcd82442dd658ffd93c2605b4ae6eb6a63dee0892b5c9ec1fbec22f76821ba7c4715ec4f42f88f4bc626c0b5b92b656ff7f8e4f4b299dac4f85c6 SHA512 14e3dd4cf5c3604547d01c0e940c0ee4771667039601c769e941a4719bef7a23fcb6e14455abda0365e708b81d1fd36160c238dba3c01b4124866a59de4e3991
+DIST spdlog-0.16.2.tar.gz 162709 BLAKE2B 7cd031bd9b1e01aa11186334ada9aad50cdc063942e0eb5b9d36e918e305db4c0e5657a215f24f458dbf792e05c38f74409bc7f5f88049bd1c4a759ccab0167e SHA512 454da17d75fa6dae074fb2ef10d93a1f9ccbf23b625521d32ce463a1362411ffc35ca33b081bee3cfb27bb647472de73899c9a15d24f09c8a3c9222560bcf559
+EBUILD spdlog-0.16.2.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
+EBUILD spdlog-9999.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
new file mode 100644
index 000000000000..1b2449949bfe
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
@@ -0,0 +1,90 @@
+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.14.0-r1.ebuild b/dev-libs/spdlog/spdlog-0.14.0-r1.ebuild
deleted file mode 100644
index 0118dd39d236..000000000000
--- a/dev-libs/spdlog/spdlog-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,40 +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=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# root CMakeLists.txt is CRLF line terminated, so...
-	cp "${FILESDIR}"/${P}-CMakeLists.txt CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-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.14.0.ebuild b/dev-libs/spdlog/spdlog-0.14.0.ebuild
deleted file mode 100644
index c3fad9652964..000000000000
--- a/dev-libs/spdlog/spdlog-0.14.0.ebuild
+++ /dev/null
@@ -1,34 +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=""
-RDEPEND="${DEPEND}"
-
-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.1.ebuild b/dev-libs/spdlog/spdlog-0.16.1.ebuild
deleted file mode 100644
index c3fad9652964..000000000000
--- a/dev-libs/spdlog/spdlog-0.16.1.ebuild
+++ /dev/null
@@ -1,34 +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=""
-RDEPEND="${DEPEND}"
-
-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.13.0.ebuild b/dev-libs/spdlog/spdlog-0.16.2.ebuild
index c3fad9652964..b22d880ad039 100644
--- a/dev-libs/spdlog/spdlog-0.13.0.ebuild
+++ b/dev-libs/spdlog/spdlog-0.16.2.ebuild
@@ -20,9 +20,13 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 
-DEPEND=""
+DEPEND="
+	dev-libs/libfmt
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 			-DSPDLOG_BUILD_EXAMPLES=no
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 4c9cf2286540..b22d880ad039 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -20,9 +20,13 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 
-DEPEND=""
+DEPEND="
+	dev-libs/libfmt
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 			-DSPDLOG_BUILD_EXAMPLES=no
@@ -30,4 +34,5 @@ src_configure() {
 	)
 
 	cmake-utils_src_configure
+
 }