gentoo auto-resync : 14:06:2024 - 00:09:04

7 files changed, 127 insertions, 82 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ff940966f0e7..bbf3a914aaf2 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cryptominisat/Manifest b/sci-mathematics/cryptominisat/Manifest
index b56b01b10cc6..0cb8eb22d717 100644
--- a/sci-mathematics/cryptominisat/Manifest
+++ b/sci-mathematics/cryptominisat/Manifest
@@ -1,5 +1,5 @@
-DIST cryptominisat-5.11.15.tar.gz 968163 BLAKE2B e14d7d42fa8391cbb16d887c90b3a4d272644895ec11cf134df8b9d8e46ef425afab3622cf109d4c1f2a16f6f24d3768110aff947df0070cd660b29da1cdc609 SHA512 a84e060e3fddbd19f1b35f61b0931c342cdb545d1135f33b5390446598b8d5743258e59975b71d62a25b86e0704d90b52072e97989f1b81e80e2bbba3118d3fb
+AUX cryptominisat-5.11.21-setup-py.patch 466 BLAKE2B 17cd196e3413ebe3d560b6839ca8ff4fc39a4505d009bbf511df183d1536d234e7358b9b87ae9319ec1a4cf95a52f5e7b09f099535f2552433cf35ed420283c7 SHA512 ed0d8c78b3baab0be6c934314152dbf0de7564f1e03504f66fd358d0b8283c488b84daf6fe0aa9f4af860cf5c208320ba2a34b590d3dddbc084bb44c4720983c
+AUX cryptominisat-5.11.21-unistd.patch 253 BLAKE2B 7b1d2bff8cf5ab2af33d91c0a680b2bdd3baf129d529a87c86cc6fab8f5d35ca0d202635c03c00a42786a896b1071c4fbfaa76cab970e625744d89c3b2c62140 SHA512 f7748158a7402d140c5e6ce1326862bead4d23587341a997c63e7947de685e9c2a366781af6c661feb2e21fb82f7e6feb2c3cc7ab4f25c361ed41f0bfcb3726d
 DIST cryptominisat-5.11.21.tar.gz 975459 BLAKE2B c1a8e274a5221584c7245405f6b617951528a477ae36680da293acc9e7ee46692a0a37c057749a98c41b7bc302a3d0b9de176379b8c9aece339c2aaa6b6a3308 SHA512 5a1ac51b27cc692c793831aba83cc71188f9c46abdef809fae9c830a2801e1c45310cf5ada1ba4e10cb11aba5efef6407a9f7f0506474f30bdd4a58bfcbdbef7
