gentoo auto-resync : 18:04:2023 - 17:55:41

5 files changed, 15 insertions, 70 deletions

diff --git a/sci-mathematics/cryptominisat/Manifest b/sci-mathematics/cryptominisat/Manifest
index d212fca7abcc..1c891c16441c 100644
--- a/sci-mathematics/cryptominisat/Manifest
+++ b/sci-mathematics/cryptominisat/Manifest
@@ -1,6 +1,4 @@
-AUX cryptominisat-5.8.0-setup.py.in-sysconfig.patch 678 BLAKE2B b42dd9ebed8076e8c46ddf92107bdd776d078c0869a824b87c27876c49818ca96b1455912c3af3957c507b59fadb5ecbdedbd94404a87f4672295553d40ce612 SHA512 9836faddf2d502af08a15a08611dfcd1e476d4155fe6a6a9a68b4d6ff851fa7dd485e0c08ba23920cda43f8fc72e5ec9f05fce816b7b0ead65144daa38490601
+AUX cryptominisat-5.11.4-gcc-13.patch 216 BLAKE2B eac9f21b7e1e4049c27fdf4dcb19ec7aa1a7c0da5839cbb4bb54c20a00c41be0a101f280ba1a881d2529e7c36fe27abb94ea3b4e600d8212ec011abcbcd2fee6 SHA512 b13ea41b6a3a22ed6a171689a40ca4f9bae242f6013d334952776ff66517916960df4a962b55a5e1deab61de8e8a3c973d3c02c2b5e53aac1405a101c5b9e71b
 DIST cryptominisat-5.11.4.tar.gz 1044845 BLAKE2B b6df4e61c5f37d24a61a5c782f08f223c413e19fc2b1625718f7d19d4df8f4d955a92ae447f6c98889927ddc7407b4790092086996a0a32879c7dcb614ca1024 SHA512 8593848c468a6b1ac3d9ae343384aa323fb6ddc17802c9b184c178b9a41314c463b1c5f02ffd19d6e844894c7998e41d6e9b808ed70dcc235aa595607f52bc76
-DIST cryptominisat-5.8.0.tar.gz 943785 BLAKE2B 534af88a8432c7e3da63989cad8fd5e1491bd69a80b44977fa681e0356e857a505a82dc860b0d04d07987e3edae2861da67ec9dd781261e03a1120dc342b9759 SHA512 3eb954f01524b189a8de57a05f6060471a083addc4b9077c1e32b769d26393ce3d33468819ba8169deedce43fc3663b0ad8bbad95c6afe5e562e438c57b75496
-EBUILD cryptominisat-5.11.4.ebuild 759 BLAKE2B 90fd6e94487a8da7e2ee691e9634ea4e846aa9bcb7592e91360044955a1e6cb4bfbcbe572f03e7a46f9b4217b303bc34e07e848a4930e360511f6af4b59b4043 SHA512 bf223f972b8835465c9781ec04597f02db3675bf80e10c558e3d0925289d5471c5f87e9e857db152a001898bcc160bef9993faccc52464318adff68bd5c2c974
-EBUILD cryptominisat-5.8.0.ebuild 978 BLAKE2B a412c31536b1c00c949b87f090d7bdc35d7895bc289b09751a81b51fac89488c96080e37d3868d2c2d152962cd5b6a51d89489b6533be2cb60a566cf74860599 SHA512 4f7c2a0501ba66c45198dc671bbea9a3b9814f51b8e1fc1fc5808bd1111b9feff0ae6fab79f324ea4c4ba0042a1c680308e4f0df2b03c89894f431c789041987
+EBUILD cryptominisat-5.11.4.ebuild 812 BLAKE2B 772e5bf7985032fa53ecf5e40e9874535baaac95dbecbc3a5435c2a3f2af85d8ceb83979ff20d6a18a6b05eec525365c74f477edec7cf8a2f4d0dd3e34a70957 SHA512 d05b7762282bd018411a19acef297d876f2e0e57813d7747bfb294881844ffec57695a69f025dcf951a2255d95bf94e6ec9a436b19df0a51ce28d0105c38cf0c
 MISC metadata.xml 858 BLAKE2B 4543d51cedd7b5e5e8508c14dfae420360f9d76ada1b969d855ca2b17b2c967036b29a9f2769a2c78e736c1e449e2b079558cd7460a72d402e9f1ce029ba414a SHA512 e1b39d888ab6c09f8707a164c7f683831a908477b2c7f219f4c9f71161ba84c145836ca2b1665e200f15a6e2ff6ca6318bd16fc40d57ad9c64bd1a4e229fbabc
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
index a4f699cc2afd..6ff76af75ca2 100644
--- a/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
+++ b/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
@@ -21,6 +21,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-5.11.4-gcc-13.patch )
+
 src_configure() {
 	local -a mycmakeargs=(
 		-DNOBREAKID=ON
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
deleted file mode 100644
index 75dfa7819853..000000000000
--- a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit python-single-r1 cmake
-
-DESCRIPTION="Advanced SAT solver with C++ and Python interfaces"
-HOMEPAGE="https://github.com/msoos/cryptominisat/"
-SRC_URI="https://github.com/msoos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2 MIT"
-IUSE="+python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"  # tests require many convoluted bundled (git) modules
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-setup.py.in-sysconfig.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNOBREAKID=ON
-		-DNOM4RI=ON
-		-DENABLE_PYTHON_INTERFACE=$(usex python)
-		-DFORCE_PYTHON3=$(usex python)
-		-DENABLE_TESTING=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch
new file mode 100644
index 000000000000..e9c7fade75fe
--- /dev/null
+++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch
@@ -0,0 +1,11 @@
+index 0cf7910..54cb45e 100644
+--- a/src/ccnr.h
++++ b/src/ccnr.h
+@@ -23,6 +23,7 @@ THE SOFTWARE.
+ #ifndef CCNR_H
+ #define CCNR_H
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "ccnr_mersenne.h"
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch
deleted file mode 100644
index 5280f27bbd8f..000000000000
--- a/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-index b3ab64af4..293eb1f80 100644
---- a/python/setup.py.in
-+++ b/python/setup.py.in
-@@ -27,7 +27,7 @@ import sys
- import os
- import platform
- from distutils.core import setup, Extension
--from distutils import sysconfig
-+import sysconfig
- from distutils.cmd import Command
- 
- __PACKAGE_VERSION__ = "0.2.0"
-@@ -59,8 +59,8 @@ def _init_posix(init):
-     Forces g++ instead of gcc on most systems
-     credits to eric jones (eric@enthought.com) (found at Google Groups)
-     """
--    def wrapper():
--        init()
-+    def wrapper(vars):
-+        init(vars)
- 
-         config_vars = sysconfig.get_config_vars()  # by reference
-         if config_vars["MACHDEP"].startswith("sun"):