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

2024-04-29 Thread Maciej Barć
commit: 351b0d97c04df35ea8b9f1e70db4f4295f2b5afc
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Apr 29 17:08:55 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Apr 29 18:57:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351b0d97

sci-mathematics/stp: enable py3.12 compat

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

 sci-mathematics/stp/stp-2.3.3-r3.ebuild | 44 +++--
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/sci-mathematics/stp/stp-2.3.3-r3.ebuild 
b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
index 3aa8309bf123..ae62721212d2 100644
--- a/sci-mathematics/stp/stp-2.3.3-r3.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-OC_COMMIT=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45
-GT_COMMIT=2ad076167a676e3ed62f90b754b30fac5caa1f88
+OC_COMMIT="119fe41a83bc455a24a11ecc9b78e7b13fcfcc45"
+GT_COMMIT="2ad076167a676e3ed62f90b754b30fac5caa1f88"
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit flag-o-matic python-single-r1 cmake
 
@@ -16,6 +16,7 @@ HOMEPAGE="https://stp.github.io/
 SRC_URI="
https://github.com/stp/stp/archive/${PV}.tar.gz
-> ${P}.tar.gz
+
test? (
https://github.com/stp/OutputCheck/archive/${OC_COMMIT}.tar.gz
-> ${P}_OutputCheck.tar.gz
@@ -40,18 +41,24 @@ RDEPEND="
dev-libs/icu:=
sci-mathematics/cryptominisat:=
)
-   python? ( ${PYTHON_DEPS} )
+   python? (
+   ${PYTHON_DEPS}
+   )
+"
+DEPEND="
+   ${RDEPEND}
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
sys-apps/help2man
-   test? ( dev-python/lit )
+   test? (
+   dev-python/lit
+   )
 "
 
 PATCHES=(
-   "${FILESDIR}"/${P}-CMakeLists.txt-fix_cflags.patch
-   "${FILESDIR}"/${P}-cstdint.patch
-   "${FILESDIR}"/${P}-stp.py-library_path.patch
+   "${FILESDIR}/${P}-CMakeLists.txt-fix_cflags.patch"
+   "${FILESDIR}/${P}-cstdint.patch"
+   "${FILESDIR}/${P}-stp.py-library_path.patch"
 )
 
 pkg_setup() {
@@ -59,13 +66,14 @@ pkg_setup() {
 }
 
 src_unpack() {
-   unpack ${P}.tar.gz
+   unpack "${P}.tar.gz"
 
if use test ; then
local i
for i in OutputCheck gtest ; do
-   tar xf "${DISTDIR}"/${P}_${i}.tar.gz 
--strip-components=1  \
-   -C "${S}"/utils/${i}  || die "failed to unpack 
${i}"
+   tar xf "${DISTDIR}/${P}_${i}.tar.gz" 
--strip-components=1  \
+   -C "${S}/utils/${i}" \
+   || die "failed to unpack ${i}"
done
fi
 }
@@ -75,7 +83,7 @@ src_prepare() {
sed -i "s/set(LIBDIR lib/set(LIBDIR $(get_libdir)/" CMakeLists.txt || 
die
 
# Remove problematic test
-   rm "${S}"/tests/query-files/misc-tests/no-query.cvc || die
+   rm "${S}/tests/query-files/misc-tests/no-query.cvc" || die
 
cmake_src_prepare
 }
@@ -86,9 +94,9 @@ src_configure() {
 
local CMAKE_BUILD_TYPE
if use debug ; then
-   CMAKE_BUILD_TYPE=Debug
+   CMAKE_BUILD_TYPE="Debug"
else
-   CMAKE_BUILD_TYPE=Release
+   CMAKE_BUILD_TYPE="Release"
fi
 
local -a mycmakeargs=(
@@ -107,8 +115,8 @@ src_install() {
# Because Python files for tests (in BUILD_DIR) and those installed on 
the
# system differ, and are generated upon install, we have to wait for 
CMake
# to install them into the temporary image.
-   use python && python_optimize "${D}/$(python_get_sitedir)"/stp
+   use python && python_optimize "${D}/$(python_get_sitedir)/stp"
 
-   mv "${D}"/usr/man "${D}"/usr/share/man || die
+   mv "${D}/usr/man" "${D}/usr/share/man" || die
dodoc -r papers
 }



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

2023-02-21 Thread Maciej Barć
commit: 335dfafb43cfb8574492617237712bcc324e980c
Author: Maciej Barć  gentoo  org>
AuthorDate: Tue Feb 21 22:22:14 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Tue Feb 21 23:54:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335dfafb

sci-mathematics/stp: update PYTHON_COMPAT; add help2man to BDEPEND

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

 .../{stp-2.3.3-r2.ebuild => stp-2.3.3-r3.ebuild}   | 28 +-
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/sci-mathematics/stp/stp-2.3.3-r2.ebuild 
b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
similarity index 81%
rename from sci-mathematics/stp/stp-2.3.3-r2.ebuild
rename to sci-mathematics/stp/stp-2.3.3-r3.ebuild
index 000e5bef36f9..3aa8309bf123 100644
--- a/sci-mathematics/stp/stp-2.3.3-r2.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
@@ -3,21 +3,26 @@
 
 EAPI=8
 
-OC_H=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45
-GT_H=2ad076167a676e3ed62f90b754b30fac5caa1f88
+OC_COMMIT=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45
+GT_COMMIT=2ad076167a676e3ed62f90b754b30fac5caa1f88
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit flag-o-matic python-single-r1 cmake
 
 DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
 HOMEPAGE="https://stp.github.io/
https://github.com/stp/stp/;
-SRC_URI="https://github.com/stp/stp/archive/${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="
+   https://github.com/stp/stp/archive/${PV}.tar.gz
+   -> ${P}.tar.gz
test? (
-   https://github.com/stp/OutputCheck/archive/${OC_H}.tar.gz -> 
${P}_OutputCheck.tar.gz
-   https://github.com/stp/googletest/archive/${GT_H}.tar.gz -> 
${P}_gtest.tar.gz
-   )"
+   https://github.com/stp/OutputCheck/archive/${OC_COMMIT}.tar.gz
+   -> ${P}_OutputCheck.tar.gz
+   https://github.com/stp/googletest/archive/${GT_COMMIT}.tar.gz
+   -> ${P}_gtest.tar.gz
+   )
+"
 
 LICENSE="GPL-2+ MIT"
 SLOT="0/${PV}"
@@ -38,7 +43,10 @@ RDEPEND="
python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/lit )"
+BDEPEND="
+   sys-apps/help2man
+   test? ( dev-python/lit )
+"
 
 PATCHES=(
"${FILESDIR}"/${P}-CMakeLists.txt-fix_cflags.patch
@@ -46,8 +54,6 @@ PATCHES=(
"${FILESDIR}"/${P}-stp.py-library_path.patch
 )
 
-#include 
-
 pkg_setup() {
use python && python-single-r1_pkg_setup
 }
@@ -85,7 +91,7 @@ src_configure() {
CMAKE_BUILD_TYPE=Release
fi
 
-   local mycmakeargs=(
+   local -a mycmakeargs=(
-DTEST_C_API=OFF  # C API test fail
-DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON')  # double 
negation
-DENABLE_PYTHON_INTERFACE=$(usex python)



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

2023-02-19 Thread Maciej Barć
commit: 337f35c9db81b2c00da792a1596d8d4aec2d0509
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Feb 20 00:20:17 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Feb 20 00:53:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337f35c9

sci-mathematics/stp: rename patches

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

 ...txt-fix_cflags.patch => stp-2.3.3-CMakeLists.txt-fix_cflags.patch} | 0
 ...-stp.py-library_path.patch => stp-2.3.3-stp.py-library_path.patch} | 0
 sci-mathematics/stp/stp-2.3.3-r2.ebuild   | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch 
b/sci-mathematics/stp/files/stp-2.3.3-CMakeLists.txt-fix_cflags.patch
similarity index 100%
rename from sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch
rename to sci-mathematics/stp/files/stp-2.3.3-CMakeLists.txt-fix_cflags.patch

diff --git a/sci-mathematics/stp/files/stp-stp.py-library_path.patch 
b/sci-mathematics/stp/files/stp-2.3.3-stp.py-library_path.patch
similarity index 100%
rename from sci-mathematics/stp/files/stp-stp.py-library_path.patch
rename to sci-mathematics/stp/files/stp-2.3.3-stp.py-library_path.patch

diff --git a/sci-mathematics/stp/stp-2.3.3-r2.ebuild 
b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
index 8c6578dface1..f9142adbe6df 100644
--- a/sci-mathematics/stp/stp-2.3.3-r2.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
@@ -41,8 +41,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-python/lit )"
 
 PATCHES=(
-   "${FILESDIR}"/stp-CMakeLists.txt-fix_cflags.patch
-   "${FILESDIR}"/stp-stp.py-library_path.patch
+   "${FILESDIR}"/${P}-CMakeLists.txt-fix_cflags.patch
+   "${FILESDIR}"/${P}-stp.py-library_path.patch
 )
 
 pkg_setup() {



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

2023-02-19 Thread Maciej Barć
commit: c7aee643a9472d7ea97c8e1266ed8102e3298535
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Feb 20 00:32:10 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Feb 20 00:53:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7aee643

sci-mathematics/stp: patch - include cstdint

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

 sci-mathematics/stp/files/stp-2.3.3-cstdint.patch | 11 +++
 sci-mathematics/stp/stp-2.3.3-r2.ebuild   |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/sci-mathematics/stp/files/stp-2.3.3-cstdint.patch 
b/sci-mathematics/stp/files/stp-2.3.3-cstdint.patch
new file mode 100644
index ..4c010848ee36
--- /dev/null
+++ b/sci-mathematics/stp/files/stp-2.3.3-cstdint.patch
@@ -0,0 +1,11 @@
+--- a/./include/stp/AST/ASTNode.h
 b/./include/stp/AST/ASTNode.h
+@@ -24,6 +24,8 @@ THE SOFTWARE.
+ #ifndef ASTNODE_H
+ #define ASTNODE_H
+ 
++#include 
++
+ #include "stp/AST/NodeFactory/HashingNodeFactory.h"
+ #include "stp/Util/Attributes.h"
+ #include "ASTInternal.h"

diff --git a/sci-mathematics/stp/stp-2.3.3-r2.ebuild 
b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
index f9142adbe6df..000e5bef36f9 100644
--- a/sci-mathematics/stp/stp-2.3.3-r2.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
@@ -42,9 +42,12 @@ BDEPEND="test? ( dev-python/lit )"
 
 PATCHES=(
"${FILESDIR}"/${P}-CMakeLists.txt-fix_cflags.patch
+   "${FILESDIR}"/${P}-cstdint.patch
"${FILESDIR}"/${P}-stp.py-library_path.patch
 )
 
+#include 
+
 pkg_setup() {
use python && python-single-r1_pkg_setup
 }



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

2022-11-06 Thread Maciej Barć
commit: d1f7a354dc856bde7a58abfe3d4c5f2cff71ccfa
Author: Maciej Barć  gentoo  org>
AuthorDate: Sun Nov  6 20:09:52 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sun Nov  6 20:10:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f7a354

sci-mathematics/stp: do not run C API tests

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

 sci-mathematics/stp/stp-2.3.3-r2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/stp/stp-2.3.3-r2.ebuild 
b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
index e59e4388c2c3..5f29dc351697 100644
--- a/sci-mathematics/stp/stp-2.3.3-r2.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
@@ -11,7 +11,8 @@ PYTHON_COMPAT=( python3_{8,9,10} )
 inherit flag-o-matic python-single-r1 cmake
 
 DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
-HOMEPAGE="https://stp.github.io/;
+HOMEPAGE="https://stp.github.io/
+   https://github.com/stp/stp/;
 SRC_URI="https://github.com/stp/stp/archive/${PV}.tar.gz -> ${P}.tar.gz
test? (
https://github.com/stp/OutputCheck/archive/${OC_H}.tar.gz -> 
${P}_OutputCheck.tar.gz
@@ -82,6 +83,7 @@ src_configure() {
fi
 
local mycmakeargs=(
+   -DTEST_C_API=OFF  # C API test fail
-DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON')  # double 
negation
-DENABLE_PYTHON_INTERFACE=$(usex python)
-DENABLE_ASSERTIONS=$(usex test)



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

2022-08-08 Thread Maciej Barć
commit: b7c9de657e647f16a7f16c9aae0ba76fb9011312
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Aug  8 20:33:54 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Aug  8 20:45:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c9de65

sci-mathematics/stp: compile python modules

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

 sci-mathematics/stp/{stp-2.3.3-r1.ebuild => stp-2.3.3-r2.ebuild} | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/stp/stp-2.3.3-r1.ebuild 
b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
similarity index 89%
rename from sci-mathematics/stp/stp-2.3.3-r1.ebuild
rename to sci-mathematics/stp/stp-2.3.3-r2.ebuild
index 67fbceb1ce9d..e59e4388c2c3 100644
--- a/sci-mathematics/stp/stp-2.3.3-r1.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
@@ -92,7 +92,12 @@ src_configure() {
 
 src_install() {
cmake_src_install
-   mv "${D}"/usr/man "${D}"/usr/share/man || die
 
+   # Because Python files for tests (in BUILD_DIR) and those installed on 
the
+   # system differ, and are generated upon install, we have to wait for 
CMake
+   # to install them into the temporary image.
+   use python && python_optimize "${D}/$(python_get_sitedir)"/stp
+
+   mv "${D}"/usr/man "${D}"/usr/share/man || die
dodoc -r papers
 }



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

2022-08-06 Thread Maciej Barć
commit: 75cac060d43476807e769eb8f21dfeeb2c54d721
Author: Maciej Barć  gentoo  org>
AuthorDate: Sat Aug  6 23:48:15 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sat Aug  6 23:51:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cac060

sci-mathematics/stp: filter LTO (ODR)

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

 sci-mathematics/stp/stp-2.3.3-r1.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/stp/stp-2.3.3-r1.ebuild 
b/sci-mathematics/stp/stp-2.3.3-r1.ebuild
index 367251ea5f8f..67fbceb1ce9d 100644
--- a/sci-mathematics/stp/stp-2.3.3-r1.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ GT_H=2ad076167a676e3ed62f90b754b30fac5caa1f88
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit python-single-r1 cmake
+inherit flag-o-matic python-single-r1 cmake
 
 DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
 HOMEPAGE="https://stp.github.io/;
@@ -71,12 +71,16 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr warnings, bug #863263
+   filter-lto
+
local CMAKE_BUILD_TYPE
if use debug ; then
CMAKE_BUILD_TYPE=Debug
else
CMAKE_BUILD_TYPE=Release
fi
+
local mycmakeargs=(
-DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON')  # double 
negation
-DENABLE_PYTHON_INTERFACE=$(usex python)



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

2021-12-27 Thread Maciej Barć
commit: 317c9f66693a8341a07ba45fe158e8699cc1cd19
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Dec 27 13:08:03 2021 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Dec 27 13:08:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317c9f66

sci-mathematics/stp: multiple fixes

- add missing test submodules
- add optional cryptominisat dependency (USE=dependency)
- add the Gentoo Mathematics Project to co-maintainers
- change python to optional dependency (USE=python)
- install PDF documentation
- patch CMakeLists.txt to fix CFLAGS
- patch stp.py to fix python module

Closes: https://bugs.gentoo.org/759457
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/stp/Manifest   |  2 +
 .../stp/files/stp-CMakeLists.txt-fix_cflags.patch  | 21 +
 .../stp/files/stp-stp.py-library_path.patch| 15 
 sci-mathematics/stp/metadata.xml   | 51 +++-
 sci-mathematics/stp/stp-2.3.3-r1.ebuild| 94 ++
 sci-mathematics/stp/stp-2.3.3.ebuild   | 45 ---
 6 files changed, 161 insertions(+), 67 deletions(-)

diff --git a/sci-mathematics/stp/Manifest b/sci-mathematics/stp/Manifest
index e41280980dc7..0cbd33f52acc 100644
--- a/sci-mathematics/stp/Manifest
+++ b/sci-mathematics/stp/Manifest
@@ -1 +1,3 @@
 DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 
9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381
 SHA512 
a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
+DIST stp-2.3.3_OutputCheck.tar.gz 12002 BLAKE2B 
f8fafba8f7957f3d0ee480b9e1e8c8923c373cf134512d6329adf84a96f3177ad07d00eae4dc6dd8d4b09ca82dfc8b425602f1926e3f88ccb2556b4b7121e5b9
 SHA512 
36012ae2b2aee1ff3f36ba1678a4bcbfeb590e01c2042ca35eb2f49b6a890b767c1809d1415e7b03f2118204361f834ad9caf70319b59fd14b2c140bf858d16e
+DIST stp-2.3.3_gtest.tar.gz 469100 BLAKE2B 
386444657d3f23e54f01dac8e0ac36da4d97c3eebcc8cf79bfc754c474a5ed64765a0ad389fef358667e468469c47d02a407e13e6882d426a4defb0102e4a758
 SHA512 
2fc79fe9c8a4e0487e7e76db9508fd2207df0cfe3940a51aeac32e4440afab9e265bfe553b1cd66086cd5a574d8bf99dbb9e1d9c4a70fafd7b31f38825914aa1

diff --git a/sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch 
b/sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch
new file mode 100644
index ..93817e209376
--- /dev/null
+++ b/sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch
@@ -0,0 +1,21 @@
+index f6224a6..8c7c45e 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -203,17 +203,9 @@ if (NOT MSVC)
+ add_compile_options( -g)
+ add_compile_options( -pthread )
+ 
+-add_compile_options("$<$:-O2>")
+-
+-add_compile_options("$<$:-O2>")
+ add_compile_options("$<$:-g0>")
+ 
+ add_compile_options("$<$:-O0>")
+-
+-if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -O2")
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2")
+-endif()
+ else()
+ # see https://msdn.microsoft.com/en-us/library/fwkeyyhe.aspx for details
+ # /ZI = include debug info

diff --git a/sci-mathematics/stp/files/stp-stp.py-library_path.patch 
b/sci-mathematics/stp/files/stp-stp.py-library_path.patch
new file mode 100644
index ..60b54aa2c1da
--- /dev/null
+++ b/sci-mathematics/stp/files/stp-stp.py-library_path.patch
@@ -0,0 +1,15 @@
+index 61aef6d..16633e8 100644
+--- a/bindings/python/stp/stp.py.in
 b/bindings/python/stp/stp.py.in
+@@ -42,7 +42,10 @@ Py3 = sys.version_info >= (3, 0, 0)
+ if Py3:
+ long = int
+ 
+-from library_path import PATHS
++try:
++from .library_path import PATHS
++except ImportError:
++from library_path import PATHS
+ 
+ for path in PATHS:
+ if not os.path.exists(path):

diff --git a/sci-mathematics/stp/metadata.xml b/sci-mathematics/stp/metadata.xml
index 511b06e39e35..5054ed8fec27 100644
--- a/sci-mathematics/stp/metadata.xml
+++ b/sci-mathematics/stp/metadata.xml
@@ -1,26 +1,33 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
+
 
-   
-   jeff...@icurse.nl
-   Jeffrey Lin
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
-   
-   STP is a constraint solver (or SMT solver) aimed at solving
-   constraints of bitvectors and arrays. These types of
-   constraints can be generated by program analysis tools, theorem
-   provers, automated bug finders, cryptographic attack tools,
-   intelligent fuzzers, model checkers, and by many other
-   applications.
-   
-   
-   stp/stp
-   
-   
-   Enable building the Python interface
-   
+  
+jeff...@icurse.nl
+Jeffrey Lin
+  
+  
+

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/stp/, profiles/updates/, dev-libs/stp/

2021-12-27 Thread Maciej Barć
commit: 6f0b9d2bc3952de477fefeaa68783e5dc27e4e2d
Author: Maciej Barć  gentoo  org>
AuthorDate: Mon Dec 27 13:07:02 2021 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Dec 27 13:07:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f0b9d2b

sci-mathematics/stp: dev-libs -> sci-mathematics

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

 profiles/updates/4Q-2021   | 1 +
 {dev-libs => sci-mathematics}/stp/Manifest | 0
 {dev-libs => sci-mathematics}/stp/metadata.xml | 0
 {dev-libs => sci-mathematics}/stp/stp-2.3.3.ebuild | 0
 4 files changed, 1 insertion(+)

diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index ff58730799b0..62cf83b82693 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -66,3 +66,4 @@ move app-emulation/flannel app-containers/flannel
 move app-emulation/lxd app-containers/lxd
 move app-emulation/lxc-templates app-containers/lxc-templates
 move app-emulation/lxc app-containers/lxc
+move dev-libs/stp sci-mathematics/stp

diff --git a/dev-libs/stp/Manifest b/sci-mathematics/stp/Manifest
similarity index 100%
rename from dev-libs/stp/Manifest
rename to sci-mathematics/stp/Manifest

diff --git a/dev-libs/stp/metadata.xml b/sci-mathematics/stp/metadata.xml
similarity index 100%
rename from dev-libs/stp/metadata.xml
rename to sci-mathematics/stp/metadata.xml

diff --git a/dev-libs/stp/stp-2.3.3.ebuild 
b/sci-mathematics/stp/stp-2.3.3.ebuild
similarity index 100%
rename from dev-libs/stp/stp-2.3.3.ebuild
rename to sci-mathematics/stp/stp-2.3.3.ebuild