gentoo auto-resync : 12:11:2022 - 03:31:11

3 files changed, 54 insertions, 4 deletions

diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 9dad15582b38..c69a0bea225c 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,7 +1,8 @@
 AUX cvc4-1.7-gentoo.patch 1665 BLAKE2B db98e67fb3b152e0c78019b21b32c99d06377f1b1c1cc6a3ac2edea5e27d6f8ba082fc209c3694e1144a94d9d3b1897418af250252ff40a26e521bbf72d7da0f SHA512 b6b7af8c48c0398375343c8fa72f3e15d8f9031848cf94e6e2880f04b5e8d695691dcf67b84daa1706464289f7db0300046af4c93adcf278f7951eccc734af89
 AUX cvc4-1.8-gentoo.patch 1983 BLAKE2B bd9e7f8b442e151fdc27b45866ed4374ffcbeb5d37edd192cda13ddb3ca547b6e29cfea7641973636a184c14a649bb2131beb4e9c9b90f329dfd0cec8aab0bf0 SHA512 3793c9e318ffb266e505627ac7ea3cbf6a7ba3837a419967b873b72b71bc2bb1a45ae9fd61abaa95af02802267823d8affc1faf077f8ee16eef00ed7715c2187
+AUX cvc4-1.8-toml.patch 1329 BLAKE2B 39def94cd357381b277c5d5e8b39edc5d9e48ea8ecccf190cea13995b4da54a896d9c0f8cf714b8c74425da1c8269fd1cddbef2619a4f59cbc4090bc31ec14a4 SHA512 ca999ee52e8e91259772cb0a4be7ca3149cf46196b599fb8f23301a5b4a4c5154b7419706ba9dd7f279f003692b10fcf406a4159542807baca85683595401479
 DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
 DIST cvc4-1.8.tar.gz 7554297 BLAKE2B f4d2b223ba2c01ef745520d8874381a1873358fbc7eca12559656512ffeefccec4eca3d73a26debf34110ca14a3bccf35ca87e2a49575b8b67484bed79df081c SHA512 d6b0153b0f5c4e615c995a8eecfbfd783cfc1004c5134c6880230044081c71d638fee39cceb987eb8d72e91b2b6596b184dc0daacec8880cfc176c6dee8aa445
 EBUILD cvc4-1.7-r1.ebuild 1379 BLAKE2B 7c19d2a0bda3de27f1fe34619bb380b9e1fd019b8ecd00d211bd8c377d8455a06f283b1494f2361cd765426366def94371192f4ae265c60df211c46b82387646 SHA512 072f641ba31457f411cf01959017ae743eb47a44a79007b9505c44361221369c1f9a651c23397ce13e7f32c01755b160410ab0b1e1b2a54cf7436c3089925e1d
-EBUILD cvc4-1.8-r1.ebuild 1351 BLAKE2B c539a1d0423a90f2b169d66bfdc21ceedbf6b980e8935c905b7be7a67187e9ae0e02f9a3a53c2cf1c76a90ac3b9e0f2c00ee47552a54c5b02266e6c36d85a72e SHA512 fe1c697a4492e4f73b4755d282c21b5aef55ad28ed0989224f9d13149141138825716137afd35b336abf27d8398a5ba88cd44aae8397913220264a7d595f9f74
+EBUILD cvc4-1.8-r2.ebuild 1385 BLAKE2B 3644466818eee8930321823ed8fd68de4200cf261ff5dd6a24021f9695739669a26da7c915de8861d340ba36439eb3ac1314b88fbccbd5badfa84284cd5295d1 SHA512 7526613a0a0b5f43247cbb7a5a1cecc3947c3ae37c064d3e06356767c11cc3db4ad07fbfb506af2abc548314c9f2099dd296240c6e5cab1508298ee477210865
 MISC metadata.xml 813 BLAKE2B fb7b8a913282ec4634c2d0e1456b73285857e6f7d1acfa4d0450f8718485bfb67d36195a21e51daf662c9aa84205ec071ecc429e0519d02008e1ff68f6b83a04 SHA512 8b63e5250d0fb76f5fabc5ba3973b34eb740cc65d1ab66ec1072e407e9b4806ecf3679e0511d6912a866cc367069dfdeaf2a32f3938884fdedecbd16c58b268a
diff --git a/sci-mathematics/cvc4/cvc4-1.8-r1.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r2.ebuild
index c013d2a2ed33..5757f85d54c2 100644
--- a/sci-mathematics/cvc4/cvc4-1.8-r1.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.8-r2.ebuild
@@ -24,16 +24,19 @@ RDEPEND="dev-libs/antlr-c
 	!cln? ( dev-libs/gmp:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="$(python_gen_any_dep '
-		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
 	')
 "
 
 S="${WORKDIR}"/${PN^^}-archived-${PV}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-toml.patch
+)
 
 python_check_deps() {
-	python_has_version "dev-python/toml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/tomli[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-toml.patch b/sci-mathematics/cvc4/files/cvc4-1.8-toml.patch
new file mode 100644
index 000000000000..f2ac73bf25c3
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-toml.patch
@@ -0,0 +1,46 @@
+--- a/src/options/CMakeLists.txt	2022-11-11 23:12:59.874087267 +0100
++++ b/src/options/CMakeLists.txt	2022-11-11 23:13:11.974894643 +0100
+@@ -1,17 +1,3 @@
+-# Check if the toml Python module is installed.
+-execute_process(
+-  COMMAND
+-  ${PYTHON_EXECUTABLE} -c "import toml"
+-  RESULT_VARIABLE
+-    RET_TOML
+-  ERROR_QUIET
+-)
+-
+-if(RET_TOML)
+-    message(FATAL_ERROR
+-      "Could not find Python module toml. Install via `pip install toml'.")
+-endif()
+-
+ libcvc4_add_sources(
+   base_handlers.h
+   decision_weight.h
+--- a/src/options/mkoptions.py	2022-11-11 23:16:22.577858012 +0100
++++ b/src/options/mkoptions.py	2022-11-11 23:23:12.014320054 +0100
+@@ -46,7 +46,11 @@
+ import re
+ import sys
+ import textwrap
+-import toml
++
++if sys.version_info >= (3, 11):
++    import tomllib
++else:
++    import tomli as tomllib
+ 
+ ### Allowed attributes for module/option/alias
+ 
+@@ -1309,7 +1313,9 @@
+     # Parse files, check attributes and create module/option objects
+     modules = []
+     for filename in filenames:
+-        module = parse_module(filename, toml.load(filename))
++        with open(filename, "rb") as f:
++            d1 = tomllib.load(f)
++        module = parse_module(filename, d1)
+ 
+         # Check if long options are valid and unique.  First populate
+         # g_long_cache with option.long and --no- alternatives if