From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10AF5158090 for ; Thu, 5 May 2022 23:38:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E7CEE08A2; Thu, 5 May 2022 23:37:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 495A2E08A2 for ; Thu, 5 May 2022 23:37:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 37FE7341932 for ; Thu, 5 May 2022 23:37:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30D10452 for ; Thu, 5 May 2022 23:37:55 +0000 (UTC) From: "Alessandro Barbieri" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" Message-ID: <1651793872.f2e4c35a07884737da67a07e33f29c61625e1e92.Alessandro-Barbieri@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/clingo/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-mathematics/clingo/clingo-5.5.1-r1.ebuild X-VCS-Directories: sci-mathematics/clingo/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: f2e4c35a07884737da67a07e33f29c61625e1e92 X-VCS-Branch: dev Date: Thu, 5 May 2022 23:37:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7d7eea18-8453-42c3-8b03-cd982080fe7f X-Archives-Hash: 481fe658aee525e878c0b961d58a5cd0 commit: f2e4c35a07884737da67a07e33f29c61625e1e92 Author: Alessandro Barbieri gmail com> AuthorDate: Thu May 5 18:01:22 2022 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Thu May 5 23:37:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f2e4c35a sci-mathematics/clingo: system catch Closes: https://bugs.gentoo.org/842798 Signed-off-by: Alessandro Barbieri gmail.com> sci-mathematics/clingo/clingo-5.5.1-r1.ebuild | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/clingo/clingo-5.5.1-r1.ebuild b/sci-mathematics/clingo/clingo-5.5.1-r1.ebuild index 087adc44c..50983d7ec 100644 --- a/sci-mathematics/clingo/clingo-5.5.1-r1.ebuild +++ b/sci-mathematics/clingo/clingo-5.5.1-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 LUA_COMPAT=( lua5-{3..4} ) PYTHON_COMPAT=( python3_{8..10} ) # IDK how to pass pypy3 -inherit cmake lua-single python-single-r1 toolchain-funcs +inherit cmake flag-o-matic lua-single python-single-r1 toolchain-funcs DESCRIPTION="Integrated grounder and solver for answer set logic programs" HOMEPAGE=" @@ -27,7 +27,10 @@ RDEPEND=" lua? ( ${LUA_DEPS} ) python? ( ${PYTHON_DEPS} ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/catch:0 ) +" BDEPEND=" >=dev-util/re2c-0.13.5 >=sys-devel/bison-2.5 @@ -48,10 +51,14 @@ pkg_setup() { src_prepare() { rm -r clasp || die + rm libreify/tests/catch.hpp || die + rm libclingo/tests/catch.hpp || die + rm libgringo/tests/catch.hpp || die cmake_src_prepare } src_configure() { + append-cxxflags "-I/usr/include/catch2" local mycmakeargs=( -DCLINGO_BUILD_APPS=$(usex tools) -DCLINGO_BUILD_EXAMPLES=$(usex examples)