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

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

[Alessandro Barbieri]

commit:     f635a60b5dea7e49794ad43fcd010e97736c8536
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue May  3 19:49:52 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=f635a60b

sci-mathematics/clasp: add 3.3.8, drop 3.3.7

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

 sci-mathematics/clasp/Manifest                     |  2 +-
 .../{clasp-3.3.7.ebuild => clasp-3.3.8.ebuild}     |  4 ----
 .../clasp/files/clasp-3.3.7-find-Potassco.patch    | 11 ---------
 .../clasp/files/clasp-3.3.7-libclasp_app.patch     | 28 ----------------------
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/sci-mathematics/clasp/Manifest b/sci-mathematics/clasp/Manifest
index 0aae4bcce..3b8e3bb61 100644
--- a/sci-mathematics/clasp/Manifest
+++ b/sci-mathematics/clasp/Manifest
@@ -1 +1 @@
-DIST clasp-3.3.7.tar.gz 628370 BLAKE2B 48519646055ceb7f122d2efc8745f5bc7a444d6b90e0506edde139cccb8efb9d81391d8c8bc6fab654b1c652c986676e34f9e66797fb13d12b9eb8a82da847a4 SHA512 1615224838eb31b90ea9b9daaf192a059833db7dec90567c063c73cc33d7cf2ba7de49960c090c0522794b29fb2ca85c091f23e8a8402f7ff0ca99d6973e4fc7
+DIST clasp-3.3.8.tar.gz 677825 BLAKE2B 2b4e6b14d9d2a964477b70a387e7fe91d8f28c3e8e2e4cb800fae51459d5168be1c5384e4464ce24c79bc2f494ea9e48a0318f0a7eb77712a4ebd80b18bf1ab9 SHA512 a30269c1f0b5f118df56f3e9ec00bff6fc1896cc4e1c4bfe47242756040a0a520d4329af288f34468c59ae43f7af16fd4f318d533da46301836c4319466091b6

diff --git a/sci-mathematics/clasp/clasp-3.3.7.ebuild b/sci-mathematics/clasp/clasp-3.3.8.ebuild
similarity index 91%
rename from sci-mathematics/clasp/clasp-3.3.7.ebuild
rename to sci-mathematics/clasp/clasp-3.3.8.ebuild
index d4690201c..a9aa8e7e4 100644
--- a/sci-mathematics/clasp/clasp-3.3.7.ebuild
+++ b/sci-mathematics/clasp/clasp-3.3.8.ebuild
@@ -24,10 +24,6 @@ DEPEND="
 "
 
 RESTRICT="!test? ( test )"
-PATCHES=(
-	"${FILESDIR}/${P}-find-Potassco.patch"
-	"${FILESDIR}/${P}-libclasp_app.patch"
-)
 
 src_prepare() {
 	rm tests/catch.hpp || die

diff --git a/sci-mathematics/clasp/files/clasp-3.3.7-find-Potassco.patch b/sci-mathematics/clasp/files/clasp-3.3.7-find-Potassco.patch
deleted file mode 100644
index 1a59a199c..000000000
--- a/sci-mathematics/clasp/files/clasp-3.3.7-find-Potassco.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -98,7 +98,7 @@
- 
- # Check for or build external dependency
- if (NOT CLASP_USE_LOCAL_LIB_POTASSCO)
--	find_package(potassco 1.0 REQUIRED CONFIG)
-+	find_package(Potassco 1.0 REQUIRED CONFIG)
- else()
- 	if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libpotassco/CMakeLists.txt)
- 		message(STATUS "Potassco is not installed - fetching submodule")