-EBUILD cryptominisat-5.11.15.ebuild 752 BLAKE2B 6b1ec4218e34de0fcb98cb8e5877659a8f81feaba1d3bc9a92cfa7f7c004c3e655d45149ebbe92dca11ea180138eb15705aa8e550c5b7cb22ba3d739bf375505 SHA512 0c681051ab75b14a19b7c7405e6e0ae750b9243b0009a4608d39b88ad9ca79f91ddb8b4bbcf62530538e02588bb6df23efa5e53d80ddeb85bdfaafafbb771da0
-EBUILD cryptominisat-5.11.21.ebuild 763 BLAKE2B b4b79c03461f2b7f1e0e9d81286c0e4bc4144504d9b61c2a42016ca5990a092f5da5035bacebb8dbfbfe15384f81ba1e98ea10dddeff401d833f977c17c51a98 SHA512 6b696b6821909b0026c157dd282d32b3f949986f1a8097545a59c02627a823389c820aff43bed33b22fb0b35a03e0a764ac52d476526c3690effd5ce60ab1eba
+EBUILD cryptominisat-5.11.21-r1.ebuild 1543 BLAKE2B 5fc6caaeac2bebc9a7c3955cfd0775847494efb73036d2d76a7f556647868c4eaf4f7fa8c6d8de2e67d0caff0038fff8da08413085a791533129873c05b043c4 SHA512 f996ba638198328dccd8d1e2c944677a4698da21670e21c77eb582189ac4b740a60f384daff8c6361c360751c3519401731c063111f18f2bd57caf705603e44c
 MISC metadata.xml 858 BLAKE2B 4543d51cedd7b5e5e8508c14dfae420360f9d76ada1b969d855ca2b17b2c967036b29a9f2769a2c78e736c1e449e2b079558cd7460a72d402e9f1ce029ba414a SHA512 e1b39d888ab6c09f8707a164c7f683831a908477b2c7f219f4c9f71161ba84c145836ca2b1665e200f15a6e2ff6ca6318bd16fc40d57ad9c64bd1a4e229fbabc
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.11.15.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.11.15.ebuild
deleted file mode 100644
index 8eb2f8619f84..000000000000
--- a/sci-mathematics/cryptominisat/cryptominisat-5.11.15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Advanced SAT solver with C++ and command-line interfaces"
-HOMEPAGE="https://github.com/msoos/cryptominisat/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/msoos/${PN}.git"
-else
-	SRC_URI="https://github.com/msoos/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="0/${PV}"
-LICENSE="GPL-2 MIT"
-RESTRICT="test"         # Tests require many git modules.
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DNOBREAKID=ON
-		-DNOM4RI=ON
-		-DENABLE_TESTING=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.11.21-r1.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.11.21-r1.ebuild
new file mode 100644
index 000000000000..db2ca950f559
--- /dev/null
+++ b/sci-mathematics/cryptominisat/cryptominisat-5.11.21-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD="ON"
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+DISTUTILS_EXT="1"
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_PEP517="setuptools"
+
+inherit cmake distutils-r1
+
+DESCRIPTION="Advanced SAT solver with C++ and command-line interfaces"
+HOMEPAGE="https://github.com/msoos/cryptominisat/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/msoos/${PN}.git"
+else
+	SRC_URI="https://github.com/msoos/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 MIT"
+SLOT="0/${PV}"
+IUSE="python"
+RESTRICT="test"                               # Tests require some git modules.
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib:=
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	python? (
+		${DISTUTILS_DEPS}
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11.21-setup-py.patch"
+	"${FILESDIR}/${PN}-5.11.21-unistd.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use python ; then
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DNOBREAKID=ON
+		-DENABLE_TESTING=OFF
+	)
+	cmake_src_configure
+
+	if use python ; then
+		python_setup
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use python ; then
+		distutils-r1_src_install
+	fi
+}
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.11.21.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.11.21.ebuild
deleted file mode 100644
index 4beb16299f8c..000000000000
--- a/sci-mathematics/cryptominisat/cryptominisat-5.11.21.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Advanced SAT solver with C++ and command-line interfaces"
-HOMEPAGE="https://github.com/msoos/cryptominisat/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/msoos/${PN}.git"
-else
-	SRC_URI="https://github.com/msoos/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2 MIT"
-SLOT="0/${PV}"
-RESTRICT="test"                               # Tests require some git modules.
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DNOBREAKID=ON
-		-DENABLE_TESTING=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-setup-py.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-setup-py.patch
new file mode 100644
index 000000000000..6b13b3e05b26
--- /dev/null
+++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-setup-py.patch
@@ -0,0 +1,18 @@
+--- a/setup.py
++++ b/setup.py
+@@ -27,13 +27,13 @@ import sys
+ import os
+ from setuptools import Extension, setup
+ import sysconfig
+-import toml
++import tomli
+ import pathlib
+ from sys import platform
+ 
+ def _parse_toml(pyproject_path):
+     pyproject_text = pyproject_path.read_text()
+-    pyproject_data = toml.loads(pyproject_text)
++    pyproject_data = tomli.loads(pyproject_text)
+     return pyproject_data['project']['version']
+ 
+ picosatlib = ('picosatlib', {
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-unistd.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-unistd.patch
new file mode 100644
index 000000000000..c64228a17862
--- /dev/null
+++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-unistd.patch
@@ -0,0 +1,12 @@
+index f0a9e33..85286be 100644
+--- a/src/picosat/picosat.c
++++ b/src/picosat/picosat.c
+@@ -8148,7 +8148,7 @@ picosat_stats (PS * ps)
+ #else
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+ 
+ double