Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/, dev-libs/spdlog/files/
Date: Wed, 31 Oct 2018 18:54:50
Message-Id: 1541012065.2a4707f54d0a199d2623b75fcc17b41d68e67595.asturm@gentoo
1 commit: 2a4707f54d0a199d2623b75fcc17b41d68e67595
2 Author: David Roman <davidroman96 <AT> gmail <DOT> com>
3 AuthorDate: Sun Oct 28 14:12:33 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 31 18:54:25 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a4707f5
7
8 dev-libs/spdlog: drop 0.17.0
9
10 Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/10264
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 dev-libs/spdlog/Manifest | 1 -
15 .../spdlog/files/spdlog-0.17.0-unbundle-fmt.patch | 35 -------------------
16 dev-libs/spdlog/spdlog-0.17.0.ebuild | 39 ----------------------
17 3 files changed, 75 deletions(-)
18
19 diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
20 index 3c4dd4de507..32fe47d178d 100644
21 --- a/dev-libs/spdlog/Manifest
22 +++ b/dev-libs/spdlog/Manifest
23 @@ -1,4 +1,3 @@
24 -DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
25 DIST spdlog-1.0.0.tar.gz 183855 BLAKE2B 30d54fef03a83f968cfebacf95a484ff397126771a7ea022556aebd07e2f7694af35b278f75ee24372283ff1428e21247fd4329794d64a65bd6220a93f21db3c SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1
26 DIST spdlog-1.1.0.tar.gz 183937 BLAKE2B 51af49f641df69e78835bd6b9545da53c0e111bab60a5f0dbf4a1d0e70101309394ffea195176ea371f08b772c2be1c22c2da16006fc9699f47593cf82a6c0fd SHA512 65fbe6e9dffb25e814f72f2ef7982eed213fc16edfabb1377f865c94fd0488190e160dfea83ac06979a41f2fb2fa47a454989ebee0a2c5012bd404b977648439
27 DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
28
29 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
30 deleted file mode 100644
31 index e3e0df83353..00000000000
32 --- a/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch
33 +++ /dev/null
34 @@ -1,35 +0,0 @@
35 -diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
36 ---- a/include/spdlog/fmt/fmt.h
37 -+++ b/include/spdlog/fmt/fmt.h
38 -@@ -18,16 +18,11 @@
39 - #ifndef FMT_USE_WINDOWS_H
40 - #define FMT_USE_WINDOWS_H 0
41 - #endif
42 --#include "bundled/format.h"
43 --#if defined(SPDLOG_FMT_PRINTF)
44 --#include "bundled/printf.h"
45 --#endif
46 -
47 --#else // external fmtlib
48 -+#endif // external fmtlib
49 -
50 - #include <fmt/format.h>
51 - #if defined(SPDLOG_FMT_PRINTF)
52 - #include <fmt/printf.h>
53 - #endif
54 -
55 --#endif
56 -diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
57 ---- a/include/spdlog/fmt/ostr.h
58 -+++ b/include/spdlog/fmt/ostr.h
59 -@@ -11,8 +11,6 @@
60 - #ifndef FMT_HEADER_ONLY
61 - #define FMT_HEADER_ONLY
62 - #endif
63 --#include "bundled/ostream.h"
64 --#include "fmt.h"
65 --#else
66 --#include <fmt/ostream.h>
67 - #endif
68 -+
69 -+#include <fmt/ostream.h>
70
71 diff --git a/dev-libs/spdlog/spdlog-0.17.0.ebuild b/dev-libs/spdlog/spdlog-0.17.0.ebuild
72 deleted file mode 100644
73 index e42aaade7db..00000000000
74 --- a/dev-libs/spdlog/spdlog-0.17.0.ebuild
75 +++ /dev/null
76 @@ -1,39 +0,0 @@
77 -# Copyright 1999-2018 Gentoo Foundation
78 -# Distributed under the terms of the GNU General Public License v2
79 -
80 -EAPI=6
81 -
82 -inherit cmake-utils
83 -
84 -DESCRIPTION="Very fast, header only, C++ logging library"
85 -HOMEPAGE="https://github.com/gabime/spdlog"
86 -
87 -if [[ ${PV} == *9999 ]]; then
88 - inherit git-r3
89 - EGIT_REPO_URI="https://github.com/gabime/spdlog"
90 -else
91 - SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
92 - KEYWORDS="~amd64"
93 -fi
94 -
95 -LICENSE="MIT"
96 -SLOT="0"
97 -IUSE="test"
98 -
99 -DEPEND="
100 - <=dev-libs/libfmt-4.1.0
101 -"
102 -RDEPEND="${DEPEND}"
103 -
104 -PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" )
105 -
106 -src_configure() {
107 - rm -r include/spdlog/fmt/bundled || die
108 -
109 - local mycmakeargs=(
110 - -DSPDLOG_BUILD_EXAMPLES=no
111 - -DSPDLOG_BUILD_TESTING=$(usex test)
112 - )
113 -
114 - cmake-utils_src_configure
115 -}