From 1c33e521c460dc40899ce7bc919602b842ce27e2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Mar 2023 23:52:45 +0000 Subject: gentoo auto-resync : 05:03:2023 - 23:52:45 --- sci-mathematics/Manifest.gz | Bin 18359 -> 18362 bytes sci-mathematics/boolector/Manifest | 2 +- .../boolector/boolector-3.2.2_p20220110.ebuild | 11 ++-- sci-mathematics/btor2tools/Manifest | 2 +- .../btor2tools-1.0.0_pre20220518-r1.ebuild | 8 +-- sci-mathematics/cvc4/Manifest | 3 +- sci-mathematics/cvc4/cvc4-1.8-r3.ebuild | 63 -------------------- sci-mathematics/cvc4/cvc4-1.8-r4.ebuild | 64 +++++++++++++++++++++ .../cvc4/files/cvc4-1.8-bash-5.2-fix.patch | 44 ++++++++++++++ sci-mathematics/metamath-databases/Manifest | 2 +- .../metamath-databases-20220303.ebuild | 15 ++--- sci-mathematics/smtinterpol/Manifest | 2 +- .../smtinterpol/smtinterpol-2.5_p20211018.ebuild | 12 ++-- 13 files changed, 139 insertions(+), 89 deletions(-) delete mode 100644 sci-mathematics/cvc4/cvc4-1.8-r3.ebuild create mode 100644 sci-mathematics/cvc4/cvc4-1.8-r4.ebuild create mode 100644 sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch (limited to 'sci-mathematics') diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index 80dd5400f54e..653cc7dd68a6 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/boolector/Manifest b/sci-mathematics/boolector/Manifest index 1dfe9a3c7da0..c6641a13e4ad 100644 --- a/sci-mathematics/boolector/Manifest +++ b/sci-mathematics/boolector/Manifest @@ -1,3 +1,3 @@ DIST boolector-3.2.2_p20220110.tar.gz 1567668 BLAKE2B 6816f0434d88c790a27b9afe4c3b63c18a55b14f9f13b092f2940309e34842fe4868bf8d378bad130c4561d25e7d79b356fc27d9422bd42ba1b74ff98be36f72 SHA512 b1b964c155c8227e631025cf6bff69cf54728b1d875c2bd44a5a1ddb2857de2ab8fefc96d194faa5f98015e730b417d46a415ea601740e890df07ad5e50ad656 -EBUILD boolector-3.2.2_p20220110.ebuild 1853 BLAKE2B ce6c51881f4eac8391079374e6f755a87aa671a124df494b8d5e8eae8025d58eeba16aacd5024d09b9c5147809aabc7d79e07fe3d7618b3d9af94d6d158b1542 SHA512 75a526a187f6da54f4c7ef3bba4b34e26c29289086df3c939ff52624145daddd1b192cdb3645282c816f0fa466e32c3ad0f92ce5da546062ed7a5a605c400952 +EBUILD boolector-3.2.2_p20220110.ebuild 1900 BLAKE2B 2a99565257a782a5c198ef8661f8c51aa734ef3987213db1c4010ebe5f083a5f9f71525d66217ec32cb1edd4ef34d89bc386a1d21b91c277336493368ffdd3d7 SHA512 c588c5c8e821d6dd62c77c1f9c291761d9c8d30d415e7634a8fb64460e40a2abe9eb03e873c309218fc34e4105c6b597f7e09c77f0faa51afc10b68b9f754d46 MISC metadata.xml 1245 BLAKE2B a04e1e5a6af857100b8b569f57f4d2610593e9eb741513e4e6405a8fa9828471b92aaa1ad57a3163dc2f251b5664493692f92477b7191621ff8fd76eed9f57e7 SHA512 81257f7be3b21bf10caad654d5747ef2d978c0df5a05049b890420e2d170b7a4fa06151da0604a8b1b6e7daf2fb01344003c9243205a94b4040c580beb414836 diff --git a/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild b/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild index 90a1a2edac2b..0e4ea8d6d1b5 100644 --- a/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild +++ b/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild @@ -3,7 +3,8 @@ EAPI=8 -H=13a8a06d561041cafcaf5458e404c1ec354b2841 +[[ ${PV} == *_p20220110 ]] && COMMIT=13a8a06d561041cafcaf5458e404c1ec354b2841 + PYTHON_COMPAT=( python3_{9..11} ) inherit python-single-r1 cmake @@ -12,13 +13,13 @@ DESCRIPTION="Fast SMT solver for bit-vectors, arrays and uninterpreted functions HOMEPAGE="https://boolector.github.io/ https://github.com/Boolector/boolector/" -if [[ "${PV}" == *9999* ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/Boolector/${PN}.git" else - SRC_URI="https://github.com/Boolector/${PN}/archive/${H}.tar.gz + SRC_URI="https://github.com/Boolector/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${H} + S="${WORKDIR}"/${PN}-${COMMIT} KEYWORDS="~amd64 ~x86" fi @@ -47,7 +48,7 @@ pkg_setup() { } src_configure() { - local mycmakeargs=( + local -a mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DBtor2Tools_LIBRARIES=/usr/$(get_libdir)/libbtor2parser.so -DUSE_PYTHON2=OFF diff --git a/sci-mathematics/btor2tools/Manifest b/sci-mathematics/btor2tools/Manifest index e0ed4e1729ea..73dde492fd6c 100644 --- a/sci-mathematics/btor2tools/Manifest +++ b/sci-mathematics/btor2tools/Manifest @@ -1,4 +1,4 @@ AUX btor2tools-1.0.0_pre20220518-cmake-clfags.patch 551 BLAKE2B 8cc8c427a2ec7defc4bd7f251b2a2a6484bc321b0f0d88a7099e8a69963cfbf6b69d13dbce4f54874d8138ec01ae870752a947a01c93c3cf996456c546ce012e SHA512 a6c446440405ab44b9bffb8316d170782241d77334c5837820ee0ea1e6da5ff97121b966a49af9c15e8e0e2a184ae3781166eb9c0ba07c4319dd92fed105ae2d DIST btor2tools-1.0.0_pre20220518.tar.gz 87420 BLAKE2B df8ddc8f286c32c580a8feaf0c7e90dff113d2b0303e3da0a378f2906cd34134ea91707cd40c95c38782990bf4d815416b3a566680f4d6668ddca46321ae530a SHA512 96e17327de311b3d16e086031038a8248431d0dda75b83ce137d6526a096b69fc062290f92ec5b58fffb56aa25437835f97a96bd15f0044d4d52263bf386d928 -EBUILD btor2tools-1.0.0_pre20220518-r1.ebuild 738 BLAKE2B 34983b33e56d2fc4494f074b03f7c4ac3ce24d82781e5a0193e8241431f0884e4f4e7bede71e4f26364f009ba0b096fc8f08ea8f9e1295c672d6ade77bbebf88 SHA512 af0b1e3d2b61cefc2006c17f15d722a65b2689bae14a914d50ba62d5f9b234605b5eb82b572732799a96c77d61d6237ec06e1b3ab0010857d8cf47912f938fd3 +EBUILD btor2tools-1.0.0_pre20220518-r1.ebuild 783 BLAKE2B ee38ed21c306323f3876201094b4d27de0133a3bc183ff95876851615428d92c66747db4bacc702641d394dcf1c8b5905726324454a8adde8d7c3ce1fb58b1bf SHA512 10d381a2aabd2d015caaf84b04b892bff00b997bc14fa537b112ae9ce56efc3d8a0670c781a611342a3ef736f5a6a795fc6fa0d3db1d9947789e74b82214d11d MISC metadata.xml 437 BLAKE2B 93f1e3a98b8dd3edd95de3bd8f830427a9e05dcfc73690899ed16ec49be25bfd524d86fcaa9735d15c22515b98d13ded8a95c7a39e4970e3035c72e4cbe7d544 SHA512 39b7bd39e597f6d3086358738cb2d668f0317af3a8674eb4c032f59c64de0ceada799900bd193f244f049f51e1a91dcd9bb4474db39ac88967086206f3090a62 diff --git a/sci-mathematics/btor2tools/btor2tools-1.0.0_pre20220518-r1.ebuild b/sci-mathematics/btor2tools/btor2tools-1.0.0_pre20220518-r1.ebuild index e967b953fb59..58780bf5c440 100644 --- a/sci-mathematics/btor2tools/btor2tools-1.0.0_pre20220518-r1.ebuild +++ b/sci-mathematics/btor2tools/btor2tools-1.0.0_pre20220518-r1.ebuild @@ -3,20 +3,20 @@ EAPI=8 -H=b8456dda4780789e882f5791eb486f295ade4da4 +[[ ${PV} == *_pre20220518 ]] && COMMIT=b8456dda4780789e882f5791eb486f295ade4da4 inherit cmake DESCRIPTION="Generic parser and tools for the BTOR2 format" HOMEPAGE="https://github.com/Boolector/btor2tools/" -if [[ "${PV}" == *9999* ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/Boolector/${PN}.git" else - SRC_URI="https://github.com/Boolector/${PN}/archive/${H}.tar.gz + SRC_URI="https://github.com/Boolector/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${H} + S="${WORKDIR}"/${PN}-${COMMIT} KEYWORDS="~amd64 ~x86" fi diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest index c3963c1a7fdf..bba4b26334ef 100644 --- a/sci-mathematics/cvc4/Manifest +++ b/sci-mathematics/cvc4/Manifest @@ -1,5 +1,6 @@ +AUX cvc4-1.8-bash-5.2-fix.patch 1092 BLAKE2B 3a637ffb59bcfd6af253d2c7b2964025f66c7bb074e2bfecb21b26399b9582fa3b4cc1c89b7a773bd37f39fcfa79d7cb8f9535fd724538b6cede38c3e964e242 SHA512 a0c51df4013bae3b5990972f39edb9cddbf6f627dec4533b697546e27056b88aa54aa2714e97a6cf8ba8262f86feac0cbce47192527928e652ae7ff2e27dc777 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.8.tar.gz 7554297 BLAKE2B f4d2b223ba2c01ef745520d8874381a1873358fbc7eca12559656512ffeefccec4eca3d73a26debf34110ca14a3bccf35ca87e2a49575b8b67484bed79df081c SHA512 d6b0153b0f5c4e615c995a8eecfbfd783cfc1004c5134c6880230044081c71d638fee39cceb987eb8d72e91b2b6596b184dc0daacec8880cfc176c6dee8aa445 -EBUILD cvc4-1.8-r3.ebuild 1385 BLAKE2B bef7dc7aa982a1b123c6ada32443a74fdd967298b1bdb4a09cfde8fa322b8fd748293f9927f103d75ba2172065f95a19909f8d091bc68f0181d7de76e8c6ed34 SHA512 6dc1dcf5e3b9715abf2912f1fc2d61ffeff615a4360f046626b1e4efbbba04d877d32fba5365c8d8209661578d630af48b7d14b4a49adc3ac12c1021ffc9d639 +EBUILD cvc4-1.8-r4.ebuild 1424 BLAKE2B 6987f488b68bd1440f8eac18ccd4b4d7c78fd08c8faa58012a8a63d38567544767be5b49a21724413f5c9dfe07eaf46c1a88415e30deee3dd7986d2c2dded03c SHA512 b4003007c3b5151d39a9d58a6e921e1955e76db37c31bcb45e5eb7d43eebb04fe30c260136dd36c14702b978ba13bae24570bdb414524ac53c3e6d5abeb75988 MISC metadata.xml 840 BLAKE2B d452e6a81280e47283c6ff9fa8a800d89c39920e95416e6b25a3bd55663b8ada050b6c7d21b65053ed2e94ae6affb570946fe699bc6efebb26dfcd06dcd0c184 SHA512 603da6ccd58f6d90f8738047c9f93d2c32583242711355fa619f8acaf8694f0cc1e22d41592914a154cc4cfa31b0ab7308e8584c8951bc78a3bdf8e5f130cb04 diff --git a/sci-mathematics/cvc4/cvc4-1.8-r3.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r3.ebuild deleted file mode 100644 index 276bdf289c12..000000000000 --- a/sci-mathematics/cvc4/cvc4-1.8-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR=emake -PYTHON_COMPAT=( python3_{9..11} ) -inherit cmake python-any-r1 - -DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems" -HOMEPAGE="https://cvc4.github.io/" -SRC_URI="https://github.com/CVC4/CVC4-archived/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+cln proofs readline +statistics" - -RDEPEND="dev-libs/antlr-c - dev-java/antlr:3 - dev-libs/boost - readline? ( sys-libs/readline:0= ) - cln? ( sci-libs/cln ) - !cln? ( dev-libs/gmp:= )" -DEPEND="${RDEPEND}" -BDEPEND="$(python_gen_any_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ') -" - -S="${WORKDIR}"/${PN^^}-archived-${PV} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-toml.patch -) - -python_check_deps() { - python_has_version "dev-python/tomli[${PYTHON_USEDEP}]" -} - -src_configure() { - local mycmakeargs=( - -DANTLR_BINARY=/usr/bin/antlr3 - -DENABLE_GPL=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)" - ) - cmake_src_configure -} - -src_test() { - emake -C "${BUILD_DIR}" \ - systemtests - cmake_src_test -} - -src_install() { - cmake_src_install - mv "${D}"/usr/{lib,$(get_libdir)} -} diff --git a/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild new file mode 100644 index 000000000000..d62729a94aa8 --- /dev/null +++ b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR=emake +PYTHON_COMPAT=( python3_{9..11} ) +inherit cmake python-any-r1 + +DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems" +HOMEPAGE="https://cvc4.github.io/" +SRC_URI="https://github.com/CVC4/CVC4-archived/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+cln proofs readline +statistics" + +RDEPEND="dev-libs/antlr-c + dev-java/antlr:3 + dev-libs/boost + readline? ( sys-libs/readline:0= ) + cln? ( sci-libs/cln ) + !cln? ( dev-libs/gmp:= )" +DEPEND="${RDEPEND}" +BDEPEND="$(python_gen_any_dep ' + dev-python/tomli[${PYTHON_USEDEP}] + ') +" + +S="${WORKDIR}"/${PN^^}-archived-${PV} + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-toml.patch + "${FILESDIR}"/${P}-bash-5.2-fix.patch +) + +python_check_deps() { + python_has_version "dev-python/tomli[${PYTHON_USEDEP}]" +} + +src_configure() { + local mycmakeargs=( + -DANTLR_BINARY=/usr/bin/antlr3 + -DENABLE_GPL=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)" + ) + cmake_src_configure +} + +src_test() { + emake -C "${BUILD_DIR}" \ + systemtests + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${D}"/usr/{lib,$(get_libdir)} +} diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch b/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch new file mode 100644 index 000000000000..54398da72555 --- /dev/null +++ b/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch @@ -0,0 +1,44 @@ +Description: Fix FTBFS with bash 5.2 +Author: Jerry James +Forwarded: no +Last-Update: 2022-10-17 +Bug: https://bugs.gentoo.org/883273 +See: https://salsa.debian.org/science-team/cvc4/-/merge_requests/2/diffs?commit_id=05ca9eee24e279ddfbaebea7393b4303200141ad +--- + +diff --git a/src/expr/mkexpr b/src/expr/mkexpr +index c5f12f487..642a7ff0d 100755 +--- a/src/expr/mkexpr ++++ b/src/expr/mkexpr +@@ -16,6 +16,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +diff --git a/src/expr/mkkind b/src/expr/mkkind +index fbf37eff4..77a8fc7e5 100755 +--- a/src/expr/mkkind ++++ b/src/expr/mkkind +@@ -15,6 +15,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +diff --git a/src/expr/mkmetakind b/src/expr/mkmetakind +index e2a733ec8..935040bed 100755 +--- a/src/expr/mkmetakind ++++ b/src/expr/mkmetakind +@@ -18,6 +18,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + cat <