1 |
commit: 163972c7fddc08a68b1b9b4aa50a61e94df60716 |
2 |
Author: David Roman <davidroman96 <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jun 12 16:07:40 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 12 17:38:45 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163972c7 |
7 |
|
8 |
dev-libs/spdlog: clean old ebuilds |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/8525 |
11 |
|
12 |
dev-libs/spdlog/Manifest | 2 - |
13 |
dev-libs/spdlog/files/spdlog-unbundle-fmt.patch | 90 ------------------------- |
14 |
dev-libs/spdlog/spdlog-0.16.2.ebuild | 38 ----------- |
15 |
dev-libs/spdlog/spdlog-0.16.3.ebuild | 38 ----------- |
16 |
4 files changed, 168 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest |
19 |
index 68f096c7142..3f7a4c11c29 100644 |
20 |
--- a/dev-libs/spdlog/Manifest |
21 |
+++ b/dev-libs/spdlog/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST spdlog-0.16.2.tar.gz 162709 BLAKE2B 7cd031bd9b1e01aa11186334ada9aad50cdc063942e0eb5b9d36e918e305db4c0e5657a215f24f458dbf792e05c38f74409bc7f5f88049bd1c4a759ccab0167e SHA512 454da17d75fa6dae074fb2ef10d93a1f9ccbf23b625521d32ce463a1362411ffc35ca33b081bee3cfb27bb647472de73899c9a15d24f09c8a3c9222560bcf559 |
24 |
-DIST spdlog-0.16.3.tar.gz 163636 BLAKE2B bebed0811976c5000481d9fa70107f79c3fb6180484afec611df9b3621349a91809e0f824583171a1c8bc89dae58a659c990fb4c6761da404f01a70868494f06 SHA512 6e08473825cf97dfb10b0e919b77996c1023bbfb583d851e961ec4a95094e4afffd1fc6f6e7e728ce8c2c69c9fb280c59f8d6494b50224bdf8cc68914ffd21e8 |
25 |
DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef |
26 |
|
27 |
diff --git a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch |
28 |
deleted file mode 100644 |
29 |
index 1b2449949bf..00000000000 |
30 |
--- a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch |
31 |
+++ /dev/null |
32 |
@@ -1,90 +0,0 @@ |
33 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
34 |
-index 52d2953..d132d26 100644 |
35 |
---- a/CMakeLists.txt |
36 |
-+++ b/CMakeLists.txt |
37 |
-@@ -80,6 +80,7 @@ install( |
38 |
- install( |
39 |
- DIRECTORY "${HEADER_BASE}/${PROJECT_NAME}" |
40 |
- DESTINATION "${include_install_dir}" |
41 |
-+ PATTERN "bundled*" EXCLUDE |
42 |
- ) |
43 |
- |
44 |
- # install project version file |
45 |
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h |
46 |
-index 92ca4e5..55f1fa8 100644 |
47 |
---- a/include/spdlog/fmt/fmt.h |
48 |
-+++ b/include/spdlog/fmt/fmt.h |
49 |
-@@ -10,25 +10,7 @@ |
50 |
- // By default spdlog include its own copy. |
51 |
- // |
52 |
- |
53 |
--#if !defined(SPDLOG_FMT_EXTERNAL) |
54 |
-- |
55 |
--#ifndef FMT_HEADER_ONLY |
56 |
--#define FMT_HEADER_ONLY |
57 |
--#endif |
58 |
--#ifndef FMT_USE_WINDOWS_H |
59 |
--#define FMT_USE_WINDOWS_H 0 |
60 |
--#endif |
61 |
--#include "bundled/format.h" |
62 |
--#if defined(SPDLOG_FMT_PRINTF) |
63 |
--#include "bundled/printf.h" |
64 |
--#endif |
65 |
-- |
66 |
--#else //external fmtlib |
67 |
-- |
68 |
- #include <fmt/format.h> |
69 |
- #if defined(SPDLOG_FMT_PRINTF) |
70 |
- #include <fmt/printf.h> |
71 |
- #endif |
72 |
-- |
73 |
--#endif |
74 |
-- |
75 |
-diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h |
76 |
-index 5cdd5cd..d70c6b3 100644 |
77 |
---- a/include/spdlog/fmt/ostr.h |
78 |
-+++ b/include/spdlog/fmt/ostr.h |
79 |
-@@ -7,11 +7,6 @@ |
80 |
- |
81 |
- // include external or bundled copy of fmtlib's ostream support |
82 |
- // |
83 |
--#if !defined(SPDLOG_FMT_EXTERNAL) |
84 |
--#include "fmt.h" |
85 |
--#include "bundled/ostream.h" |
86 |
--#else |
87 |
- #include <fmt/ostream.h> |
88 |
--#endif |
89 |
- |
90 |
- |
91 |
-diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h |
92 |
-index ad01a09..9a1bec4 100644 |
93 |
---- a/include/spdlog/tweakme.h |
94 |
-+++ b/include/spdlog/tweakme.h |
95 |
-@@ -98,14 +98,6 @@ |
96 |
- /////////////////////////////////////////////////////////////////////////////// |
97 |
- |
98 |
- |
99 |
--/////////////////////////////////////////////////////////////////////////////// |
100 |
--// Uncomment to use your own copy of the fmt library instead of spdlog's copy. |
101 |
--// In this case spdlog will try to include <fmt/format.h> so set your -I flag accordingly. |
102 |
--// |
103 |
--// #define SPDLOG_FMT_EXTERNAL |
104 |
--/////////////////////////////////////////////////////////////////////////////// |
105 |
-- |
106 |
-- |
107 |
- /////////////////////////////////////////////////////////////////////////////// |
108 |
- // Uncomment to use printf-style messages in your logs instead of the usual |
109 |
- // format-style used by default. |
110 |
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
111 |
-index 22329b4..44dad86 100644 |
112 |
---- a/tests/CMakeLists.txt |
113 |
-+++ b/tests/CMakeLists.txt |
114 |
-@@ -13,7 +13,7 @@ target_include_directories(catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) |
115 |
- file(GLOB catch_tests LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h *.hpp) |
116 |
- |
117 |
- add_executable(catch_tests ${catch_tests}) |
118 |
--target_link_libraries(catch_tests spdlog ${CMAKE_THREAD_LIBS_INIT}) |
119 |
-+target_link_libraries(catch_tests spdlog fmt ${CMAKE_THREAD_LIBS_INIT}) |
120 |
- add_test(NAME catch_tests COMMAND catch_tests) |
121 |
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs") |
122 |
- |
123 |
|
124 |
diff --git a/dev-libs/spdlog/spdlog-0.16.2.ebuild b/dev-libs/spdlog/spdlog-0.16.2.ebuild |
125 |
deleted file mode 100644 |
126 |
index b22d880ad03..00000000000 |
127 |
--- a/dev-libs/spdlog/spdlog-0.16.2.ebuild |
128 |
+++ /dev/null |
129 |
@@ -1,38 +0,0 @@ |
130 |
-# Copyright 1999-2017 Gentoo Foundation |
131 |
-# Distributed under the terms of the GNU General Public License v2 |
132 |
- |
133 |
-EAPI=6 |
134 |
- |
135 |
-inherit cmake-utils |
136 |
- |
137 |
-DESCRIPTION="Very fast, header only, C++ logging library." |
138 |
-HOMEPAGE="https://github.com/gabime/spdlog" |
139 |
- |
140 |
-if [[ ${PV} == *9999 ]]; then |
141 |
- inherit git-r3 |
142 |
- EGIT_REPO_URI="https://github.com/gabime/spdlog" |
143 |
-else |
144 |
- SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
145 |
- KEYWORDS="~amd64" |
146 |
-fi |
147 |
- |
148 |
-LICENSE="MIT" |
149 |
-SLOT="0" |
150 |
-IUSE="test" |
151 |
- |
152 |
-DEPEND=" |
153 |
- dev-libs/libfmt |
154 |
-" |
155 |
-RDEPEND="${DEPEND}" |
156 |
- |
157 |
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" ) |
158 |
- |
159 |
-src_configure() { |
160 |
- local mycmakeargs=( |
161 |
- -DSPDLOG_BUILD_EXAMPLES=no |
162 |
- -DSPDLOG_BUILD_TESTING=$(usex test) |
163 |
- ) |
164 |
- |
165 |
- cmake-utils_src_configure |
166 |
- |
167 |
-} |
168 |
|
169 |
diff --git a/dev-libs/spdlog/spdlog-0.16.3.ebuild b/dev-libs/spdlog/spdlog-0.16.3.ebuild |
170 |
deleted file mode 100644 |
171 |
index b22d880ad03..00000000000 |
172 |
--- a/dev-libs/spdlog/spdlog-0.16.3.ebuild |
173 |
+++ /dev/null |
174 |
@@ -1,38 +0,0 @@ |
175 |
-# Copyright 1999-2017 Gentoo Foundation |
176 |
-# Distributed under the terms of the GNU General Public License v2 |
177 |
- |
178 |
-EAPI=6 |
179 |
- |
180 |
-inherit cmake-utils |
181 |
- |
182 |
-DESCRIPTION="Very fast, header only, C++ logging library." |
183 |
-HOMEPAGE="https://github.com/gabime/spdlog" |
184 |
- |
185 |
-if [[ ${PV} == *9999 ]]; then |
186 |
- inherit git-r3 |
187 |
- EGIT_REPO_URI="https://github.com/gabime/spdlog" |
188 |
-else |
189 |
- SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
190 |
- KEYWORDS="~amd64" |
191 |
-fi |
192 |
- |
193 |
-LICENSE="MIT" |
194 |
-SLOT="0" |
195 |
-IUSE="test" |
196 |
- |
197 |
-DEPEND=" |
198 |
- dev-libs/libfmt |
199 |
-" |
200 |
-RDEPEND="${DEPEND}" |
201 |
- |
202 |
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" ) |
203 |
- |
204 |
-src_configure() { |
205 |
- local mycmakeargs=( |
206 |
- -DSPDLOG_BUILD_EXAMPLES=no |
207 |
- -DSPDLOG_BUILD_TESTING=$(usex test) |
208 |
- ) |
209 |
- |
210 |
- cmake-utils_src_configure |
211 |
- |
212 |
-} |