From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 911D3138334 for ; Thu, 9 Aug 2018 06:06:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88379E0965; Thu, 9 Aug 2018 06:05:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B73FFE0969 for ; Thu, 9 Aug 2018 06:05:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FD4134097F for ; Wed, 8 Aug 2018 21:21:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2224E380 for ; Wed, 8 Aug 2018 21:21:47 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1533763298.8b0c05c847d692cc5f6d6c47caa5b9f29a925b2c.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/spdlog/Manifest dev-libs/spdlog/files/spdlog-1.0.0-unbundle-fmt.patch dev-libs/spdlog/spdlog-1.0.0.ebuild dev-libs/spdlog/spdlog-9999.ebuild X-VCS-Directories: dev-libs/spdlog/files/ dev-libs/spdlog/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 8b0c05c847d692cc5f6d6c47caa5b9f29a925b2c X-VCS-Branch: master Date: Wed, 8 Aug 2018 21:21:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9ce037ff-6de5-49c5-9e4e-13f383936718 X-Archives-Hash: c1a93d6d30d8d79934b45aaed71c893b commit: 8b0c05c847d692cc5f6d6c47caa5b9f29a925b2c Author: David Roman gmail com> AuthorDate: Tue Aug 7 10:25:23 2018 +0000 Commit: Craig Andrews gentoo 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 + #include + #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 + #endif ++ ++#include 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