public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/libjson-rpc-cpp/
Date: Mon, 12 Dec 2022 17:58:18 +0000 (UTC)	[thread overview]
Message-ID: <1670867894.c1bcbc12319ba4a42e62d85f54b3d1a93a745b36.mgorny@gentoo> (raw)

commit:     c1bcbc12319ba4a42e62d85f54b3d1a93a745b36
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 17:43:03 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 17:58:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1bcbc12

dev-cpp/libjson-rpc-cpp: Tests require catch<3

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../libjson-rpc-cpp/libjson-rpc-cpp-1.4.0.ebuild   | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.4.0.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.4.0.ebuild
index 3d9e42dd0fce..e80e82ba5964 100644
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.4.0.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.4.0.ebuild
@@ -6,8 +6,11 @@ EAPI=8
 inherit cmake
 
 DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
-HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
-SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp/"
+SRC_URI="
+	https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0/1"
@@ -15,16 +18,22 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+http-client +http-server redis-client redis-server +stubgen test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
+DEPEND="
 	dev-libs/jsoncpp:=
 	http-client? ( net-misc/curl:= )
 	http-server? ( net-libs/libmicrohttpd:= )
 	redis-client? ( dev-libs/hiredis:= )
 	redis-server? ( dev-libs/hiredis:= )
-	stubgen? ( dev-libs/argtable:= )"
-DEPEND="${RDEPEND}"
+	stubgen? ( dev-libs/argtable:= )
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
-	test? ( dev-cpp/catch:0 )"
+	test? (
+		<dev-cpp/catch-3
+	)
+"
 
 src_configure() {
 	local mycmakeargs=(
@@ -43,10 +52,12 @@ src_configure() {
 		-DCOMPILE_EXAMPLES=OFF
 		-DCOMPILE_STUBGEN=$(usex stubgen)
 		-DCOMPILE_TESTS=$(usex test)
-		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2"
 		# disable coverage-related flags
 		-DWITH_COVERAGE=OFF
 	)
+	use test && mycmakeargs+=(
+		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include"
+	)
 
 	cmake_src_configure
 }


             reply	other threads:[~2022-12-12 17:58 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-12 17:58 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-12 17:58 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/libjson-rpc-cpp/ Michał Górny
2022-02-26 23:26 Sam James
2021-10-24  8:54 Michał Górny
2021-10-23 20:20 Michał Górny
2020-03-19 17:20 Michał Górny
2020-01-15  7:20 Michał Górny
2020-01-15  7:20 Michał Górny
2019-04-10 15:07 Michał Górny
2019-03-29  9:18 Michał Górny
2019-03-10  8:08 Michał Górny
2019-01-19 14:21 David Seifert
2018-11-03 21:58 Michał Górny
2018-11-01  8:48 Michał Górny
2018-11-01  8:48 Michał Górny
2018-03-26 16:14 Michał Górny
2018-01-06 12:24 Michał Górny
2018-01-05  9:36 Michał Górny
2017-08-28 18:23 Michał Górny
2017-08-28 18:23 Michał Górny
2017-08-27  8:19 Michał Górny
2017-08-27  8:19 Michał Górny
2016-08-13 18:32 Michał Górny
2016-08-13 18:32 Michał Górny
2016-07-02 21:19 Michał Górny
2016-05-24 11:23 Michał Górny
2016-05-24 11:23 Michał Górny
2016-04-19 13:12 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1670867894.c1bcbc12319ba4a42e62d85f54b3d1a93a745b36.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox