commit: 163972c7fddc08a68b1b9b4aa50a61e94df60716 Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Tue Jun 12 16:07:40 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Jun 12 17:38:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163972c7
dev-libs/spdlog: clean old ebuilds Closes: https://github.com/gentoo/gentoo/pull/8525 dev-libs/spdlog/Manifest | 2 - dev-libs/spdlog/files/spdlog-unbundle-fmt.patch | 90 ------------------------- dev-libs/spdlog/spdlog-0.16.2.ebuild | 38 ----------- dev-libs/spdlog/spdlog-0.16.3.ebuild | 38 ----------- 4 files changed, 168 deletions(-) diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index 68f096c7142..3f7a4c11c29 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1,3 +1 @@ -DIST spdlog-0.16.2.tar.gz 162709 BLAKE2B 7cd031bd9b1e01aa11186334ada9aad50cdc063942e0eb5b9d36e918e305db4c0e5657a215f24f458dbf792e05c38f74409bc7f5f88049bd1c4a759ccab0167e SHA512 454da17d75fa6dae074fb2ef10d93a1f9ccbf23b625521d32ce463a1362411ffc35ca33b081bee3cfb27bb647472de73899c9a15d24f09c8a3c9222560bcf559 -DIST spdlog-0.16.3.tar.gz 163636 BLAKE2B bebed0811976c5000481d9fa70107f79c3fb6180484afec611df9b3621349a91809e0f824583171a1c8bc89dae58a659c990fb4c6761da404f01a70868494f06 SHA512 6e08473825cf97dfb10b0e919b77996c1023bbfb583d851e961ec4a95094e4afffd1fc6f6e7e728ce8c2c69c9fb280c59f8d6494b50224bdf8cc68914ffd21e8 DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef 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 1b2449949bf..00000000000 --- 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.2.ebuild b/dev-libs/spdlog/spdlog-0.16.2.ebuild deleted file mode 100644 index b22d880ad03..00000000000 --- a/dev-libs/spdlog/spdlog-0.16.2.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.3.ebuild b/dev-libs/spdlog/spdlog-0.16.3.ebuild deleted file mode 100644 index b22d880ad03..00000000000 --- 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 - -}