From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1101555-garchives=archives.gentoo.org@lists.gentoo.org>
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 0245A138334
for <garchives@archives.gentoo.org>; Wed, 24 Jul 2019 18:23:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3AD35E07FE;
Wed, 24 Jul 2019 18:23:05 +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 1E2B5E07FE
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Jul 2019 18:23:04 +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 A986B34878E
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Jul 2019 18:23:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AFA24D4
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Jul 2019 18:23:02 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1563992558.8b1a5167748d9c6a6fb012c9c8c4e478a26bb09f.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch dev-libs/libixion/libixion-9999.ebuild
X-VCS-Directories: dev-libs/libixion/files/ dev-libs/libixion/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 8b1a5167748d9c6a6fb012c9c8c4e478a26bb09f
X-VCS-Branch: master
Date: Wed, 24 Jul 2019 18:23:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fe0490af-04c0-435e-8da7-1877e620d0d8
X-Archives-Hash: 871a5db118e0d80553463d251e8a5b7d
commit: 8b1a5167748d9c6a6fb012c9c8c4e478a26bb09f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 18:21:53 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 18:22:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1a5167
dev-libs/libixion: Add new DEPEND, raise mdds minimum dep to 1.5.0
Closes: https://bugs.gentoo.org/680342
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libixion-9999-spdlog-non-bundled-fmt.patch | 25 ++++++++++++++++++++++
dev-libs/libixion/libixion-9999.ebuild | 10 ++++++---
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch b/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch
new file mode 100644
index 00000000000..2cf5cb0a184
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-9999-spdlog-non-bundled-fmt.patch
@@ -0,0 +1,25 @@
+From 389c8def65406ae92077686a2e9095afebab28f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 24 Jul 2019 20:01:01 +0200
+Subject: [PATCH] Fix build when built against spdlog without bundled fmt
+
+---
+ src/libixion/dirty_cell_tracker.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libixion/dirty_cell_tracker.cpp b/src/libixion/dirty_cell_tracker.cpp
+index 42d338b..7e6e3cc 100644
+--- a/src/libixion/dirty_cell_tracker.cpp
++++ b/src/libixion/dirty_cell_tracker.cpp
+@@ -16,7 +16,7 @@
+ #include <limits>
+
+ #include <spdlog/spdlog.h>
+-#include <spdlog/fmt/bundled/ostream.h>
++#include <spdlog/fmt/ostr.h>
+
+ namespace ixion {
+
+--
+2.22.0
+
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 860c13488fc..92f685ee869 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -23,12 +23,16 @@ IUSE="debug python static-libs +threads"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND="
+RDEPEND="
dev-libs/boost:=
- >=dev-util/mdds-1.4.1:1=
+ >=dev-util/mdds-1.5.0:1=
python? ( ${PYTHON_DEPS} )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ dev-libs/spdlog
+"
+
+PATCHES=( "${FILESDIR}"/${P}-spdlog-non-bundled-fmt.patch )
pkg_setup() {
use python && python-single-r1_pkg_setup