[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2024-02-19 Thread Maciej Barć 
commit: 04ba0021b96b29be45073fb44db54f02542c836f
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Feb 19 14:00:09 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Feb 19 15:30:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ba0021

sci-mathematics/opensmt: fix libdir on glibc only

Closes: https://bugs.gentoo.org/924977
Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/opensmt-2.5.2.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/opensmt/opensmt-2.5.2.ebuild 
b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
index ce988bcd0572..b691b9744363 100644
--- a/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
+++ b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
@@ -67,8 +67,10 @@ src_configure() {
 src_install() {
cmake_src_install
 
-   rm "${ED}"/usr/lib/libopensmt.a || die
+   if use elibc_glibc ; then
+   dolib.so "${ED}"/usr/lib/libopensmt.so*
+   rm "${ED}"/usr/lib/libopensmt.so* || die
+   fi
 
-   dolib.so "${ED}"/usr/lib/libopensmt.*
-   rm "${ED}"/usr/lib/libopensmt.* || die
+   rm "${ED}"/usr/lib/libopensmt.a || die
 }

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/, sci-mathematics/opensmt/files/

2023-11-07 Thread Maciej Barć 
commit: de122ee20e5f4b74dd53fbe68fcc25de0de8dbe3
Author: Kostadin Shishmanov  tutanota  com>
AuthorDate: Tue Nov  7 17:45:28 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Tue Nov  7 18:50:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de122ee2

sci-mathematics/opensmt: fix build with gcc 14

Closes: https://bugs.gentoo.org/916855
Signed-off-by: Kostadin Shishmanov  tutanota.com>
Closes: https://github.com/gentoo/gentoo/pull/33708
Signed-off-by: Maciej Barć  gentoo.org>

 .../opensmt/files/opensmt-2.5.2-gcc-14.patch   | 68 ++
 sci-mathematics/opensmt/opensmt-2.5.2.ebuild   |  4 +-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/opensmt/files/opensmt-2.5.2-gcc-14.patch 
b/sci-mathematics/opensmt/files/opensmt-2.5.2-gcc-14.patch
new file mode 100644
index ..c5957641fff7
--- /dev/null
+++ b/sci-mathematics/opensmt/files/opensmt-2.5.2-gcc-14.patch
@@ -0,0 +1,68 @@
+From f30e983f876df3bd34571f9d554b3ebe226dd4bd Mon Sep 17 00:00:00 2001
+From: Kostadin Shishmanov 
+Date: Tue, 7 Nov 2023 16:38:39 +0200
+Subject: [PATCH] Add include  to fix building with gcc 14
+
+Gentoo bug:
+https://bugs.gentoo.org/916855
+
+Upstream PR:
+https://github.com/usi-verification-and-security/opensmt/pull/653
+
+Signed-off-by: Kostadin Shishmanov 
+---
+ src/logics/Logic.cc   | 1 +
+ src/pterms/PtStore.cc | 1 +
+ src/simplifiers/BoolRewriting.cc  | 1 +
+ src/tsolvers/egraph/EnodeStore.cc | 2 ++
+ 4 files changed, 5 insertions(+)
+
+diff --git a/src/logics/Logic.cc b/src/logics/Logic.cc
+index 2619df1fd..84b04d515 100644
+--- a/src/logics/Logic.cc
 b/src/logics/Logic.cc
+@@ -21,6 +21,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ using namespace std;
+ 
+diff --git a/src/pterms/PtStore.cc b/src/pterms/PtStore.cc
+index 377642947..63c6f56f3 100644
+--- a/src/pterms/PtStore.cc
 b/src/pterms/PtStore.cc
+@@ -29,6 +29,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
+ #include "OsmtApiException.h"
+ 
+ #include 
++#include 
+ 
+ const int PtStore::ptstore_vec_idx = 1;
+ const int PtStore::ptstore_buf_idx = 2;
+diff --git a/src/simplifiers/BoolRewriting.cc 
b/src/simplifiers/BoolRewriting.cc
+index e2aa52b2c..196a642c4 100644
+--- a/src/simplifiers/BoolRewriting.cc
 b/src/simplifiers/BoolRewriting.cc
+@@ -5,6 +5,7 @@
+ #include "BoolRewriting.h"
+ #include "Logic.h"
+ #include 
++#include 
+ 
+ // Replace subtrees consisting only of ands / ors with a single and / or term.
+ // Search a maximal section of the tree consisting solely of ands / ors.  The
+diff --git a/src/tsolvers/egraph/EnodeStore.cc 
b/src/tsolvers/egraph/EnodeStore.cc
+index 2bed3302b..de2216410 100644
+--- a/src/tsolvers/egraph/EnodeStore.cc
 b/src/tsolvers/egraph/EnodeStore.cc
+@@ -28,6 +28,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
+ #include "Symbol.h"
+ #include "Logic.h"
+ 
++#include 
++
+ EnodeStore::EnodeStore(Logic& l)
+   : logic(l)
+   , ea(1024*1024)

diff --git a/sci-mathematics/opensmt/opensmt-2.5.2.ebuild 
b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
index 04e39c2ae269..73c64f7b50df 100644
--- a/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
+++ b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
@@ -36,7 +36,9 @@ BDEPEND="
test? ( dev-cpp/gtest )
 "
 
-# PATCHES=( "${FILESDIR}"/${PN}-2.4.3-musl.patch )
+PATCHES=(
+   "${FILESDIR}/${PN}-2.5.2-gcc-14.patch"
+)
 
 src_prepare() {
cmake_src_prepare

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/files/, sci-mathematics/opensmt/

2023-08-22 Thread Maciej Barć 
commit: 98bdfdbad5275c2ad9dce2e7ec8314ead473d7d5
Author: Maciej Barć  gentoo  org>
AuthorDate: Tue Aug 22 14:27:32 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Tue Aug 22 14:32:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98bdfdba

sci-mathematics/opensmt: drop old 2.5.1

Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/Manifest   |   1 -
 .../opensmt/files/opensmt-2.4.3-musl.patch | 132 -
 sci-mathematics/opensmt/opensmt-2.5.1.ebuild   |  72 ---
 3 files changed, 205 deletions(-)

diff --git a/sci-mathematics/opensmt/Manifest b/sci-mathematics/opensmt/Manifest
index b8135a978d7b..efc73de20ff3 100644
--- a/sci-mathematics/opensmt/Manifest
+++ b/sci-mathematics/opensmt/Manifest
@@ -1,2 +1 @@
-DIST opensmt-2.5.1.tar.gz 1943888 BLAKE2B 
17b58fc3e693e77ce70835820f7361db9efe1cac561f1fa3480a839fbdf003d2566617cd97a3e2772ad8e890356b6a5761457779c0ac3b0841c2df6aee74946e
 SHA512 
359ff968d7dbd8d94d6c5687d5b84e19c47016df5b1c0d80374743b395b6257cb4b97aa354b264103bd19c522f55912f1c938e646daf37f6b413488db917fc61
 DIST opensmt-2.5.2.tar.gz 1935650 BLAKE2B 
85cd171d56591d2f1162a41ff8a425fc818238a2820aab0f75cc75ece8898c5e7de1478aeab93e8905a1aedad85a6df03062fefaad69bea043dce1f3f3d531f5
 SHA512 
c22d17d3aee33a3360f8ea552c82151eafdef7cc89e6750d34b4ff2a011675a5a5f04a7cb68ff984dd6a5332b2f180fb8abc529e64c3970aba6b7eb60408f198

diff --git a/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch 
b/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch
deleted file mode 100644
index 5f80a0de116c..
--- a/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From e88b83b3b52ebc6ff4cdf1f92a876861fc2c5598 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Maciej=20Bar=C4=87?= 
-Date: Mon, 6 Feb 2023 17:27:34 +0100
-Subject: [PATCH] use fpu_control only on glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Maciej Barć 

- bin/opensmt.C   | 4 ++--
- src/bin/opensmt.cc  | 2 +-
- src/minisat/core/Main.C | 4 ++--
- src/minisat/simp/Main.C | 4 ++--
- src/minisat/utils/System.h  | 2 +-
- src/parallel/opensmtSplitter.cc | 4 ++--
- 6 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/bin/opensmt.C b/bin/opensmt.C
-index cb9c8943b..898a8fdd3 100644
 a/bin/opensmt.C
-+++ b/bin/opensmt.C
-@@ -44,7 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
- #include 
- #include 
- 
--#if defined(__linux__)
-+#if defined(__GLIBC__)
- #include 
- #endif
- 
-@@ -84,7 +84,7 @@ int main( int argc, char * argv[] )
-   // the repeatability of experiments that might be compromised
-   // by the floating point unit approximations on doubles
-   //
--#if defined(__linux__) && !defined( SMTCOMP )
-+#if defined(__GLIBC__) && !defined( SMTCOMP )
-   fpu_control_t oldcw, newcw;
-   _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; 
_FPU_SETCW(newcw);
- #endif
-diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc
-index 6db12ffd8..67bfcd712 100644
 a/src/bin/opensmt.cc
-+++ b/src/bin/opensmt.cc
-@@ -47,7 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
- #endif
- #endif // ENABLE_LINE_EDITING
- 
--#if defined(__linux__)
-+#if defined(__GLIBC__)
- #include 
- #endif
- 
-diff --git a/src/minisat/core/Main.C b/src/minisat/core/Main.C
-index acef32cd5..2c232b71b 100644
 a/src/minisat/core/Main.C
-+++ b/src/minisat/core/Main.C
-@@ -74,7 +74,7 @@ static inline uint64_t memUsed(void) {
- static inline uint64_t memUsed() { return 0; }
- #endif
- 
--#if defined(__linux__)
-+#if defined(__GLIBC__)
- #include 
- #endif
- 
-@@ -287,7 +287,7 @@ int main(int argc, char** argv)
- 
- 
- reportf("This is MiniSat 2.0 beta\n");
--#if defined(__linux__)
-+#if defined(__GLIBC__)
- fpu_control_t oldcw, newcw;
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; 
_FPU_SETCW(newcw);
- reportf("WARNING: for repeatability, setting FPU to use double 
precision\n");
-diff --git a/src/minisat/simp/Main.C b/src/minisat/simp/Main.C
-index b6d194631..a3f22fb4f 100644
 a/src/minisat/simp/Main.C
-+++ b/src/minisat/simp/Main.C
-@@ -74,7 +74,7 @@ static inline uint64_t memUsed(void) {
- static inline uint64_t memUsed() { return 0; }
- #endif
- 
--#if defined(__linux__)
-+#if defined(__GLIBC__)
- #include 
- #endif
- 
-@@ -244,7 +244,7 @@ const char* hasPrefix(const char* str, const char* prefix)
- int main(int argc, char** argv)
- {
- reportf("This is MiniSat 2.0 beta\n");
--#if defined(__linux__)
-+#if defined(__GLIBC__)
- fpu_control_t oldcw, newcw;
- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; 
_FPU_SETCW(newcw);
- reportf("WARNING: for repeatability, setting FPU to use double 
precision\n");
-diff --git a/src/minisat/utils/System.h

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-08-17 Thread Maciej Barć 
commit: 2bbd02d1dab93281b5f36bc04fd25dd0079a5c13
Author: Maciej Barć  gentoo  org>
AuthorDate: Thu Aug 17 12:12:38 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Aug 17 13:22:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbd02d1

sci-mathematics/opensmt: fix .so install

Closes: https://bugs.gentoo.org/912314
Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/opensmt-2.5.1.ebuild | 5 +++--
 sci-mathematics/opensmt/opensmt-2.5.2.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/opensmt/opensmt-2.5.1.ebuild 
b/sci-mathematics/opensmt/opensmt-2.5.1.ebuild
index 479c6c7e252f..04e39c2ae269 100644
--- a/sci-mathematics/opensmt/opensmt-2.5.1.ebuild
+++ b/sci-mathematics/opensmt/opensmt-2.5.1.ebuild
@@ -66,6 +66,7 @@ src_install() {
cmake_src_install
 
rm "${ED}"/usr/lib/libopensmt.a || die
-   dodir /usr/$(get_libdir)
-   mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
+
+   dolib.so "${ED}"/usr/lib/libopensmt.*
+   rm "${ED}"/usr/lib/libopensmt.* || die
 }

diff --git a/sci-mathematics/opensmt/opensmt-2.5.2.ebuild 
b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
index 479c6c7e252f..04e39c2ae269 100644
--- a/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
+++ b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
@@ -66,6 +66,7 @@ src_install() {
cmake_src_install
 
rm "${ED}"/usr/lib/libopensmt.a || die
-   dodir /usr/$(get_libdir)
-   mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
+
+   dolib.so "${ED}"/usr/lib/libopensmt.*
+   rm "${ED}"/usr/lib/libopensmt.* || die
 }

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-08-15 Thread Maciej Barć 
commit: 39c26c44c951d5071eaeed9ccefb0dc78f7455b6
Author: Maciej Barć  gentoo  org>
AuthorDate: Tue Aug 15 11:58:34 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Tue Aug 15 11:59:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c26c44

sci-mathematics/opensmt: bump to 2.5.2

Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/Manifest |  1 +
 sci-mathematics/opensmt/opensmt-2.5.2.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/sci-mathematics/opensmt/Manifest b/sci-mathematics/opensmt/Manifest
index 1d27de064f14..b8135a978d7b 100644
--- a/sci-mathematics/opensmt/Manifest
+++ b/sci-mathematics/opensmt/Manifest
@@ -1 +1,2 @@
 DIST opensmt-2.5.1.tar.gz 1943888 BLAKE2B 
17b58fc3e693e77ce70835820f7361db9efe1cac561f1fa3480a839fbdf003d2566617cd97a3e2772ad8e890356b6a5761457779c0ac3b0841c2df6aee74946e
 SHA512 
359ff968d7dbd8d94d6c5687d5b84e19c47016df5b1c0d80374743b395b6257cb4b97aa354b264103bd19c522f55912f1c938e646daf37f6b413488db917fc61
+DIST opensmt-2.5.2.tar.gz 1935650 BLAKE2B 
85cd171d56591d2f1162a41ff8a425fc818238a2820aab0f75cc75ece8898c5e7de1478aeab93e8905a1aedad85a6df03062fefaad69bea043dce1f3f3d531f5
 SHA512 
c22d17d3aee33a3360f8ea552c82151eafdef7cc89e6750d34b4ff2a011675a5a5f04a7cb68ff984dd6a5332b2f180fb8abc529e64c3970aba6b7eb60408f198

diff --git a/sci-mathematics/opensmt/opensmt-2.5.2.ebuild 
b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
new file mode 100644
index ..479c6c7e252f
--- /dev/null
+++ b/sci-mathematics/opensmt/opensmt-2.5.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Compact and open-source SMT-solver written in C++"
+HOMEPAGE="http://verify.inf.usi.ch/opensmt/
+   https://github.com/usi-verification-and-security/opensmt/;
+
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+   
EGIT_REPO_URI="https://github.com/usi-verification-and-security/${PN}.git;
+else
+   
SRC_URI="https://github.com/usi-verification-and-security/${PN}/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="debug libedit +readline test"
+REQUIRED_USE="?? ( libedit readline )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-libs/gmp:=[cxx]
+   readline? ( sys-libs/readline:= )
+   libedit? ( dev-libs/libedit:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/bison
+   sys-devel/flex
+   test? ( dev-cpp/gtest )
+"
+
+# PATCHES=( "${FILESDIR}"/${PN}-2.4.3-musl.patch )
+
+src_prepare() {
+   cmake_src_prepare
+
+   echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die
+}
+
+src_configure() {
+   local CMAKE_BUILD_TYPE
+   if use debug ; then
+   CMAKE_BUILD_TYPE=Debug
+   else
+   CMAKE_BUILD_TYPE=Release
+   fi
+
+   local -a mycmakeargs=(
+   -DPACKAGE_TESTS=$(usex test)
+   -DUSE_READLINE=$(usex readline)
+   )
+   if use readline || use libedit ; then
+   mycmakeargs+=( -DENABLE_LINE_EDITING=ON )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   rm "${ED}"/usr/lib/libopensmt.a || die
+   dodir /usr/$(get_libdir)
+   mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-08-15 Thread Maciej Barć 
commit: 9e7b6c95156e35fb5bd8f0d0e2aed876d32e9696
Author: Maciej Barć  gentoo  org>
AuthorDate: Tue Aug 15 11:54:20 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Tue Aug 15 11:59:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7b6c95

sci-mathematics/opensmt: drop old 2.5.0

Closes: https://bugs.gentoo.org/894728
Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/Manifest |  1 -
 sci-mathematics/opensmt/opensmt-2.5.0.ebuild | 71 
 2 files changed, 72 deletions(-)

diff --git a/sci-mathematics/opensmt/Manifest b/sci-mathematics/opensmt/Manifest
index fcea9ccf2126..1d27de064f14 100644
--- a/sci-mathematics/opensmt/Manifest
+++ b/sci-mathematics/opensmt/Manifest
@@ -1,2 +1 @@
-DIST opensmt-2.5.0.tar.gz 1940493 BLAKE2B 
ee643815b9da8bdc4a3a074a438eacdfde778347f4090aa7403e34859a9d51a17db8992c38a0e9f7a808384b0413abfbe2aa7b360dda44181344528159666945
 SHA512 
d70972eae376b927694f893ff9b6e4bfba7d0cfffe63545b5a0d582b594c3538643c9ae0121e75cf85aec3876eb4a45df2766c3a7700d07da05d1d6081953f42
 DIST opensmt-2.5.1.tar.gz 1943888 BLAKE2B 
17b58fc3e693e77ce70835820f7361db9efe1cac561f1fa3480a839fbdf003d2566617cd97a3e2772ad8e890356b6a5761457779c0ac3b0841c2df6aee74946e
 SHA512 
359ff968d7dbd8d94d6c5687d5b84e19c47016df5b1c0d80374743b395b6257cb4b97aa354b264103bd19c522f55912f1c938e646daf37f6b413488db917fc61

diff --git a/sci-mathematics/opensmt/opensmt-2.5.0.ebuild 
b/sci-mathematics/opensmt/opensmt-2.5.0.ebuild
deleted file mode 100644
index 479c6c7e252f..
--- a/sci-mathematics/opensmt/opensmt-2.5.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Compact and open-source SMT-solver written in C++"
-HOMEPAGE="http://verify.inf.usi.ch/opensmt/
-   https://github.com/usi-verification-and-security/opensmt/;
-
-if [[ ${PV} == ** ]] ; then
-   inherit git-r3
-   
EGIT_REPO_URI="https://github.com/usi-verification-and-security/${PN}.git;
-else
-   
SRC_URI="https://github.com/usi-verification-and-security/${PN}/archive/v${PV}.tar.gz
-   -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="debug libedit +readline test"
-REQUIRED_USE="?? ( libedit readline )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   dev-libs/gmp:=[cxx]
-   readline? ( sys-libs/readline:= )
-   libedit? ( dev-libs/libedit:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   sys-devel/bison
-   sys-devel/flex
-   test? ( dev-cpp/gtest )
-"
-
-# PATCHES=( "${FILESDIR}"/${PN}-2.4.3-musl.patch )
-
-src_prepare() {
-   cmake_src_prepare
-
-   echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die
-}
-
-src_configure() {
-   local CMAKE_BUILD_TYPE
-   if use debug ; then
-   CMAKE_BUILD_TYPE=Debug
-   else
-   CMAKE_BUILD_TYPE=Release
-   fi
-
-   local -a mycmakeargs=(
-   -DPACKAGE_TESTS=$(usex test)
-   -DUSE_READLINE=$(usex readline)
-   )
-   if use readline || use libedit ; then
-   mycmakeargs+=( -DENABLE_LINE_EDITING=ON )
-   fi
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   rm "${ED}"/usr/lib/libopensmt.a || die
-   dodir /usr/$(get_libdir)
-   mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
-}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-06-27 Thread Maciej Barć 
commit: e697a31a88b83cc5bdc29f0393a08e71e158cd12
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Jun 28 00:56:24 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Jun 28 01:12:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e697a31a

sci-mathematics/opensmt: bump to 2.5.1

Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/Manifest |  1 +
 sci-mathematics/opensmt/opensmt-2.5.1.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/sci-mathematics/opensmt/Manifest b/sci-mathematics/opensmt/Manifest
index 1152bdf0936f..fcea9ccf2126 100644
--- a/sci-mathematics/opensmt/Manifest
+++ b/sci-mathematics/opensmt/Manifest
@@ -1 +1,2 @@
 DIST opensmt-2.5.0.tar.gz 1940493 BLAKE2B 
ee643815b9da8bdc4a3a074a438eacdfde778347f4090aa7403e34859a9d51a17db8992c38a0e9f7a808384b0413abfbe2aa7b360dda44181344528159666945
 SHA512 
d70972eae376b927694f893ff9b6e4bfba7d0cfffe63545b5a0d582b594c3538643c9ae0121e75cf85aec3876eb4a45df2766c3a7700d07da05d1d6081953f42
+DIST opensmt-2.5.1.tar.gz 1943888 BLAKE2B 
17b58fc3e693e77ce70835820f7361db9efe1cac561f1fa3480a839fbdf003d2566617cd97a3e2772ad8e890356b6a5761457779c0ac3b0841c2df6aee74946e
 SHA512 
359ff968d7dbd8d94d6c5687d5b84e19c47016df5b1c0d80374743b395b6257cb4b97aa354b264103bd19c522f55912f1c938e646daf37f6b413488db917fc61

diff --git a/sci-mathematics/opensmt/opensmt-2.5.1.ebuild 
b/sci-mathematics/opensmt/opensmt-2.5.1.ebuild
new file mode 100644
index ..479c6c7e252f
--- /dev/null
+++ b/sci-mathematics/opensmt/opensmt-2.5.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Compact and open-source SMT-solver written in C++"
+HOMEPAGE="http://verify.inf.usi.ch/opensmt/
+   https://github.com/usi-verification-and-security/opensmt/;
+
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+   
EGIT_REPO_URI="https://github.com/usi-verification-and-security/${PN}.git;
+else
+   
SRC_URI="https://github.com/usi-verification-and-security/${PN}/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="debug libedit +readline test"
+REQUIRED_USE="?? ( libedit readline )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-libs/gmp:=[cxx]
+   readline? ( sys-libs/readline:= )
+   libedit? ( dev-libs/libedit:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/bison
+   sys-devel/flex
+   test? ( dev-cpp/gtest )
+"
+
+# PATCHES=( "${FILESDIR}"/${PN}-2.4.3-musl.patch )
+
+src_prepare() {
+   cmake_src_prepare
+
+   echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die
+}
+
+src_configure() {
+   local CMAKE_BUILD_TYPE
+   if use debug ; then
+   CMAKE_BUILD_TYPE=Debug
+   else
+   CMAKE_BUILD_TYPE=Release
+   fi
+
+   local -a mycmakeargs=(
+   -DPACKAGE_TESTS=$(usex test)
+   -DUSE_READLINE=$(usex readline)
+   )
+   if use readline || use libedit ; then
+   mycmakeargs+=( -DENABLE_LINE_EDITING=ON )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   rm "${ED}"/usr/lib/libopensmt.a || die
+   dodir /usr/$(get_libdir)
+   mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-06-27 Thread Maciej Barć 
commit: 04e7a974230752ee6ad3ebcef82e6321495c4326
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Jun 28 00:49:52 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Jun 28 01:12:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04e7a974

sci-mathematics/opensmt: drop old 2.4.3-r2

Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/Manifest|  1 -
 sci-mathematics/opensmt/opensmt-2.4.3-r2.ebuild | 71 -
 2 files changed, 72 deletions(-)

diff --git a/sci-mathematics/opensmt/Manifest b/sci-mathematics/opensmt/Manifest
index 5c761352c1a5..1152bdf0936f 100644
--- a/sci-mathematics/opensmt/Manifest
+++ b/sci-mathematics/opensmt/Manifest
@@ -1,2 +1 @@
-DIST opensmt-2.4.3.tar.gz 1912077 BLAKE2B 
d945d5b85d81b9b991f2f881f2d8f160dbefad8ce6484cf0d28c9a35c0fa64d18f45442a59cdd45bd29fcf526a09717d902d30376dfe2784de2d4df9627f803b
 SHA512 
a2adbbdebb133d7e97428c0ac9bf4c2413c95bca61567c5475f889f550904fc33a385712536c9026b38a1645b73c943876fa36724b634db061cb7cc0932543f2
 DIST opensmt-2.5.0.tar.gz 1940493 BLAKE2B 
ee643815b9da8bdc4a3a074a438eacdfde778347f4090aa7403e34859a9d51a17db8992c38a0e9f7a808384b0413abfbe2aa7b360dda44181344528159666945
 SHA512 
d70972eae376b927694f893ff9b6e4bfba7d0cfffe63545b5a0d582b594c3538643c9ae0121e75cf85aec3876eb4a45df2766c3a7700d07da05d1d6081953f42

diff --git a/sci-mathematics/opensmt/opensmt-2.4.3-r2.ebuild 
b/sci-mathematics/opensmt/opensmt-2.4.3-r2.ebuild
deleted file mode 100644
index f46f590a012c..
--- a/sci-mathematics/opensmt/opensmt-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Compact and open-source SMT-solver written in C++"
-HOMEPAGE="http://verify.inf.usi.ch/opensmt/
-   https://github.com/usi-verification-and-security/opensmt/;
-
-if [[ ${PV} == ** ]] ; then
-   inherit git-r3
-   
EGIT_REPO_URI="https://github.com/usi-verification-and-security/${PN}.git;
-else
-   
SRC_URI="https://github.com/usi-verification-and-security/${PN}/archive/v${PV}.tar.gz
-   -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="debug libedit +readline test"
-REQUIRED_USE="?? ( libedit readline )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   dev-libs/gmp:=[cxx]
-   readline? ( sys-libs/readline:= )
-   libedit? ( dev-libs/libedit:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   sys-devel/bison
-   sys-devel/flex
-   test? ( dev-cpp/gtest )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-src_prepare() {
-   cmake_src_prepare
-
-   echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die
-}
-
-src_configure() {
-   local CMAKE_BUILD_TYPE
-   if use debug ; then
-   CMAKE_BUILD_TYPE=Debug
-   else
-   CMAKE_BUILD_TYPE=Release
-   fi
-
-   local -a mycmakeargs=(
-   -DPACKAGE_TESTS=$(usex test)
-   -DUSE_READLINE=$(usex readline)
-   )
-   if use readline || use libedit ; then
-   mycmakeargs+=( -DENABLE_LINE_EDITING=ON )
-   fi
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   rm "${ED}"/usr/lib/libopensmt.a || die
-   dodir /usr/$(get_libdir)
-   mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
-}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-04-15 Thread Maciej Barć 
commit: a5c92115f792ebe4ade575a9a1026b8abfa1bd8b
Author: Maciej Barć  gentoo  org>
AuthorDate: Sat Apr 15 13:57:36 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sat Apr 15 17:21:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c92115

sci-mathematics/opensmt: bump to 2.5.0

Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/Manifest |  1 +
 sci-mathematics/opensmt/opensmt-2.5.0.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/sci-mathematics/opensmt/Manifest b/sci-mathematics/opensmt/Manifest
index cfff6834edf3..5c761352c1a5 100644
--- a/sci-mathematics/opensmt/Manifest
+++ b/sci-mathematics/opensmt/Manifest
@@ -1 +1,2 @@
 DIST opensmt-2.4.3.tar.gz 1912077 BLAKE2B 
d945d5b85d81b9b991f2f881f2d8f160dbefad8ce6484cf0d28c9a35c0fa64d18f45442a59cdd45bd29fcf526a09717d902d30376dfe2784de2d4df9627f803b
 SHA512 
a2adbbdebb133d7e97428c0ac9bf4c2413c95bca61567c5475f889f550904fc33a385712536c9026b38a1645b73c943876fa36724b634db061cb7cc0932543f2
+DIST opensmt-2.5.0.tar.gz 1940493 BLAKE2B 
ee643815b9da8bdc4a3a074a438eacdfde778347f4090aa7403e34859a9d51a17db8992c38a0e9f7a808384b0413abfbe2aa7b360dda44181344528159666945
 SHA512 
d70972eae376b927694f893ff9b6e4bfba7d0cfffe63545b5a0d582b594c3538643c9ae0121e75cf85aec3876eb4a45df2766c3a7700d07da05d1d6081953f42

diff --git a/sci-mathematics/opensmt/opensmt-2.5.0.ebuild 
b/sci-mathematics/opensmt/opensmt-2.5.0.ebuild
new file mode 100644
index ..479c6c7e252f
--- /dev/null
+++ b/sci-mathematics/opensmt/opensmt-2.5.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Compact and open-source SMT-solver written in C++"
+HOMEPAGE="http://verify.inf.usi.ch/opensmt/
+   https://github.com/usi-verification-and-security/opensmt/;
+
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+   
EGIT_REPO_URI="https://github.com/usi-verification-and-security/${PN}.git;
+else
+   
SRC_URI="https://github.com/usi-verification-and-security/${PN}/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="debug libedit +readline test"
+REQUIRED_USE="?? ( libedit readline )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-libs/gmp:=[cxx]
+   readline? ( sys-libs/readline:= )
+   libedit? ( dev-libs/libedit:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/bison
+   sys-devel/flex
+   test? ( dev-cpp/gtest )
+"
+
+# PATCHES=( "${FILESDIR}"/${PN}-2.4.3-musl.patch )
+
+src_prepare() {
+   cmake_src_prepare
+
+   echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die
+}
+
+src_configure() {
+   local CMAKE_BUILD_TYPE
+   if use debug ; then
+   CMAKE_BUILD_TYPE=Debug
+   else
+   CMAKE_BUILD_TYPE=Release
+   fi
+
+   local -a mycmakeargs=(
+   -DPACKAGE_TESTS=$(usex test)
+   -DUSE_READLINE=$(usex readline)
+   )
+   if use readline || use libedit ; then
+   mycmakeargs+=( -DENABLE_LINE_EDITING=ON )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   rm "${ED}"/usr/lib/libopensmt.a || die
+   dodir /usr/$(get_libdir)
+   mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-04-13 Thread Maciej Barć 
commit: 22e1e10bf3cae8381b8af13491dda22588ce4b1f
Author: Maciej Barć  gentoo  org>
AuthorDate: Thu Apr 13 21:11:09 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Apr 13 21:27:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e1e10b

sci-mathematics/opensmt: require gmp with USE=cxx

Closes: https://bugs.gentoo.org/904272
Signed-off-by: Maciej Barć  gentoo.org>

 .../opensmt/{opensmt-2.4.3-r1.ebuild => opensmt-2.4.3-r2.ebuild}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/opensmt/opensmt-2.4.3-r1.ebuild 
b/sci-mathematics/opensmt/opensmt-2.4.3-r2.ebuild
similarity index 98%
rename from sci-mathematics/opensmt/opensmt-2.4.3-r1.ebuild
rename to sci-mathematics/opensmt/opensmt-2.4.3-r2.ebuild
index d02cd8ed4430..f46f590a012c 100644
--- a/sci-mathematics/opensmt/opensmt-2.4.3-r1.ebuild
+++ b/sci-mathematics/opensmt/opensmt-2.4.3-r2.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="?? ( libedit readline )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-   dev-libs/gmp:=
+   dev-libs/gmp:=[cxx]
readline? ( sys-libs/readline:= )
libedit? ( dev-libs/libedit:= )
 "

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/, sci-mathematics/opensmt/files/

2023-02-06 Thread Maciej Barć 
commit: d7cebc801072df5274120a7f38644474e1168ed1
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Feb  6 16:46:59 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Feb  6 17:23:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7cebc80

sci-mathematics/opensmt: fix build on musl

Bug: https://github.com/usi-verification-and-security/opensmt/pull/590
Closes: https://bugs.gentoo.org/890794
Signed-off-by: Maciej Barć  gentoo.org>

 .../opensmt/files/opensmt-2.4.3-musl.patch | 132 +
 sci-mathematics/opensmt/opensmt-2.4.3-r1.ebuild|   2 +
 2 files changed, 134 insertions(+)

diff --git a/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch 
b/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch
new file mode 100644
index ..5f80a0de116c
--- /dev/null
+++ b/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch
@@ -0,0 +1,132 @@
+From e88b83b3b52ebc6ff4cdf1f92a876861fc2c5598 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Bar=C4=87?= 
+Date: Mon, 6 Feb 2023 17:27:34 +0100
+Subject: [PATCH] use fpu_control only on glibc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Maciej Barć 
+---
+ bin/opensmt.C   | 4 ++--
+ src/bin/opensmt.cc  | 2 +-
+ src/minisat/core/Main.C | 4 ++--
+ src/minisat/simp/Main.C | 4 ++--
+ src/minisat/utils/System.h  | 2 +-
+ src/parallel/opensmtSplitter.cc | 4 ++--
+ 6 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/bin/opensmt.C b/bin/opensmt.C
+index cb9c8943b..898a8fdd3 100644
+--- a/bin/opensmt.C
 b/bin/opensmt.C
+@@ -44,7 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
+ #include 
+ #include 
+ 
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ #include 
+ #endif
+ 
+@@ -84,7 +84,7 @@ int main( int argc, char * argv[] )
+   // the repeatability of experiments that might be compromised
+   // by the floating point unit approximations on doubles
+   //
+-#if defined(__linux__) && !defined( SMTCOMP )
++#if defined(__GLIBC__) && !defined( SMTCOMP )
+   fpu_control_t oldcw, newcw;
+   _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; 
_FPU_SETCW(newcw);
+ #endif
+diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc
+index 6db12ffd8..67bfcd712 100644
+--- a/src/bin/opensmt.cc
 b/src/bin/opensmt.cc
+@@ -47,7 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
+ #endif
+ #endif // ENABLE_LINE_EDITING
+ 
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ #include 
+ #endif
+ 
+diff --git a/src/minisat/core/Main.C b/src/minisat/core/Main.C
+index acef32cd5..2c232b71b 100644
+--- a/src/minisat/core/Main.C
 b/src/minisat/core/Main.C
+@@ -74,7 +74,7 @@ static inline uint64_t memUsed(void) {
+ static inline uint64_t memUsed() { return 0; }
+ #endif
+ 
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ #include 
+ #endif
+ 
+@@ -287,7 +287,7 @@ int main(int argc, char** argv)
+ 
+ 
+ reportf("This is MiniSat 2.0 beta\n");
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ fpu_control_t oldcw, newcw;
+ _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; 
_FPU_SETCW(newcw);
+ reportf("WARNING: for repeatability, setting FPU to use double 
precision\n");
+diff --git a/src/minisat/simp/Main.C b/src/minisat/simp/Main.C
+index b6d194631..a3f22fb4f 100644
+--- a/src/minisat/simp/Main.C
 b/src/minisat/simp/Main.C
+@@ -74,7 +74,7 @@ static inline uint64_t memUsed(void) {
+ static inline uint64_t memUsed() { return 0; }
+ #endif
+ 
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ #include 
+ #endif
+ 
+@@ -244,7 +244,7 @@ const char* hasPrefix(const char* str, const char* prefix)
+ int main(int argc, char** argv)
+ {
+ reportf("This is MiniSat 2.0 beta\n");
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ fpu_control_t oldcw, newcw;
+ _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; 
_FPU_SETCW(newcw);
+ reportf("WARNING: for repeatability, setting FPU to use double 
precision\n");
+diff --git a/src/minisat/utils/System.h b/src/minisat/utils/System.h
+index 5f9dc3f53..4b7f9c9f5 100644
+--- a/src/minisat/utils/System.h
 b/src/minisat/utils/System.h
+@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
DEALINGS IN THE SOFTWA
+ #ifndef Minisat_System_h
+ #define Minisat_System_h
+ 
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ #include 
+ #endif
+ 
+diff --git a/src/parallel/opensmtSplitter.cc b/src/parallel/opensmtSplitter.cc
+index 05246e187..4b8c01a1a 100644
+--- a/src/parallel/opensmtSplitter.cc
 b/src/parallel/opensmtSplitter.cc
+@@ -27,7 +27,7 @@
+ #endif
+ #endif // ENABLE_LINE_EDITING
+ 
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ #include 
+ #endif
+ 
+@@ -55,7 +55,7 @@ int main( int argc, char * argv[] )
+ // the repeatability of experiments that might be compromised
+

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-02-06 Thread Maciej Barć 
commit: 7f2a189245ffe5224106a09d65398f349bd3ab6f
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Feb  6 16:17:26 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Feb  6 17:23:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2a1892

sci-mathematics/opensmt: drop old 2.4.3

Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/opensmt-2.4.3.ebuild | 70 
 1 file changed, 70 deletions(-)

diff --git a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild 
b/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
deleted file mode 100644
index 089f834988bc..
--- a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Compact and open-source SMT-solver written in C++"
-HOMEPAGE="http://verify.inf.usi.ch/opensmt/
-   https://github.com/usi-verification-and-security/opensmt/;
-
-if [[ ${PV} == ** ]] ; then
-   inherit git-r3
-   
EGIT_REPO_URI="https://github.com/usi-verification-and-security/${PN}.git;
-else
-   
SRC_URI="https://github.com/usi-verification-and-security/${PN}/archive/v${PV}.tar.gz
-   -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="debug libedit +readline test"
-REQUIRED_USE="?? ( libedit readline )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   dev-libs/gmp:=
-   readline? ( sys-libs/readline:= )
-   libedit? ( dev-libs/libedit:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   sys-devel/bison
-   sys-devel/flex
-   test? ( dev-cpp/gtest )
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die
-   echo "add_subdirectory(unit)" > "${S}"/parallel-test/CMakeLists.txt || 
die
-}
-
-src_configure() {
-   local CMAKE_BUILD_TYPE
-   if use debug ; then
-   CMAKE_BUILD_TYPE=Debug
-   else
-   CMAKE_BUILD_TYPE=Release
-   fi
-
-   local -a mycmakeargs=(
-   -DPACKAGE_TESTS=$(usex test)
-   -DUSE_READLINE=$(usex readline)
-   )
-   if use readline || use libedit ; then
-   mycmakeargs+=( -DENABLE_LINE_EDITING=ON )
-   fi
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   rm "${ED}"/usr/lib/libopensmt.a || die
-   dodir /usr/$(get_libdir)
-   mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
-}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-01-13 Thread Maciej Barć 
commit: 07c1e07de1d95f15bcbf554e8648686e62a00098
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri Jan 13 18:49:50 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri Jan 13 18:58:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c1e07d

sci-mathematics/opensmt: prevent fetching googletest

Closes: https://bugs.gentoo.org/890722
Signed-off-by: Maciej Barć  gentoo.org>

 .../opensmt/{opensmt-2.4.3.ebuild => opensmt-2.4.3-r1.ebuild}  | 6 ++
 sci-mathematics/opensmt/opensmt-2.4.3.ebuild   | 7 +++
 2 files changed, 13 insertions(+)

diff --git a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild 
b/sci-mathematics/opensmt/opensmt-2.4.3-r1.ebuild
similarity index 92%
copy from sci-mathematics/opensmt/opensmt-2.4.3.ebuild
copy to sci-mathematics/opensmt/opensmt-2.4.3-r1.ebuild
index 6fa8666a57f1..b1e67e45cbad 100644
--- a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
+++ b/sci-mathematics/opensmt/opensmt-2.4.3-r1.ebuild
@@ -36,6 +36,12 @@ BDEPEND="
test? ( dev-cpp/gtest )
 "
 
+src_prepare() {
+   cmake_src_prepare
+
+   echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die
+}
+
 src_configure() {
local CMAKE_BUILD_TYPE
if use debug ; then

diff --git a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild 
b/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
index 6fa8666a57f1..089f834988bc 100644
--- a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
+++ b/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
@@ -36,6 +36,13 @@ BDEPEND="
test? ( dev-cpp/gtest )
 "
 
+src_prepare() {
+   cmake_src_prepare
+
+   echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die
+   echo "add_subdirectory(unit)" > "${S}"/parallel-test/CMakeLists.txt || 
die
+}
+
 src_configure() {
local CMAKE_BUILD_TYPE
if use debug ; then

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-01-13 Thread Maciej Barć 
commit: 3862b89b135827bfebfa0bad6f67a35cfc472f36
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri Jan 13 18:36:29 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri Jan 13 18:58:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3862b89b

sci-mathematics/opensmt: do not install static libs

Closes: https://bugs.gentoo.org/890724
Signed-off-by: Maciej Barć  gentoo.org>

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

diff --git a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild 
b/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
index 6e169efbf9ca..6fa8666a57f1 100644
--- a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
+++ b/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
@@ -57,6 +57,7 @@ src_configure() {
 src_install() {
cmake_src_install
 
-   mkdir -p "${ED}"/usr/$(get_libdir) || die
+   rm "${ED}"/usr/lib/libopensmt.a || die
+   dodir /usr/$(get_libdir)
mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
 }

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/opensmt/

2023-01-08 Thread Maciej Barć 
commit: 77ad3c36ac36c41ac46f1d85ae0fa1964f514270
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Jan  9 01:26:30 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Jan  9 01:54:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ad3c36

sci-mathematics/opensmt: new package; add 2.4.3

Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/opensmt/Manifest |  1 +
 sci-mathematics/opensmt/metadata.xml | 19 +
 sci-mathematics/opensmt/opensmt-2.4.3.ebuild | 62 
 3 files changed, 82 insertions(+)

diff --git a/sci-mathematics/opensmt/Manifest b/sci-mathematics/opensmt/Manifest
new file mode 100644
index ..cfff6834edf3
--- /dev/null
+++ b/sci-mathematics/opensmt/Manifest
@@ -0,0 +1 @@
+DIST opensmt-2.4.3.tar.gz 1912077 BLAKE2B 
d945d5b85d81b9b991f2f881f2d8f160dbefad8ce6484cf0d28c9a35c0fa64d18f45442a59cdd45bd29fcf526a09717d902d30376dfe2784de2d4df9627f803b
 SHA512 
a2adbbdebb133d7e97428c0ac9bf4c2413c95bca61567c5475f889f550904fc33a385712536c9026b38a1645b73c943876fa36724b634db061cb7cc0932543f2

diff --git a/sci-mathematics/opensmt/metadata.xml 
b/sci-mathematics/opensmt/metadata.xml
new file mode 100644
index ..e1c63fbdaeca
--- /dev/null
+++ b/sci-mathematics/opensmt/metadata.xml
@@ -0,0 +1,19 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+  
+sci-mathemat...@gentoo.org
+Gentoo Mathematics Project
+  
+  
+OpenSMT2 is an SMT solver written in C++. It supports reading files in
+SMT-LIB2 format and the theories QF_UF, QF_RDL, QF_IDL, QF_LRA, QF_LIA,
+QF_UFLRA, QF_UFLIA and QF_AX. The system also provides an API; the
+distribution includes a minimal example how to use the API.
+  
+  
+
https://github.com/usi-verification-and-security/opensmt/issues/
+usi-verification-and-security/opensmt
+  
+

diff --git a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild 
b/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
new file mode 100644
index ..6e169efbf9ca
--- /dev/null
+++ b/sci-mathematics/opensmt/opensmt-2.4.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Compact and open-source SMT-solver written in C++"
+HOMEPAGE="http://verify.inf.usi.ch/opensmt/
+   https://github.com/usi-verification-and-security/opensmt/;
+
+if [[ ${PV} == ** ]] ; then
+   inherit git-r3
+   
EGIT_REPO_URI="https://github.com/usi-verification-and-security/${PN}.git;
+else
+   
SRC_URI="https://github.com/usi-verification-and-security/${PN}/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="debug libedit +readline test"
+REQUIRED_USE="?? ( libedit readline )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-libs/gmp:=
+   readline? ( sys-libs/readline:= )
+   libedit? ( dev-libs/libedit:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/bison
+   sys-devel/flex
+   test? ( dev-cpp/gtest )
+"
+
+src_configure() {
+   local CMAKE_BUILD_TYPE
+   if use debug ; then
+   CMAKE_BUILD_TYPE=Debug
+   else
+   CMAKE_BUILD_TYPE=Release
+   fi
+
+   local -a mycmakeargs=(
+   -DPACKAGE_TESTS=$(usex test)
+   -DUSE_READLINE=$(usex readline)
+   )
+   if use readline || use libedit ; then
+   mycmakeargs+=( -DENABLE_LINE_EDITING=ON )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   mkdir -p "${ED}"/usr/$(get_libdir) || die
+   mv "${ED}"/usr/lib/libopensmt.* "${ED}"/usr/$(get_libdir)/ || die
+}