diff --git a/sci-mathematics/clasp/files/clasp-3.3.7-libclasp_app.patch b/sci-mathematics/clasp/files/clasp-3.3.7-libclasp_app.patch
deleted file mode 100644
index f8138010b..000000000
--- a/sci-mathematics/clasp/files/clasp-3.3.7-libclasp_app.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff '--color=auto' -ru /var/tmp/portage/sci-mathematics/clasp-3.3.7/work/clasp-3.3.7/app/CMakeLists.txt clasp-3.3.7/app/CMakeLists.txt
---- /var/tmp/portage/sci-mathematics/clasp-3.3.7/work/clasp-3.3.7/app/CMakeLists.txt	2022-04-28 06:43:26.295108990 +0200
-+++ clasp-3.3.7/app/CMakeLists.txt	2022-04-28 07:03:05.488454553 +0200
-@@ -1,8 +1,8 @@
--set(files
--	clasp_app.cpp
--	clasp_app.h
--	main.cpp)
--add_executable(clasp ${files})
-+add_library(clasp_app SHARED clasp_app.cpp)
-+set(clasp_app_header clasp_app.h)
-+add_executable(clasp main.cpp)
-+target_include_directories(clasp_app PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-+target_include_directories(clasp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- set_target_properties(clasp PROPERTIES FOLDER exe)
- if (NOT CMAKE_INSTALL_BINDIR)
- 	message(STATUS "BINDIR not set - using bin")
-@@ -19,6 +19,9 @@
- 	endif()
- 	target_link_libraries(clasp "-static")
- endif()
--target_link_libraries(clasp libclasp)
-+target_link_libraries(clasp_app libclasp)
-+target_link_libraries(clasp clasp_app)
- 
- install(TARGETS clasp EXPORT clasp DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS clasp_app EXPORT clasp_app DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES ${clasp_app_header} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clasp/app)

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

[Alessandro Barbieri]

commit:     c5b96369a66f934c2f6a877d61eb2652cf0b47b0
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jun  2 01:03:41 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Thu Jun  2 01:23:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c5b96369

sci-mathematics/clasp: add manpage

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

 .../{clasp-3.3.8.ebuild => clasp-3.3.8-r1.ebuild}  | 11 +++-
 sci-mathematics/clasp/files/clasp-manpage.patch    | 68 ++++++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/clasp/clasp-3.3.8.ebuild b/sci-mathematics/clasp/clasp-3.3.8-r1.ebuild
similarity index 84%
rename from sci-mathematics/clasp/clasp-3.3.8.ebuild
rename to sci-mathematics/clasp/clasp-3.3.8-r1.ebuild
index d033cf20f..920e6506a 100644
--- a/sci-mathematics/clasp/clasp-3.3.8.ebuild
+++ b/sci-mathematics/clasp/clasp-3.3.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake edo flag-o-matic
 
 DESCRIPTION="A conflict-driven nogood learning answer set solver"
 HOMEPAGE="
@@ -24,10 +24,11 @@ DEPEND="
 "
 
 RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-manpage.patch" )
 
 src_prepare() {
 	append-cxxflags "-I/usr/include/catch2"
-	rm tests/catch.hpp || die
+	edo rm tests/catch.hpp
 	cmake_src_prepare
 }
 
@@ -45,3 +46,9 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	doman clasp.1
+	dodoc README.md CHANGES
+}

diff --git a/sci-mathematics/clasp/files/clasp-manpage.patch b/sci-mathematics/clasp/files/clasp-manpage.patch
new file mode 100644
index 000000000..136ab5ea4
--- /dev/null
+++ b/sci-mathematics/clasp/files/clasp-manpage.patch
@@ -0,0 +1,68 @@
+From: Thomas Krennwallner <tkren@kr.tuwien.ac.at>
+Date: Wed, 30 Nov 2016 08:39:00 +0100
+Subject: Add clasp.1 manpage
+
+--- /dev/null
++++ b/clasp.1
+@@ -0,0 +1,61 @@
++.\"                                      Hey, EMACS: -*- nroff -*-
++.\" First parameter, NAME, should be all caps
++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
++.\" other parameters are allowed: see man(7), man(1)
++.TH CLASP 1 "March  4, 2010"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh        disable hyphenation
++.\" .hy        enable hyphenation
++.\" .ad l      left justify
++.\" .ad b      justify to both left and right margins
++.\" .nf        disable filling
++.\" .fi        enable filling
++.\" .br        insert line break
++.\" .sp <n>    insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++clasp \- a conflict-driven nogood learning answer set solver 
++.SH SYNOPSIS
++.B clasp
++[\fInumber\fR] \fR[\fIoptions\fR]
++.SH DESCRIPTION
++This manual page documents briefly the
++.B clasp
++command.
++.PP
++.\" TeX users may be more comfortable with the \fB<whatever>\fP and
++.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
++.\" respectively.
++\fBclasp\fP is an answer set solver for (extended) normal logic
++programs. It combines the high-level modeling capacities of answer set
++programming (ASP) with state-of-the-art techniques from the area of
++Boolean constraint solving. The primary clasp algorithm relies on
++conflict-driven nogood learning, a technique that proved very
++successful for satisfiability checking (SAT). Unlike other learning
++ASP solvers, clasp does not rely on legacy software, such as a SAT
++solver or any other existing ASP solver. Rather, clasp has been
++genuinely developed for answer set solving based on conflict-driven
++nogood learning. clasp can be applied as an ASP solver (on LPARSE
++output format), as a SAT solver (on simplified DIMACS/CNF format), or
++as a PB solver (on OPB format).
++.SH OPTIONS
++These programs follow the usual GNU command line syntax, with long
++options starting with two dashes (`-').
++A summary of options is included below.
++For a complete description, see <http://www.potassco.org/clasp/>.
++.TP
++.B \-h, \-\-help
++Show summary of options.
++.TP
++.B \-v, \-\-version
++Show version of program.
++.SH SEE ALSO
++.BR gringo (1).
++.br
++.SH AUTHOR
++clasp was written by Benjamin Kaufmann <kaufmann@cs.uni-potsdam.de>.
++.PP
++This manual page was written by Thomas Krennwallner <tkren@kr.tuwien.ac.at>,
++for the Debian project (and may be used by others).