gentoo resync : 20.03.2022

4 files changed, 25 insertions, 11 deletions

diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index dbbd394428e4..3ea7c27764bb 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,7 +1,7 @@
 AUX cvc4-1.7-gentoo.patch 1665 BLAKE2B db98e67fb3b152e0c78019b21b32c99d06377f1b1c1cc6a3ac2edea5e27d6f8ba082fc209c3694e1144a94d9d3b1897418af250252ff40a26e521bbf72d7da0f SHA512 b6b7af8c48c0398375343c8fa72f3e15d8f9031848cf94e6e2880f04b5e8d695691dcf67b84daa1706464289f7db0300046af4c93adcf278f7951eccc734af89
-AUX cvc4-1.8-gentoo.patch 1655 BLAKE2B 019d1cd6cc1b95042f4a04470c659a0e6b14e6e4d45eee16187feed1ee7664564e29a230b6d859ad70a3f2e442a44cb1ae296617e29cd894106a10e290490ee3 SHA512 1cf38e1d817f9347308dd982c6ff1f6344d654fda69fc6a2313cf6c9fbeb331cc168e002a1f9731c5481ed063aa5feb360014d60fd0e1cc55a6aeeea44ac13c0
+AUX cvc4-1.8-gentoo.patch 1983 BLAKE2B bd9e7f8b442e151fdc27b45866ed4374ffcbeb5d37edd192cda13ddb3ca547b6e29cfea7641973636a184c14a649bb2131beb4e9c9b90f329dfd0cec8aab0bf0 SHA512 3793c9e318ffb266e505627ac7ea3cbf6a7ba3837a419967b873b72b71bc2bb1a45ae9fd61abaa95af02802267823d8affc1faf077f8ee16eef00ed7715c2187
 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 c806041f0941649a8108f6148ad2226647721a9396e5d8d889649e3185ba229aaa405ab1a22409aa4d1b7a21142213646df734e24bcec26b5899bbd114d92aff SHA512 d4ad9b8b61f48feb744d3ea5f6964112e63e9beba1f156b997bcde57a2aed295a54e3e93444d9570d997979a81b3fd74cae5f4fd335df201b504ba2ab9b67469
-EBUILD cvc4-1.8.ebuild 1294 BLAKE2B b582be8424ee773310d4decdf2a03f7144037a80e117584dd9961b4a4548119cd553ddc30ea7ab5beaae3e6ec37b062993931a2d7c48c15b230c9b9efd0fda97 SHA512 0192be6902b0482a229581f8a7fb33ffe884ef101021959cf4f2cc98acec1bb344a21f18f57d43150681b058c0a83c0c7252e5a238c51315c3617a3194cc8ddf
+EBUILD cvc4-1.7-r1.ebuild 1379 BLAKE2B 7c19d2a0bda3de27f1fe34619bb380b9e1fd019b8ecd00d211bd8c377d8455a06f283b1494f2361cd765426366def94371192f4ae265c60df211c46b82387646 SHA512 072f641ba31457f411cf01959017ae743eb47a44a79007b9505c44361221369c1f9a651c23397ce13e7f32c01755b160410ab0b1e1b2a54cf7436c3089925e1d
+EBUILD cvc4-1.8-r1.ebuild 1344 BLAKE2B fb5fa0f1176a038b7c6b9a00d0116abd2ae6f831d672de66beba2e5b83bb7713bdb0c94124e1d44cf2ecad41fb9055c1a10cf6f98c253380d4ead1173bd64e96 SHA512 38b6e0a1ee2d3b7c7d828dac4d7a3f6436881e27daf897fbbb715fbcc7de50e96d3b5585829aa3088aaac8464cd4e13b6afec8a4b37e56772f734e58d1a647be
 MISC metadata.xml 802 BLAKE2B 97e1799f8a4e57d40e191c1ba30a762458a5bdf5e372fd406aa8b207f8ea8a39c178a2963d748d0cfd3123fcd18d3894f5ae5913edf67bb3cbb1c2b25528e5c1 SHA512 1373b776ce6f7689dc6c744c2b1e573bbd932c33b5517e54813caa4edde8f68d5670af316b5908dbf69c775c94fb932a12eb8c5ac39310a10c0e2aefbbda6f42
diff --git a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
index 36e9f4689a67..a2f98aac04cc 100644
--- a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake python-any-r1
 
 DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems"
diff --git a/sci-mathematics/cvc4/cvc4-1.8.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r1.ebuild
index 347dbda0a248..ed74ecc20fba 100644
--- a/sci-mathematics/cvc4/cvc4-1.8.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.8-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-any-r1
 
 DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/CVC4/CVC4-archived/archive/refs/tags/${PV}.tar.gz ->
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cln proofs readline replay +statistics"
+IUSE="+cln proofs readline +statistics"
 
 RDEPEND="dev-libs/antlr-c
 	dev-java/antlr:3
@@ -23,22 +23,27 @@ RDEPEND="dev-libs/antlr-c
 	cln? ( sci-libs/cln )
 	!cln? ( dev-libs/gmp:= )"
 DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="$(python_gen_any_dep '
+		dev-python/toml[${PYTHON_USEDEP}]
+	')
+"
 
 S="${WORKDIR}"/${PN^^}-archived-${PV}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
+python_check_deps() {
+	has_version "dev-python/toml[${PYTHON_USEDEP}]"
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DANTLR_BINARY=/usr/bin/antlr3
 		-DENABLE_GPL=ON
-		-DENABLE_OPTIMIZED=ON
 		-DUSE_CLN="$(usex cln ON OFF)"
 		-DUSE_READLINE="$(usex readline ON OFF)"
 		-DENABLE_STATISTICS="$(usex statistics ON OFF)"
 		-DENABLE_PROOFS="$(usex proofs ON OFF)"
-		-DENABLE_REPLAY="$(usex replay ON OFF)"
 	)
 	cmake_src_configure
 }
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
index 372bea03fb72..64cf5bd771b2 100644
--- a/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
@@ -1,5 +1,14 @@
 --- a/CMakeLists.txt	2019-07-09 14:47:12.552425226 +0200
 +++ b/CMakeLists.txt	2019-07-09 14:50:02.595001358 +0200
+@@ -83,7 +83,7 @@
+ #-----------------------------------------------------------------------------#
+ 
+ set(INCLUDE_INSTALL_DIR include)
+-set(LIBRARY_INSTALL_DIR lib)
++set(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
+ set(RUNTIME_INSTALL_DIR bin)
+ 
+ #-----------------------------------------------------------------------------#
 @@ -143,7 +143,7 @@
  
  # Note: Module CodeCoverage requires the name of the debug build to conform