gentoo resync : 22.01.2021

3 files changed, 6 insertions, 29 deletions

diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 4cfc106d2631..1c63bfc667ba 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,6 +1,4 @@
 AUX cvc4-1.7-gentoo.patch 1665 BLAKE2B db98e67fb3b152e0c78019b21b32c99d06377f1b1c1cc6a3ac2edea5e27d6f8ba082fc209c3694e1144a94d9d3b1897418af250252ff40a26e521bbf72d7da0f SHA512 b6b7af8c48c0398375343c8fa72f3e15d8f9031848cf94e6e2880f04b5e8d695691dcf67b84daa1706464289f7db0300046af4c93adcf278f7951eccc734af89
-DIST cvc4-1.6.tar.gz 7815893 BLAKE2B 626e0dd49f911384e64d7e8ecf635aa12dad32830b2032bdcb96afd1a17c3566f56df51f75e9193cf365b562855733d0ea4ff3311ac99fc86e928a956298d2ad SHA512 0887b3f74a4b9e51e634591c7cf39d730110ca5d930149bab4816a49e383eeea8ccadf8474d22f5529cc03ddd045acacf8a2b92434b882adf352f4de4075fcd4
 DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
-EBUILD cvc4-1.6.ebuild 552 BLAKE2B 56a743e61a330551b7d17598019747a1bda37872f0e6f5d9e677caa07e01d5f4182e3cef7252ffd04050667b43fec563d548694188444355f5476442232664db SHA512 f8a8cd128057964e7db3749c4ae32575dfbe9b44414d8d7dc1e05aa8ee23ec6feeb624064fa34c9b21675507541b830b29cb14c536bd8121e428c6fbf5df29ba
-EBUILD cvc4-1.7.ebuild 1344 BLAKE2B b1c187f77296c5bba332a4795b990fb3df340a10c9acc9de6397e64b883b48e56ba3d0b42fef398cdfa8151799eeb2a59fae644466a2a605de6183cf84844c85 SHA512 34b1d046465f6cac1e8e098c743f79042fff0ad0eb051b68da0a0f6ca78bb27cf6ddbfe6ce8b1ba94eb779fc3faf69a7c79a42f3ddff34167ef7b28acd096fb1
+EBUILD cvc4-1.7-r1.ebuild 1418 BLAKE2B 6e93c224a331492380f8895ddcd0747be19d85cf720890a14a19d6783933a54bf59a9bc4c4fccf792aabca944071e19821d359c1ba5c941d26432b46756013a6 SHA512 2bd6c813ae75ebf1f0387f74f0b49f1b11be8b25119d774f19384561aa667647155769970ea55d7b75ba0905884634ac4635ec161ed8e82199540e9efe0fa47e
 MISC metadata.xml 801 BLAKE2B a8dffba2bb9a740412d4193911d1ab118336993d12d6d7e42c758af438d297baf6798e2ce9c6aa9be4282678e366087d54b8d3f8c46b43be6d73bcf421ee318a SHA512 d90e35c93e5defc5599f5e9d9b88a757a4a845574684270f1aab0cb8194c50b31fa3135ea221f63d0d71f867619c039f32cfb46b63fa370289e8eb5205d3b25d
diff --git a/sci-mathematics/cvc4/cvc4-1.6.ebuild b/sci-mathematics/cvc4/cvc4-1.6.ebuild
deleted file mode 100644
index d77a2ea6aaa1..000000000000
--- a/sci-mathematics/cvc4/cvc4-1.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems"
-HOMEPAGE="http://cvc4.cs.stanford.edu/web/"
-SRC_URI="http://cvc4.cs.stanford.edu/downloads/builds/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cln"
-
-RDEPEND="dev-libs/antlr-c
-	dev-libs/boost
-	cln? ( sci-libs/cln )
-	!cln? ( dev-libs/gmp:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf --enable-gpl \
-		$(use_with cln)
-}
diff --git a/sci-mathematics/cvc4/cvc4-1.7.ebuild b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
index 09aab161f76d..a35698d4920a 100644
--- a/sci-mathematics/cvc4/cvc4-1.7.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1 cmake-utils
 
 DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems"
 HOMEPAGE="http://cvc4.cs.stanford.edu/web/"
@@ -21,6 +23,7 @@ RDEPEND="dev-libs/antlr-c
 	cln? ( sci-libs/cln )
 	!cln? ( dev-libs/gmp:= )"
 DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 S="${WORKDIR}"/CVC4-${PV}