commit: 8b0c05c847d692cc5f6d6c47caa5b9f29a925b2c Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Tue Aug 7 10:25:23 2018 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Wed Aug 8 21:21:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0c05c8
dev-libs/spdlog: bump to 1.0.0 Closes: https://bugs.gentoo.org/662942 dev-libs/spdlog/Manifest | 1 + .../spdlog/files/spdlog-1.0.0-unbundle-fmt.patch | 29 ++++++++++++++++++++++ .../{spdlog-9999.ebuild => spdlog-1.0.0.ebuild} | 6 ++--- dev-libs/spdlog/spdlog-9999.ebuild | 6 ++--- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index 3f7a4c11c29..2291d1dbf3b 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1 +1,2 @@ DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef +DIST spdlog-1.0.0.tar.gz 183855 BLAKE2B 30d54fef03a83f968cfebacf95a484ff397126771a7ea022556aebd07e2f7694af35b278f75ee24372283ff1428e21247fd4329794d64a65bd6220a93f21db3c SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1 diff --git a/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch new file mode 100644 index 00000000000..9b04f276ba5 --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch @@ -0,0 +1,29 @@ +diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h +--- a/include/spdlog/fmt/fmt.h ++++ b/include/spdlog/fmt/fmt.h +@@ -16,10 +16,7 @@ + #endif + #ifndef FMT_USE_WINDOWS_H + #define FMT_USE_WINDOWS_H 0 +-#endif +-#include "bundled/core.h" +-#include "bundled/format.h" +-#else // external fmtlib ++#endif // external fmtlib + #include <fmt/core.h> + #include <fmt/format.h> + #endif +diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h +--- a/include/spdlog/fmt/ostr.h ++++ b/include/spdlog/fmt/ostr.h +@@ -11,8 +11,6 @@ + #ifndef FMT_HEADER_ONLY + #define FMT_HEADER_ONLY + #endif +-#include "bundled/ostream.h" +-#include "fmt.h" +-#else +-#include <fmt/ostream.h> + #endif ++ ++#include <fmt/ostream.h> diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-1.0.0.ebuild similarity index 88% copy from dev-libs/spdlog/spdlog-9999.ebuild copy to dev-libs/spdlog/spdlog-1.0.0.ebuild index e42aaade7db..03aaec9bd60 100644 --- a/dev-libs/spdlog/spdlog-9999.ebuild +++ b/dev-libs/spdlog/spdlog-1.0.0.ebuild @@ -17,15 +17,15 @@ else fi LICENSE="MIT" -SLOT="0" +SLOT="0/1" IUSE="test" DEPEND=" - <=dev-libs/libfmt-4.1.0 + >=dev-libs/libfmt-5.0.0 " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" ) src_configure() { rm -r include/spdlog/fmt/bundled || die diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild index e42aaade7db..03aaec9bd60 100644 --- a/dev-libs/spdlog/spdlog-9999.ebuild +++ b/dev-libs/spdlog/spdlog-9999.ebuild @@ -17,15 +17,15 @@ else fi LICENSE="MIT" -SLOT="0" +SLOT="0/1" IUSE="test" DEPEND=" - <=dev-libs/libfmt-4.1.0 + >=dev-libs/libfmt-5.0.0 " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" ) src_configure() { rm -r include/spdlog/fmt/bundled || die
