1 |
commit: 84dbae0590ac182a8358c48714856b6c00ae581d |
2 |
Author: David Roman <davidroman96 <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed May 11 09:46:50 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 13 22:45:58 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84dbae05 |
7 |
|
8 |
dev-libs/spdlog: drop 1.8.2, 1.8.5, 1.8.5-r1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/798492 |
11 |
Closes: https://bugs.gentoo.org/833379 |
12 |
Signed-off-by: David Roman <davidroman96 <AT> gmail.com> |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
dev-libs/spdlog/Manifest | 2 - |
16 |
.../spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch | 13 ------ |
17 |
dev-libs/spdlog/spdlog-1.8.2.ebuild | 47 --------------------- |
18 |
dev-libs/spdlog/spdlog-1.8.5-r1.ebuild | 49 ---------------------- |
19 |
dev-libs/spdlog/spdlog-1.8.5.ebuild | 47 --------------------- |
20 |
5 files changed, 158 deletions(-) |
21 |
|
22 |
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest |
23 |
index 2239849f32bd..3743e1c72882 100644 |
24 |
--- a/dev-libs/spdlog/Manifest |
25 |
+++ b/dev-libs/spdlog/Manifest |
26 |
@@ -1,4 +1,2 @@ |
27 |
-DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f |
28 |
-DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c |
29 |
DIST spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 54615 BLAKE2B 62b707fef02c7876692f7cc67119ea2b1a712d005d5367e5afdc50f42d6762f370a463ca3194e6850c059c679aef0e908471e0362afa2dc44a8bf7aaf19af2b0 SHA512 5d9868de7968ecf2c17b5fbb1199e70b064551bc2474fe563770d1e8d4b5f6d46d371091284c3bd10b47b3c7e94b134252e16f26b1834eff4390896acd773ecb |
30 |
DIST spdlog-1.9.2.tar.gz 327799 BLAKE2B 8e4cce17887509512c0d3a63485f9271098bdf7f853c2a07adb8d46459c1039d93d16d05cb60963c1bbc754f6af6ba3af1a66c69bc421bf234f676231c8c1315 SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c |
31 |
|
32 |
diff --git a/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch b/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch |
33 |
deleted file mode 100644 |
34 |
index f59a9bca4b30..000000000000 |
35 |
--- a/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch |
36 |
+++ /dev/null |
37 |
@@ -1,13 +0,0 @@ |
38 |
-See upstream https://github.com/gabime/spdlog/issues/1975 |
39 |
- |
40 |
---- a/include/spdlog/common-inl.h 2021-06-21 17:15:26.695992698 -0600 |
41 |
-+++ b/include/spdlog/common-inl.h 2021-06-21 17:15:52.205992496 -0600 |
42 |
-@@ -60,7 +60,7 @@ |
43 |
- SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) |
44 |
- { |
45 |
- memory_buf_t outbuf; |
46 |
-- fmt::format_system_error(outbuf, last_errno, msg); |
47 |
-+ fmt::format_system_error(outbuf, last_errno, msg.c_str()); |
48 |
- msg_ = fmt::to_string(outbuf); |
49 |
- } |
50 |
- |
51 |
|
52 |
diff --git a/dev-libs/spdlog/spdlog-1.8.2.ebuild b/dev-libs/spdlog/spdlog-1.8.2.ebuild |
53 |
deleted file mode 100644 |
54 |
index f1f85aae2ff3..000000000000 |
55 |
--- a/dev-libs/spdlog/spdlog-1.8.2.ebuild |
56 |
+++ /dev/null |
57 |
@@ -1,47 +0,0 @@ |
58 |
-# Copyright 1999-2021 Gentoo Authors |
59 |
-# Distributed under the terms of the GNU General Public License v2 |
60 |
- |
61 |
-EAPI=7 |
62 |
- |
63 |
-inherit cmake |
64 |
- |
65 |
-DESCRIPTION="Very fast, header only, C++ logging library" |
66 |
-HOMEPAGE="https://github.com/gabime/spdlog" |
67 |
- |
68 |
-if [[ ${PV} == *9999 ]]; then |
69 |
- inherit git-r3 |
70 |
- EGIT_REPO_URI="https://github.com/gabime/${PN}" |
71 |
-else |
72 |
- SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
73 |
- KEYWORDS="amd64 arm arm64 ppc ppc64 x86" |
74 |
-fi |
75 |
- |
76 |
-LICENSE="MIT" |
77 |
-SLOT="0/1" |
78 |
-IUSE="test" |
79 |
-RESTRICT="!test? ( test )" |
80 |
- |
81 |
-BDEPEND=" |
82 |
- virtual/pkgconfig |
83 |
-" |
84 |
-DEPEND=" |
85 |
- >=dev-libs/libfmt-6.1.2:= |
86 |
-" |
87 |
-RDEPEND="${DEPEND}" |
88 |
- |
89 |
-src_prepare() { |
90 |
- cmake_src_prepare |
91 |
- rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" |
92 |
-} |
93 |
- |
94 |
-src_configure() { |
95 |
- local mycmakeargs=( |
96 |
- -DSPDLOG_BUILD_BENCH=no |
97 |
- -DSPDLOG_BUILD_EXAMPLE=no |
98 |
- -DSPDLOG_FMT_EXTERNAL=yes |
99 |
- -DSPDLOG_BUILD_SHARED=yes |
100 |
- -DSPDLOG_BUILD_TESTS=$(usex test) |
101 |
- ) |
102 |
- |
103 |
- cmake_src_configure |
104 |
-} |
105 |
|
106 |
diff --git a/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild b/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild |
107 |
deleted file mode 100644 |
108 |
index 26e7cb42bce4..000000000000 |
109 |
--- a/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild |
110 |
+++ /dev/null |
111 |
@@ -1,49 +0,0 @@ |
112 |
-# Copyright 1999-2021 Gentoo Authors |
113 |
-# Distributed under the terms of the GNU General Public License v2 |
114 |
- |
115 |
-EAPI=7 |
116 |
- |
117 |
-inherit cmake |
118 |
- |
119 |
-DESCRIPTION="Very fast, header only, C++ logging library" |
120 |
-HOMEPAGE="https://github.com/gabime/spdlog" |
121 |
- |
122 |
-if [[ ${PV} == *9999 ]]; then |
123 |
- inherit git-r3 |
124 |
- EGIT_REPO_URI="https://github.com/gabime/${PN}" |
125 |
-else |
126 |
- SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
127 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
128 |
-fi |
129 |
- |
130 |
-LICENSE="MIT" |
131 |
-SLOT="0/1" |
132 |
-IUSE="test" |
133 |
-RESTRICT="!test? ( test )" |
134 |
- |
135 |
-BDEPEND=" |
136 |
- virtual/pkgconfig |
137 |
-" |
138 |
-DEPEND=" |
139 |
- >=dev-libs/libfmt-6.1.2:= |
140 |
-" |
141 |
-RDEPEND="${DEPEND}" |
142 |
- |
143 |
-PATCHES=( "${FILESDIR}/${P}-libfmt-8-fix.patch" ) |
144 |
- |
145 |
-src_prepare() { |
146 |
- cmake_src_prepare |
147 |
- rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" |
148 |
-} |
149 |
- |
150 |
-src_configure() { |
151 |
- local mycmakeargs=( |
152 |
- -DSPDLOG_BUILD_BENCH=no |
153 |
- -DSPDLOG_BUILD_EXAMPLE=no |
154 |
- -DSPDLOG_FMT_EXTERNAL=yes |
155 |
- -DSPDLOG_BUILD_SHARED=yes |
156 |
- -DSPDLOG_BUILD_TESTS=$(usex test) |
157 |
- ) |
158 |
- |
159 |
- cmake_src_configure |
160 |
-} |
161 |
|
162 |
diff --git a/dev-libs/spdlog/spdlog-1.8.5.ebuild b/dev-libs/spdlog/spdlog-1.8.5.ebuild |
163 |
deleted file mode 100644 |
164 |
index deb8aada3af3..000000000000 |
165 |
--- a/dev-libs/spdlog/spdlog-1.8.5.ebuild |
166 |
+++ /dev/null |
167 |
@@ -1,47 +0,0 @@ |
168 |
-# Copyright 1999-2021 Gentoo Authors |
169 |
-# Distributed under the terms of the GNU General Public License v2 |
170 |
- |
171 |
-EAPI=7 |
172 |
- |
173 |
-inherit cmake |
174 |
- |
175 |
-DESCRIPTION="Very fast, header only, C++ logging library" |
176 |
-HOMEPAGE="https://github.com/gabime/spdlog" |
177 |
- |
178 |
-if [[ ${PV} == *9999 ]]; then |
179 |
- inherit git-r3 |
180 |
- EGIT_REPO_URI="https://github.com/gabime/${PN}" |
181 |
-else |
182 |
- SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
183 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
184 |
-fi |
185 |
- |
186 |
-LICENSE="MIT" |
187 |
-SLOT="0/1" |
188 |
-IUSE="test" |
189 |
-RESTRICT="!test? ( test )" |
190 |
- |
191 |
-BDEPEND=" |
192 |
- virtual/pkgconfig |
193 |
-" |
194 |
-DEPEND=" |
195 |
- >=dev-libs/libfmt-6.1.2:= |
196 |
-" |
197 |
-RDEPEND="${DEPEND}" |
198 |
- |
199 |
-src_prepare() { |
200 |
- cmake_src_prepare |
201 |
- rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" |
202 |
-} |
203 |
- |
204 |
-src_configure() { |
205 |
- local mycmakeargs=( |
206 |
- -DSPDLOG_BUILD_BENCH=no |
207 |
- -DSPDLOG_BUILD_EXAMPLE=no |
208 |
- -DSPDLOG_FMT_EXTERNAL=yes |
209 |
- -DSPDLOG_BUILD_SHARED=yes |
210 |
- -DSPDLOG_BUILD_TESTS=$(usex test) |
211 |
- ) |
212 |
- |
213 |
- cmake_src_configure |
214 |
-} |