commit: e45d5c13978dbbe8a419ec6d2d761aa8ed20c710 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Nov 3 10:38:36 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Nov 3 21:58:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45d5c13
dev-cpp/libjson-rpc-cpp: Switch to dev-cpp/catch-2 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> ...n-rpc-cpp-9999.ebuild => libjson-rpc-cpp-1.1.1-r1.ebuild} | 12 +++++------- dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild similarity index 86% copy from dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild copy to dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild index 0e617416361..fbf180d4cf2 100644 --- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild +++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild @@ -3,17 +3,15 @@ EAPI=6 -EGIT_REPO_URI="https://github.com/cinemast/${PN}.git"; -EGIT_BRANCH=develop -inherit cmake-utils git-r3 +inherit cmake-utils DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++" HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"; -SRC_URI="" +SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0/1" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="doc +http-client +http-server redis-client redis-server +stubgen test" RDEPEND=" @@ -25,7 +23,7 @@ RDEPEND=" stubgen? ( dev-libs/argtable:= )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) - test? ( <dev-cpp/catch-2 )" + test? ( >=dev-cpp/catch-2 )" RESTRICT="!test? ( test )" @@ -44,7 +42,7 @@ src_configure() { -DCOMPILE_EXAMPLES=OFF -DCOMPILE_STUBGEN=$(usex stubgen) -DCOMPILE_TESTS=$(usex test) - -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch" + -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2" ) cmake-utils_src_configure 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 0e617416361..1daad1e754b 100644 --- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild +++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild @@ -25,7 +25,7 @@ RDEPEND=" stubgen? ( dev-libs/argtable:= )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) - test? ( <dev-cpp/catch-2 )" + test? ( >=dev-cpp/catch-2 )" RESTRICT="!test? ( test )" @@ -44,7 +44,7 @@ src_configure() { -DCOMPILE_EXAMPLES=OFF -DCOMPILE_STUBGEN=$(usex stubgen) -DCOMPILE_TESTS=$(usex test) - -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch" + -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2" ) cmake-utils_src_configure
