From caedf91905a8eda88d6937220f2541144c7c6ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 24 May 2016 13:12:01 +0200 Subject: dev-cpp/libjson-rpc-cpp: Update deps & build args for live version Update the live ebuild. Use dev-cpp/catch for tests. Work-around test build failure by enabling examples. Bump to EAPI 6. The package still fails to build because of Debian multiarch support breaking multilib: https://github.com/cinemast/libjson-rpc-cpp/pull/161. --- dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'dev-cpp/libjson-rpc-cpp') diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild index abbdc454f8f..967818a39a5 100644 --- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild +++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -EGIT_REPO_URI="https://github.com/cinemast/${PN}" +EGIT_REPO_URI="https://github.com/cinemast/${PN}.git" EGIT_BRANCH=develop inherit cmake-utils git-r3 @@ -24,16 +24,17 @@ RDEPEND=" stubgen? ( dev-libs/argtable:= )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) - test? ( dev-libs/boost )" + test? ( dev-cpp/catch )" src_configure() { local mycmakeargs=( -DHTTP_CLIENT=$(usex http-client) -DHTTP_SERVER=$(usex http-server) - # they are not installed - -DCOMPILE_EXAMPLES=NO + # they are not installed but required for tests to build + -DCOMPILE_EXAMPLES=$(usex test) -DCOMPILE_STUBGEN=$(usex stubgen) -DCOMPILE_TESTS=$(usex test) + -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch" ) cmake-utils_src_configure -- cgit v1.2.1