[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/aspcud/
commit: d4c831ca37a61876a3158b9de9260de32b790d2d
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu May 5 15:28:09 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu May 5 23:37:52 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d4c831ca
sci-mathematics/aspcud: includedir for catch
Closes: https://bugs.gentoo.org/842720
Signed-off-by: Alessandro Barbieri gmail.com>
sci-mathematics/aspcud/aspcud-1.9.6.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/aspcud/aspcud-1.9.6.ebuild
b/sci-mathematics/aspcud/aspcud-1.9.6.ebuild
index 0d38b0e6c..2f6a9b891 100644
--- a/sci-mathematics/aspcud/aspcud-1.9.6.ebuild
+++ b/sci-mathematics/aspcud/aspcud-1.9.6.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake
+inherit cmake flag-o-matic
DESCRIPTION="A solver for package problems in CUDF format"
HOMEPAGE="
@@ -37,6 +37,7 @@ src_prepare() {
}
src_configure() {
+ append-cxxflags "-I/usr/include/catch2"
local mycmakeargs=(
-DASPCUD_BUILD_TESTS=$(usex test)
[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/aspcud/
commit: c6dac88a440ce3bbed61e41ab1004a156885acb0
Author: Alessandro Barbieri gmail com>
AuthorDate: Tue May 3 18:19:56 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Tue May 3 20:21:34 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c6dac88a
sci-mathematics/aspcud: drop 1.9.5
Closes: https://bugs.gentoo.org/842330
Signed-off-by: Alessandro Barbieri gmail.com>
sci-mathematics/aspcud/Manifest| 1 -
sci-mathematics/aspcud/aspcud-1.9.5.ebuild | 43 --
2 files changed, 44 deletions(-)
diff --git a/sci-mathematics/aspcud/Manifest b/sci-mathematics/aspcud/Manifest
index 8804e929b..dee9f9cbc 100644
--- a/sci-mathematics/aspcud/Manifest
+++ b/sci-mathematics/aspcud/Manifest
@@ -1,2 +1 @@
-DIST aspcud-1.9.5.tar.gz 70073941 BLAKE2B
e2f02259a726d05a664e63836ab24d798b3ef96276c92caf00907df5ea3d08b9d5e992c3ffb2f8ad95864e4251e2adde596d6327e71e7ae33fabd515eaeafb13
SHA512
b6c85f7e67cbf8df8dd0ed4f8fd5f988e46bf3f9756e4cb8fadfae955ed70bc27279e8dddcfe8161543e5276a70d2103816fce8edebc240fef6b182841832106
DIST aspcud-1.9.6.tar.gz 70041232 BLAKE2B
9854185b9674a062ce017b1c210ca7fb3b802e564c46a2036d48bb3178c1d5c0158841ee9e1f4c0a33b30038c2d4477f307c14415df48cf50c37682ef292fce0
SHA512
a46183c2fd3b17881d48c3396164cded4b5214a2a8a31a499254533a8a71fb084a8b6f13ee1dc8eea72f7d9819caf2921f31a5ccc1cbd6611f9175e0bc10c14a
diff --git a/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
b/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
deleted file mode 100644
index 331adeab2..0
--- a/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A solver for package problems in CUDF format"
-HOMEPAGE="
- https://github.com/potassco/aspcud
- https://potassco.org/aspcud/
-"
-SRC_URI="https://github.com/potassco/${PN}/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="dev-libs/boost:="
-RDEPEND="
- ${DEPEND}
- sci-mathematics/clasp
- sci-mathematics/clingo
-"
-BDEPEND="dev-util/re2c"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
- local mycmakeargs=(
- -DASPCUD_BUILD_TESTS=$(usex test)
-
- -DASPCUD_BUILD_STATIC=OFF
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- insinto /usr/share/cudf/solvers/
- doins "${FILESDIR}/aspcud"
-}
[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/aspcud/, sci-mathematics/aspcud/files/
commit: b98c64e9f756d7e95130de35c66a3b861c35d6d8
Author: Alessandro Barbieri gmail com>
AuthorDate: Mon May 2 20:00:56 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Mon May 2 20:01:15 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b98c64e9
sci-mathematics/aspcud: add 1.9.6
Signed-off-by: Alessandro Barbieri gmail.com>
sci-mathematics/aspcud/Manifest| 1 +
sci-mathematics/aspcud/aspcud-1.9.6.ebuild | 52 ++
.../aspcud/files/aspcud-1.9.6-system-catch.patch | 10 +
3 files changed, 63 insertions(+)
diff --git a/sci-mathematics/aspcud/Manifest b/sci-mathematics/aspcud/Manifest
index 129f7b224..8804e929b 100644
--- a/sci-mathematics/aspcud/Manifest
+++ b/sci-mathematics/aspcud/Manifest
@@ -1 +1,2 @@
DIST aspcud-1.9.5.tar.gz 70073941 BLAKE2B
e2f02259a726d05a664e63836ab24d798b3ef96276c92caf00907df5ea3d08b9d5e992c3ffb2f8ad95864e4251e2adde596d6327e71e7ae33fabd515eaeafb13
SHA512
b6c85f7e67cbf8df8dd0ed4f8fd5f988e46bf3f9756e4cb8fadfae955ed70bc27279e8dddcfe8161543e5276a70d2103816fce8edebc240fef6b182841832106
+DIST aspcud-1.9.6.tar.gz 70041232 BLAKE2B
9854185b9674a062ce017b1c210ca7fb3b802e564c46a2036d48bb3178c1d5c0158841ee9e1f4c0a33b30038c2d4477f307c14415df48cf50c37682ef292fce0
SHA512
a46183c2fd3b17881d48c3396164cded4b5214a2a8a31a499254533a8a71fb084a8b6f13ee1dc8eea72f7d9819caf2921f31a5ccc1cbd6611f9175e0bc10c14a
diff --git a/sci-mathematics/aspcud/aspcud-1.9.6.ebuild
b/sci-mathematics/aspcud/aspcud-1.9.6.ebuild
new file mode 100644
index 0..0d38b0e6c
--- /dev/null
+++ b/sci-mathematics/aspcud/aspcud-1.9.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A solver for package problems in CUDF format"
+HOMEPAGE="
+ https://github.com/potassco/aspcud
+ https://potassco.org/aspcud/
+"
+SRC_URI="https://github.com/potassco/${PN}/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+ dev-libs/boost:=
+ test? ( dev-cpp/catch:0 )
+"
+RDEPEND="
+ ${DEPEND}
+ sci-mathematics/clasp
+ sci-mathematics/clingo
+"
+BDEPEND="dev-util/re2c"
+
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${P}-system-catch.patch" )
+
+src_prepare() {
+ rm libcudf/tests/catch.hpp || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DASPCUD_BUILD_TESTS=$(usex test)
+
+ -DASPCUD_BUILD_STATIC=OFF
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ insinto /usr/share/cudf/solvers/
+ doins "${FILESDIR}/aspcud"
+}
diff --git a/sci-mathematics/aspcud/files/aspcud-1.9.6-system-catch.patch
b/sci-mathematics/aspcud/files/aspcud-1.9.6-system-catch.patch
new file mode 100644
index 0..b08c3100e
--- /dev/null
+++ b/sci-mathematics/aspcud/files/aspcud-1.9.6-system-catch.patch
@@ -0,0 +1,10 @@
+--- a/libcudf/tests/CMakeLists.txt
b/libcudf/tests/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ # [[[source: .
+ set(ide_source_group "Source Files")
+ set(source-group
+-"${CMAKE_CURRENT_SOURCE_DIR}/catch.hpp"
+ "${CMAKE_CURRENT_SOURCE_DIR}/criteria.cc"
+ "${CMAKE_CURRENT_SOURCE_DIR}/critparser.cc"
+ "${CMAKE_CURRENT_SOURCE_DIR}/helpers.hh"
[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/aspcud/
commit: 303c72b9074f4e08b065f7ddf8cf3397d267c8a5
Author: Alessandro Barbieri gmail com>
AuthorDate: Fri Apr 29 01:49:46 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Fri Apr 29 01:49:46 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=303c72b9
sci-mathematics/aspcud: swap {R,}DEPEND logic
Signed-off-by: Alessandro Barbieri gmail.com>
sci-mathematics/aspcud/aspcud-1.9.5.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
b/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
index 8a7ef419d..331adeab2 100644
--- a/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
+++ b/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
@@ -17,9 +17,9 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
-RDEPEND="dev-libs/boost:="
-DEPEND="
- ${RDEPEND}
+DEPEND="dev-libs/boost:="
+RDEPEND="
+ ${DEPEND}
sci-mathematics/clasp
sci-mathematics/clingo
"
[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/aspcud/, sci-mathematics/aspcud/files/
commit: 7c4164af890c6603c423341d38dd3d2da5746600
Author: Alessandro Barbieri gmail com>
AuthorDate: Fri Apr 29 01:11:11 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Fri Apr 29 01:47:59 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c4164af
sci-mathematics/aspcud: add cudf solvers file from debian
Signed-off-by: Alessandro Barbieri gmail.com>
sci-mathematics/aspcud/aspcud-1.9.5.ebuild | 14 ++
sci-mathematics/aspcud/files/aspcud| 3 +++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
b/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
index de5c531c7..8a7ef419d 100644
--- a/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
+++ b/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake optfeature
+inherit cmake
DESCRIPTION="A solver for package problems in CUDF format"
HOMEPAGE="
@@ -18,7 +18,11 @@ KEYWORDS="~amd64"
IUSE="test"
RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ sci-mathematics/clasp
+ sci-mathematics/clingo
+"
BDEPEND="dev-util/re2c"
RESTRICT="!test? ( test )"
@@ -32,6 +36,8 @@ src_configure() {
cmake_src_configure
}
-pkg_postinst() {
- optfeature "dependencies needed at runtime" sci-mathematics/clasp
sci-mathematics/clingo
+src_install() {
+ cmake_src_install
+ insinto /usr/share/cudf/solvers/
+ doins "${FILESDIR}/aspcud"
}
diff --git a/sci-mathematics/aspcud/files/aspcud
b/sci-mathematics/aspcud/files/aspcud
new file mode 100644
index 0..7bd867cdf
--- /dev/null
+++ b/sci-mathematics/aspcud/files/aspcud
@@ -0,0 +1,3 @@
+description: CUDF solver based on the Answer Set Programming tools clasp and
gringo
+exec: /usr/bin/aspcud "$in" "$out" "$pref"
+cudf-version: 2.0
[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/aspcud/
commit: bfdf9a867de417ac0420fa82d12a2a87faa2fce4
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Apr 28 05:57:10 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Apr 28 05:57:31 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bfdf9a86
sci-mathematics/aspcud: new package, add 1.9.5
Signed-off-by: Alessandro Barbieri gmail.com>
sci-mathematics/aspcud/Manifest| 1 +
sci-mathematics/aspcud/aspcud-1.9.5.ebuild | 37 ++
sci-mathematics/aspcud/metadata.xml| 12 ++
3 files changed, 50 insertions(+)
diff --git a/sci-mathematics/aspcud/Manifest b/sci-mathematics/aspcud/Manifest
new file mode 100644
index 0..129f7b224
--- /dev/null
+++ b/sci-mathematics/aspcud/Manifest
@@ -0,0 +1 @@
+DIST aspcud-1.9.5.tar.gz 70073941 BLAKE2B
e2f02259a726d05a664e63836ab24d798b3ef96276c92caf00907df5ea3d08b9d5e992c3ffb2f8ad95864e4251e2adde596d6327e71e7ae33fabd515eaeafb13
SHA512
b6c85f7e67cbf8df8dd0ed4f8fd5f988e46bf3f9756e4cb8fadfae955ed70bc27279e8dddcfe8161543e5276a70d2103816fce8edebc240fef6b182841832106
diff --git a/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
b/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
new file mode 100644
index 0..de5c531c7
--- /dev/null
+++ b/sci-mathematics/aspcud/aspcud-1.9.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature
+
+DESCRIPTION="A solver for package problems in CUDF format"
+HOMEPAGE="
+ https://github.com/potassco/aspcud
+ https://potassco.org/aspcud/
+"
+SRC_URI="https://github.com/potassco/${PN}/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-libs/boost:="
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/re2c"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DASPCUD_BUILD_TESTS=$(usex test)
+
+ -DASPCUD_BUILD_STATIC=OFF
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ optfeature "dependencies needed at runtime" sci-mathematics/clasp
sci-mathematics/clingo
+}
diff --git a/sci-mathematics/aspcud/metadata.xml
b/sci-mathematics/aspcud/metadata.xml
new file mode 100644
index 0..76dc1e401
--- /dev/null
+++ b/sci-mathematics/aspcud/metadata.xml
@@ -0,0 +1,12 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ lssndrbarbi...@gmail.com
+ Alessandro Barbieri
+
+
+ https://github.com/potassco/aspcud/issues
+ potassco/aspcud
+
+
