[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/

["Johannes Huber" <johu@gentoo.org>]

commit:     3f3cbd0450b9aeb2ebfc1c5719545ca70b88780c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 18:07:03 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 19:15:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3cbd04

sys-fs/cryfs: Fix build

Adds upstream patch to update internal copy of spdlog.

Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Thanks-to: Jerzy Kołosowski <jerzy <AT> kolosowscy.pl>
Closes: https://bugs.gentoo.org/619602
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sys-fs/cryfs/Manifest           | 1 +
 sys-fs/cryfs/cryfs-0.9.7.ebuild | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 476a301fd0c..92d692c7af8 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1 +1,2 @@
+DIST cryfs-0.9.7-spdlog.patch.xz 28204 SHA256 8b88dd29c16edde13cb421778a927d46822e79d9f8031f0da80fd3375798cc44 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86 WHIRLPOOL 5b5255b54fae22b9426811879ef83e61b82eaac627cc9bb03b136765de62828760124bc7136f9b948704a2ffbc7f7fe3febe7b7dcb075901b556abadb5bae9bd
 DIST cryfs-0.9.7.tar.xz 970588 SHA256 c998069217c29c026a944da47eea0a9e73eda914ef0f891f436701bcbdbbe4d7 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b WHIRLPOOL c5560f8c87bcdaf3dd3bc1cded88fdbc3f74a2284584cad1f55e4dd380849290eb56b265fd4ea98a2f8b3ea842b733e6a0d77a9013efe294a5ec3a342897bd19

diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild
index cc9eea2b0e7..a275fa9d2e7 100644
--- a/sys-fs/cryfs/cryfs-0.9.7.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild
@@ -23,7 +23,8 @@ if [[ "${PV}" == 9999 ]] ; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}"
 fi
@@ -36,14 +37,16 @@ RDEPEND=">=dev-libs/boost-1.56:=
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
+PATCHES=( "${WORKDIR}/${P}-spdlog.patch" )
+
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# remove tests that require internet access to comply with Gentoo policy
 	sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die
 
 	# remove non-applicable warning
 	sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die
-
-	cmake-utils_src_prepare
 }
 
 src_configure() {