[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/clasp/

[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/clasp/

[Alessandro Barbieri]

commit:     35512fc831aa9dd57473d40259cc932668ce43b3
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed May 25 19:45:03 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed May 25 19:45:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=35512fc8

sci-mathematics/clasp: use https

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sci-mathematics/clasp/clasp-3.3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/clasp/clasp-3.3.8.ebuild b/sci-mathematics/clasp/clasp-3.3.8.ebuild
index 9627e4dab..d033cf20f 100644
--- a/sci-mathematics/clasp/clasp-3.3.8.ebuild
+++ b/sci-mathematics/clasp/clasp-3.3.8.ebuild
@@ -8,7 +8,7 @@ inherit cmake flag-o-matic
 DESCRIPTION="A conflict-driven nogood learning answer set solver"
 HOMEPAGE="
 	https://github.com/potassco/clasp
-	http://www.cs.uni-potsdam.de/clasp/
+	https://www.cs.uni-potsdam.de/clasp/
 "
 SRC_URI="https://github.com/potassco/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 

[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/clasp/

[Alessandro Barbieri]

commit:     e4b6ba24f5accb6b5ca28af13aa5e6069c69be83
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu May  5 15:25:14 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Thu May  5 23:37:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e4b6ba24

sci-mathematics/clasp: includedir for catch2

Closes: https://bugs.gentoo.org/842759
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sci-mathematics/clasp/clasp-3.3.8.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/clasp/clasp-3.3.8.ebuild b/sci-mathematics/clasp/clasp-3.3.8.ebuild
index a9aa8e7e4..9627e4dab 100644
--- a/sci-mathematics/clasp/clasp-3.3.8.ebuild
+++ b/sci-mathematics/clasp/clasp-3.3.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="A conflict-driven nogood learning answer set solver"
 HOMEPAGE="
@@ -26,6 +26,7 @@ DEPEND="
 RESTRICT="!test? ( test )"
 
 src_prepare() {
+	append-cxxflags "-I/usr/include/catch2"
 	rm tests/catch.hpp || die
 	cmake_src_prepare
 }

[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/clasp/

[Alessandro Barbieri]

commit:     7b70282eeb3573f6956a26591110a987d46af88e
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue May  3 18:24:33 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Tue May  3 20:21:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7b70282e

sci-mathematics/clasp: use system catch

Closes: https://bugs.gentoo.org/842327
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sci-mathematics/clasp/clasp-3.3.7.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/clasp/clasp-3.3.7.ebuild b/sci-mathematics/clasp/clasp-3.3.7.ebuild
index 7af818634..d4690201c 100644
--- a/sci-mathematics/clasp/clasp-3.3.7.ebuild
+++ b/sci-mathematics/clasp/clasp-3.3.7.ebuild
@@ -18,7 +18,10 @@ KEYWORDS="~amd64"
 IUSE="examples test +threads +tools"
 
 RDEPEND="sci-libs/libpotassco:="
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/catch:0 )
+"
 
 RESTRICT="!test? ( test )"
 PATCHES=(
@@ -26,6 +29,11 @@ PATCHES=(
 	"${FILESDIR}/${P}-libclasp_app.patch"
 )
 
+src_prepare() {
+	rm tests/catch.hpp || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCLASP_BUILD_APP=$(usex tools)