diff options
Diffstat (limited to 'sci-mathematics')
175 files changed, 2777 insertions, 2161 deletions
diff --git a/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild b/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild index 887469dd15eb..fa3572550200 100644 --- a/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild +++ b/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,10 @@ RDEPEND=" dev-libs/gmp:0=[cxx(+)]" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-1.3.2-gold.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.3.2-gold.patch + "${FILESDIR}"/${P}-gcc13.patch +) src_prepare() { default diff --git a/sci-mathematics/4ti2/files/4ti2-1.6.7-gcc13.patch b/sci-mathematics/4ti2/files/4ti2-1.6.7-gcc13.patch new file mode 100644 index 000000000000..32f7c1a42b34 --- /dev/null +++ b/sci-mathematics/4ti2/files/4ti2-1.6.7-gcc13.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/895420 +https://github.com/4ti2/4ti2/commit/c024db44f43593fbfe9d8d51f035db7a605d1fa6 + +From c024db44f43593fbfe9d8d51f035db7a605d1fa6 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <jengelh@inai.de> +Date: Tue, 28 Mar 2023 00:33:03 +0200 +Subject: [PATCH] build: resolve missing includes showing on gcc-13 + +../../src/zsolve/VectorArrayAPI.hpp: In function 'void _4ti2_zsolve_::convert(const T1&, T2&) [with T1 = long int; T2 = int]': +../../src/zsolve/VectorArrayAPI.hpp:79:14: error: 'INT32_MIN' was not declared in this scope; did you mean 'INT_MIN'? +--- a/src/zsolve/VectorArrayAPI.hpp ++++ b/src/zsolve/VectorArrayAPI.hpp +@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + #include "zsolve/VectorArray.hpp" + #include "zsolve/Exception.h" + #include <fstream> ++#include <cstdint> + #include <cstdlib> + + namespace _4ti2_zsolve_ { + diff --git a/sci-mathematics/4ti2/metadata.xml b/sci-mathematics/4ti2/metadata.xml index 94a9142e48c1..d9dd24cced11 100644 --- a/sci-mathematics/4ti2/metadata.xml +++ b/sci-mathematics/4ti2/metadata.xml @@ -9,4 +9,7 @@ 4ti2 is a software package for algebraic, geometric and combinatorial problems on linear spaces and for toric ideals too. </longdescription> + <upstream> + <remote-id type="github">4ti2/4ti2</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-mathematics/abc/Manifest b/sci-mathematics/abc/Manifest new file mode 100644 index 000000000000..641321f549e5 --- /dev/null +++ b/sci-mathematics/abc/Manifest @@ -0,0 +1 @@ +DIST abc-0_p20230313.tar.gz 6082725 BLAKE2B 3647e813d04545eba68faae58ce8f36747e0ebf13befbaaca646c783acdf9994209a5c58beadc20b1b18a2c77a64ac589e899595e3f1374df9e363a3416271a6 SHA512 a3512b280cbac747178c6e3decc785aff5eb4130a95eea2f3bab6d61a41c89758116b0d94cbbbb4d4060fbfbaa0fa1638a9e211f3f2677910bbfe8e8d629e7ee diff --git a/sci-mathematics/abc/abc-0_p20230313.ebuild b/sci-mathematics/abc/abc-0_p20230313.ebuild new file mode 100644 index 000000000000..2b2acf6d5866 --- /dev/null +++ b/sci-mathematics/abc/abc-0_p20230313.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="System for sequential logic synthesis and formal verification" +HOMEPAGE="https://people.eecs.berkeley.edu/~alanmi/abc/ + https://github.com/berkeley-abc/abc/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/berkeley-abc/abc.git" +elif [[ ${PV} == *_p20230313 ]] ; then + COMMIT=a5f4841486d4a491913943c5b92167a9e988abac + SRC_URI="https://github.com/berkeley-abc/abc/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}"/abc-${COMMIT} + KEYWORDS="~amd64 ~x86" +else + die "unsupported abc version, given: ${PV}" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="+readline +threads" + +RDEPEND="readline? ( sys-libs/readline:= )" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/abc-0_p20230313-libabc.patch ) + +src_compile() { + local -a mymakeargs=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + LD="$(tc-getCXX)" + ABC_MAKE_VERBOSE=1 + ABC_USE_NO_CUDD=1 + ABC_USE_PIC=1 + $(usex readline "ABC_USE_READLINE=1" "ABC_USE_NO_READLINE=1") + $(usex threads "ABC_USE_PTHREADS=1" "ABC_USE_NO_PTHREADS=1") + ) + emake "${mymakeargs[@]}" libabc.so + emake "${mymakeargs[@]}" abc +} + +src_install() { + exeinto /usr/bin + doexe abc + + newlib.so libabc.so libabc.so.0 + dosym -r /usr/$(get_libdir)/libabc.so.0 /usr/$(get_libdir)/libabc.so + + dodoc README.md readmeaig +} diff --git a/sci-mathematics/abc/abc-9999.ebuild b/sci-mathematics/abc/abc-9999.ebuild new file mode 100644 index 000000000000..2b2acf6d5866 --- /dev/null +++ b/sci-mathematics/abc/abc-9999.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="System for sequential logic synthesis and formal verification" +HOMEPAGE="https://people.eecs.berkeley.edu/~alanmi/abc/ + https://github.com/berkeley-abc/abc/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/berkeley-abc/abc.git" +elif [[ ${PV} == *_p20230313 ]] ; then + COMMIT=a5f4841486d4a491913943c5b92167a9e988abac + SRC_URI="https://github.com/berkeley-abc/abc/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}"/abc-${COMMIT} + KEYWORDS="~amd64 ~x86" +else + die "unsupported abc version, given: ${PV}" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="+readline +threads" + +RDEPEND="readline? ( sys-libs/readline:= )" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/abc-0_p20230313-libabc.patch ) + +src_compile() { + local -a mymakeargs=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + LD="$(tc-getCXX)" + ABC_MAKE_VERBOSE=1 + ABC_USE_NO_CUDD=1 + ABC_USE_PIC=1 + $(usex readline "ABC_USE_READLINE=1" "ABC_USE_NO_READLINE=1") + $(usex threads "ABC_USE_PTHREADS=1" "ABC_USE_NO_PTHREADS=1") + ) + emake "${mymakeargs[@]}" libabc.so + emake "${mymakeargs[@]}" abc +} + +src_install() { + exeinto /usr/bin + doexe abc + + newlib.so libabc.so libabc.so.0 + dosym -r /usr/$(get_libdir)/libabc.so.0 /usr/$(get_libdir)/libabc.so + + dodoc README.md readmeaig +} diff --git a/sci-mathematics/abc/files/abc-0_p20230313-libabc.patch b/sci-mathematics/abc/files/abc-0_p20230313-libabc.patch new file mode 100644 index 000000000000..57691dc18775 --- /dev/null +++ b/sci-mathematics/abc/files/abc-0_p20230313-libabc.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -221,7 +221,7 @@ lib$(PROG).a: $(LIBOBJ) + + lib$(PROG).so: $(LIBOBJ) + @echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@) +- $(VERBOSE)$(CXX) -shared -o $@ $^ $(LIBS) ++ $(VERBOSE)$(CXX) -shared -o $@ $^ $(LDFLAGS) -Wl,-soname,lib$(PROG).so.0 $(LIBS) + + docs: + @echo "$(MSG_PREFIX)\`\` Building documentation." $(notdir $@) diff --git a/sci-mathematics/abc/metadata.xml b/sci-mathematics/abc/metadata.xml new file mode 100644 index 000000000000..dc9439f27baf --- /dev/null +++ b/sci-mathematics/abc/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>sci-mathematics@gentoo.org</email> + <name>Gentoo Mathematics Project</name> + </maintainer> + <longdescription> + ABC is a growing software system for synthesis and verification of binary + sequential logic circuits appearing in synchronous hardware designs. ABC + combines scalable logic optimization based on And-Inverter Graphs (AIGs), + optimal-delay DAG-based technology mapping for look-up tables and standard + cells, and innovative algorithms for sequential synthesis and verification. + </longdescription> + <upstream> + <bugs-to>https://github.com/berkeley-abc/abc/issues/</bugs-to> + <remote-id type="github">berkeley-abc/abc</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-mathematics/acl2/acl2-8.5.ebuild b/sci-mathematics/acl2/acl2-8.5-r1.ebuild index c681f996e4fd..19e1ea1d83f7 100644 --- a/sci-mathematics/acl2/acl2-8.5.ebuild +++ b/sci-mathematics/acl2/acl2-8.5-r1.ebuild @@ -22,7 +22,7 @@ IUSE="doc emacs" REQUIRED_USE="emacs? ( doc )" RDEPEND=" - dev-lisp/sbcl + dev-lisp/sbcl:= emacs? ( >=app-editors/emacs-25:* ) " BDEPEND=" diff --git a/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild b/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild index b43f1ec4fc55..bf77f3595ce5 100644 --- a/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild +++ b/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit elisp-common distutils-r1 @@ -28,7 +28,7 @@ RDEPEND=" dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/docutils[${PYTHON_USEDEP}] dev-python/dominate[${PYTHON_USEDEP}] - dev-python/myst_parser[${PYTHON_USEDEP}] + dev-python/myst-parser[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] sci-mathematics/coq-serapi diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest index 49ac1bd63a83..7c1c762e20c7 100644 --- a/sci-mathematics/alt-ergo/Manifest +++ b/sci-mathematics/alt-ergo/Manifest @@ -1,2 +1,3 @@ DIST alt-ergo-2.4.1.tar.gz 2883046 BLAKE2B 6930080f7735f043e33d02b7fa0990c53992848796c0a5cf6ea4d7122eb6b9e5d6ac7ce420a4a19da35fa0ce5ff431bc228f2314a6f709f27a16bc7481bbacd5 SHA512 c3eee41d3c588ca89c2a1eebe9f10914ef647743b58fb562b682172cf6b6bdeb0920ebbba8a850820c0cb53bad0260f11b82fe71f00830ea9b33f5bb5d4fd048 DIST alt-ergo-2.4.2.tar.gz 2884553 BLAKE2B 95392625a6b17b3a2e41070a7f70ba124a95d99294f295d7c5a636a3327e6dac6b2153d1c90be4d24b72ce5ad22be5e174f6ae1c37663b093218a76ec1ada29a SHA512 61ae181ccd60a49f833ea79bbd5184a46f8eef24e7fe1169b15e905ed86584bdbe993ef86c203d5bfc3d79961024f96af0e4e623dc15479aa9538648291c9a75 +DIST alt-ergo-2.4.3.tar.gz 2902450 BLAKE2B bb8931dc512e3745496c1801fe959ac0fc4758b03049462506689021508a4ea364f0aae8679c776d8154c9f86a09080801c9b822d23355c572a24bd8b0e38210 SHA512 88a26b138e41997516085dbbf279e1ce11d03c18c0464ba80d5403dc80ff0f8cb5cbd4ad1489a60ff2a3b9539f9c55e4274008b14eed47b6fd057ce0a94ef98f diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.4.3.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.4.3.ebuild new file mode 100644 index 000000000000..1ba42319bb6c --- /dev/null +++ b/sci-mathematics/alt-ergo/alt-ergo-2.4.3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Automatic theorem prover" +HOMEPAGE="https://alt-ergo.ocamlpro.com + https://github.com/OCamlPro/alt-ergo/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OCamlPro/${PN}.git" +else + SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="CeCILL-C" +SLOT="0/${PV}" +IUSE="examples gui +ocamlopt" +REQUIRED_USE="ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.09.0:=[ocamlopt=] + >=sci-mathematics/psmt2-frontend-0.4.0:= + + >=dev-ml/cmdliner-1.1.0:= + >=dev-ml/menhir-20181006:= + >=dev-ml/ocplib-simplex-0.4:= + dev-ml/camlzip:= + dev-ml/num:= + dev-ml/stdlib-shims:= + dev-ml/zarith:= + gui? ( + dev-ml/lablgtk:3 + dev-ml/lablgtk-sourceview:3 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-ml/dune-build-info + dev-ml/dune-configurator +" + +PATCHES=( "${FILESDIR}"/${PN}-2.4.3-dune.patch ) + +OCAML_SUBPACKAGES=( + alt-ergo-lib + alt-ergo-parsers + alt-ergo +) + +src_prepare() { + default + + if use gui ; then + OCAML_SUBPACKAGES+=( altgr-ergo ) + fi +} + +src_configure() { + sh ./configure --prefix /usr --libdir=/usr/$(get_libdir) || die +} + +src_compile() { + dune-compile ${OCAML_SUBPACKAGES[@]} +} + +src_install() { + dune-install ${OCAML_SUBPACKAGES[@]} + + use examples && dodoc -r examples +} diff --git a/sci-mathematics/alt-ergo/alt-ergo-9999.ebuild b/sci-mathematics/alt-ergo/alt-ergo-9999.ebuild new file mode 100644 index 000000000000..1ba42319bb6c --- /dev/null +++ b/sci-mathematics/alt-ergo/alt-ergo-9999.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Automatic theorem prover" +HOMEPAGE="https://alt-ergo.ocamlpro.com + https://github.com/OCamlPro/alt-ergo/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OCamlPro/${PN}.git" +else + SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="CeCILL-C" +SLOT="0/${PV}" +IUSE="examples gui +ocamlopt" +REQUIRED_USE="ocamlopt" + +RDEPEND=" + >=dev-lang/ocaml-4.09.0:=[ocamlopt=] + >=sci-mathematics/psmt2-frontend-0.4.0:= + + >=dev-ml/cmdliner-1.1.0:= + >=dev-ml/menhir-20181006:= + >=dev-ml/ocplib-simplex-0.4:= + dev-ml/camlzip:= + dev-ml/num:= + dev-ml/stdlib-shims:= + dev-ml/zarith:= + gui? ( + dev-ml/lablgtk:3 + dev-ml/lablgtk-sourceview:3 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-ml/dune-build-info + dev-ml/dune-configurator +" + +PATCHES=( "${FILESDIR}"/${PN}-2.4.3-dune.patch ) + +OCAML_SUBPACKAGES=( + alt-ergo-lib + alt-ergo-parsers + alt-ergo +) + +src_prepare() { + default + + if use gui ; then + OCAML_SUBPACKAGES+=( altgr-ergo ) + fi +} + +src_configure() { + sh ./configure --prefix /usr --libdir=/usr/$(get_libdir) || die +} + +src_compile() { + dune-compile ${OCAML_SUBPACKAGES[@]} +} + +src_install() { + dune-install ${OCAML_SUBPACKAGES[@]} + + use examples && dodoc -r examples +} diff --git a/sci-mathematics/alt-ergo/files/alt-ergo-2.4.3-dune.patch b/sci-mathematics/alt-ergo/files/alt-ergo-2.4.3-dune.patch new file mode 100644 index 000000000000..eea143fdd38a --- /dev/null +++ b/sci-mathematics/alt-ergo/files/alt-ergo-2.4.3-dune.patch @@ -0,0 +1,10 @@ +--- a/src/lib/dune ++++ b/src/lib/dune +@@ -21,7 +21,6 @@ + + ; external dependencies + (libraries +- seq + unix + num + str diff --git a/sci-mathematics/arb/arb-2.23.0.ebuild b/sci-mathematics/arb/arb-2.23.0.ebuild index 361ea8c096a2..d8fa371b1010 100644 --- a/sci-mathematics/arb/arb-2.23.0.ebuild +++ b/sci-mathematics/arb/arb-2.23.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ RESTRICT="!test? ( test )" LICENSE="GPL-2+" SLOT="0/3" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" RDEPEND=" dev-libs/gmp:0= diff --git a/sci-mathematics/bertini/Manifest b/sci-mathematics/bertini/Manifest index 28ac95662aee..a1ce4e64694e 100644 --- a/sci-mathematics/bertini/Manifest +++ b/sci-mathematics/bertini/Manifest @@ -1 +1,3 @@ DIST BertiniSource_v1.4.tar.gz 1827401 BLAKE2B 4869ef0b73a3688df504bff84dc36682700c4916dcfdca68ae3a1bf87ceda2f664c35e2b5fe4b5d0859bbab110a2fa1e474361847db897859c3d5d17c48f122f SHA512 bb53f8ed24a0f21e95b4e373be36039b69ea0ddb11ad8240bcf52ce64436a56c1f2057a5d733d017fdf68cfb3598a473e1f12b4659308890e2e2575b7d8143f6 +DIST BertiniSource_v1.6.tar.gz 4957384 BLAKE2B 395ca96c52b167eaefe672d31c79c5791d92b1375059c0e6244042f2e987d011d0c9b5d6590555654e0b23d15aec2dcdcb2c1fa23fec73fb5c0e307c960c334b SHA512 04e0964e714ede697d49aeecd4008102d653472664d22fc2f491e93d8a5cc18a9db2980d57a23a8ea88f1fab9b98aeb2d36fc112c0a0aa3510e152a8edcb1f95 +DIST BertiniUsersManual.pdf 1188567 BLAKE2B d940e95a86ec2b81d5afff3ade9fe28f5c3034e9250a844d3b8ad4de5ded1b4b98a68d2da1f61e17fd7f25ed481522805505850fc011f2a5642ca7cee4e86c8f SHA512 f206645cf20eb4da9e00b62440e612e0037fe02882167cdb48074d4532b913a940b551f4624fd00309c8f5d2a9775350430b143277b1dfe8064fd899a58408d9 diff --git a/sci-mathematics/bertini/bertini-1.6.ebuild b/sci-mathematics/bertini/bertini-1.6.ebuild new file mode 100644 index 000000000000..5fe2bd594d0f --- /dev/null +++ b/sci-mathematics/bertini/bertini-1.6.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MYP=BertiniSource_v${PV} + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="Software for Numerical Algebraic Geometry" +HOMEPAGE="http://bertini.nd.edu" +SRC_URI="https://bertini.nd.edu/${MYP}.tar.gz + doc? ( https://bertini.nd.edu/BertiniUsersManual.pdf )" +S="${WORKDIR}"/${MYP/./} + +LICENSE="bertini" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples +optimization" + +RDEPEND=" + dev-libs/gmp + dev-libs/mpfr +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex +" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +src_prepare() { + default + + # bug #723328 + append-cflags -fcommon + + # Ensure this is before the CFLAGS sed + # or breakage occurs if 'gcc' is in your CFLAGS + sed -i -e "s/gcc/$(tc-getCC)/" src/Makefile || die + + if ! use optimization ; then + sed -i -e "s/\$(OPT)/ ${CFLAGS} ${CXXFLAGS} ${LDFLAGS}/" src/Makefile || die + else + # If people want the optimisation offered by upstream, + # let's ensure they don't accidentally override it. + filter-flags -O? + sed -i -e "s/\$(OPT)/ \$(OPT) ${CFLAGS} ${LDFLAGS}/" src/Makefile || die + fi +} + +src_configure() { + econf --prefix=/usr --includedir=/usr/include/${PN} + + use doc && DOCS+=( "${DISTDIR}"/BertiniUsersManual.pdf ) +} + +src_install() { + emake DESTDIR="${D}" install + + find "${ED}" -name "*.la" -delete || die + + einstalldocs +} 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/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/cadabra/Manifest b/sci-mathematics/cadabra/Manifest index 517715df8c6b..b55b0b9b6f48 100644 --- a/sci-mathematics/cadabra/Manifest +++ b/sci-mathematics/cadabra/Manifest @@ -1,3 +1 @@ -DIST cadabra-2.4.2.1.tar.gz 25154623 BLAKE2B 99c24728c80c5909df338b9214774123c2aac63e475138b5059c0c7824685827765d7906c17200ab3bad63e08b3637c7eb67b2f25bb3477eab4ca02fcbedbb56 SHA512 9dd280dfaca3cf1def268bca7884b0d00287bba5bfb7b80e8bdf4759f91c83117d146af2a24e05d2a8bdc8a5be412529a805713861a56a7186c35fe07ff8d0db -DIST cadabra-2.4.2.2.tar.gz 25156757 BLAKE2B 05d4e490d1fa740b3dd505b72d5f4f298e62e234859e81b5bdf865e895ab820b3cd5d6db3ecda1cac0426b031cc5c87428d464bdb66b24cb9b945ababc860a90 SHA512 c5c55abad090d72f981341d94d3e299583f446a4bff1df994a60c740cede9e543b5cdee146dae2a846deec4adf446172e62b0f12deab8c89e7a085ffa7006acf DIST cadabra-2.4.3.2.tar.gz 25157173 BLAKE2B 895b91a01f5dedc87294903959ee3aca0234016fce0094f4288c07e2d265f90f834670b9c50dcfa059e46564c773f73f049cf65db74f49932e442d15d68ecd88 SHA512 21c76804442397fa3d5fa407fc74395fc800d01c2a5d84270e9cf3abd875c8ff96e2ba8f8349037797ff4ef3d2b9033c2a1a6af45bb75c3a201acdd7357adb6f diff --git a/sci-mathematics/cadabra/cadabra-2.4.2.1.ebuild b/sci-mathematics/cadabra/cadabra-2.4.2.1.ebuild deleted file mode 100644 index 85095564544c..000000000000 --- a/sci-mathematics/cadabra/cadabra-2.4.2.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MAJOR=$(ver_cut 1) -CADABRA=${PN}${MAJOR} - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit xdg-utils python-single-r1 cmake - -DESCRIPTION="Field-theory motivated approach to computer algebra" -HOMEPAGE="https://cadabra.science/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kpeeters/${CADABRA}.git" -else - SRC_URI="https://github.com/kpeeters/${CADABRA}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}"/${CADABRA}-${PV} - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${MAJOR}" -IUSE="gtk +jupyter test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - app-text/dvipng - dev-cpp/glibmm:2 - dev-db/sqlite:3= - dev-libs/boost:= - dev-libs/gmp:=[cxx] - dev-libs/jsoncpp:= - dev-libs/libsigc++:2 - dev-texlive/texlive-basic - $(python_gen_cond_dep ' - dev-python/gmpy:2[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/sympy[${PYTHON_USEDEP}] - jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] ) - ') - gtk? ( dev-cpp/gtkmm:3.0 ) -" -DEPEND="${RDEPEND}" -BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')" - -PATCHES=( "${FILESDIR}"/${CADABRA}-CMake.patch ) - -DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst ) - -# Because we do not want to pull in "_XDG_DEPEND" dependencies with USE="-gtk" -xdg_update() { - if use gtk ; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -src_prepare() { - # Clean postinst script which calls libtool and icon-cache update - echo '#!/bin/sh' > "${S}"/config/postinst.in || die - - # Fix "PYTHON_EXECUTABLE" in Jupyter kernel - sed -i "s|@PYTHON_EXECUTABLE@|${EPYTHON}|" \ - "${S}"/jupyterkernel/kernelspec/kernel.json.in || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_SYSTEM_JSONCPP=ON - -DPACKAGING_MODE=ON - -DUSE_PYTHON_3=ON - -DBUILD_AS_CPP_LIBRARY=OFF - -DENABLE_JUPYTER=OFF # special Xeus Jupyter kernel (uses xtl) - -DENABLE_MATHEMATICA=OFF - -DINSTALL_TARGETS_ONLY=OFF - -DBUILD_TESTS=$(usex test) - -DENABLE_FRONTEND=$(usex gtk) - -DENABLE_PY_JUPYTER=$(usex jupyter) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_optimize -} - -pkg_postinst() { - xdg_update -} - -pkg_postrm() { - xdg_update -} diff --git a/sci-mathematics/cadabra/cadabra-2.4.2.2.ebuild b/sci-mathematics/cadabra/cadabra-2.4.2.2.ebuild deleted file mode 100644 index 85095564544c..000000000000 --- a/sci-mathematics/cadabra/cadabra-2.4.2.2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MAJOR=$(ver_cut 1) -CADABRA=${PN}${MAJOR} - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit xdg-utils python-single-r1 cmake - -DESCRIPTION="Field-theory motivated approach to computer algebra" -HOMEPAGE="https://cadabra.science/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kpeeters/${CADABRA}.git" -else - SRC_URI="https://github.com/kpeeters/${CADABRA}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}"/${CADABRA}-${PV} - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${MAJOR}" -IUSE="gtk +jupyter test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - app-text/dvipng - dev-cpp/glibmm:2 - dev-db/sqlite:3= - dev-libs/boost:= - dev-libs/gmp:=[cxx] - dev-libs/jsoncpp:= - dev-libs/libsigc++:2 - dev-texlive/texlive-basic - $(python_gen_cond_dep ' - dev-python/gmpy:2[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/sympy[${PYTHON_USEDEP}] - jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] ) - ') - gtk? ( dev-cpp/gtkmm:3.0 ) -" -DEPEND="${RDEPEND}" -BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')" - -PATCHES=( "${FILESDIR}"/${CADABRA}-CMake.patch ) - -DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst ) - -# Because we do not want to pull in "_XDG_DEPEND" dependencies with USE="-gtk" -xdg_update() { - if use gtk ; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -src_prepare() { - # Clean postinst script which calls libtool and icon-cache update - echo '#!/bin/sh' > "${S}"/config/postinst.in || die - - # Fix "PYTHON_EXECUTABLE" in Jupyter kernel - sed -i "s|@PYTHON_EXECUTABLE@|${EPYTHON}|" \ - "${S}"/jupyterkernel/kernelspec/kernel.json.in || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_SYSTEM_JSONCPP=ON - -DPACKAGING_MODE=ON - -DUSE_PYTHON_3=ON - -DBUILD_AS_CPP_LIBRARY=OFF - -DENABLE_JUPYTER=OFF # special Xeus Jupyter kernel (uses xtl) - -DENABLE_MATHEMATICA=OFF - -DINSTALL_TARGETS_ONLY=OFF - -DBUILD_TESTS=$(usex test) - -DENABLE_FRONTEND=$(usex gtk) - -DENABLE_PY_JUPYTER=$(usex jupyter) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_optimize -} - -pkg_postinst() { - xdg_update -} - -pkg_postrm() { - xdg_update -} diff --git a/sci-mathematics/cadabra/cadabra-2.4.3.2.ebuild b/sci-mathematics/cadabra/cadabra-2.4.3.2-r1.ebuild index 6481aada846a..dc848e56ac06 100644 --- a/sci-mathematics/cadabra/cadabra-2.4.3.2.ebuild +++ b/sci-mathematics/cadabra/cadabra-2.4.3.2-r1.ebuild @@ -6,12 +6,13 @@ EAPI=8 MAJOR=$(ver_cut 1) CADABRA=${PN}${MAJOR} -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit xdg-utils python-single-r1 cmake DESCRIPTION="Field-theory motivated approach to computer algebra" -HOMEPAGE="https://cadabra.science/" +HOMEPAGE="https://cadabra.science/ + https://github.com/kpeeters/cadabra2/" if [[ "${PV}" == *9999* ]] ; then inherit git-r3 @@ -25,7 +26,7 @@ fi LICENSE="GPL-3" SLOT="0/${MAJOR}" -IUSE="gtk +jupyter test" +IUSE="gui +jupyter test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -45,7 +46,7 @@ RDEPEND=" dev-python/sympy[${PYTHON_USEDEP}] jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] ) ') - gtk? ( dev-cpp/gtkmm:3.0 ) + gui? ( dev-cpp/gtkmm:3.0 ) " DEPEND="${RDEPEND}" BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')" @@ -54,9 +55,8 @@ PATCHES=( "${FILESDIR}"/${CADABRA}-CMake.patch ) DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst ) -# Because we do not want to pull in "_XDG_DEPEND" dependencies with USE="-gtk" xdg_update() { - if use gtk ; then + if use gui ; then xdg_icon_cache_update xdg_desktop_database_update xdg_mimeinfo_database_update @@ -75,7 +75,7 @@ src_prepare() { } src_configure() { - local mycmakeargs=( + local -a mycmakeargs=( -DENABLE_SYSTEM_JSONCPP=ON -DPACKAGING_MODE=ON -DUSE_PYTHON_3=ON @@ -84,7 +84,7 @@ src_configure() { -DENABLE_MATHEMATICA=OFF -DINSTALL_TARGETS_ONLY=OFF -DBUILD_TESTS=$(usex test) - -DENABLE_FRONTEND=$(usex gtk) + -DENABLE_FRONTEND=$(usex gui) -DENABLE_PY_JUPYTER=$(usex jupyter) ) cmake_src_configure diff --git a/sci-mathematics/coq-mathcomp/Manifest b/sci-mathematics/coq-mathcomp/Manifest index 3fe8d5839785..1793a20ff5b4 100644 --- a/sci-mathematics/coq-mathcomp/Manifest +++ b/sci-mathematics/coq-mathcomp/Manifest @@ -1,3 +1,2 @@ -DIST coq-mathcomp-1.14.0.tar.gz 1352989 BLAKE2B 475ca9725a7868d592fc289223f468c6703cca1574d878568d7faaa2725fc204155320c915c75861d5f122acc0cf6aaad9f324656f9a7dae030d37fee93bec27 SHA512 49821492016e75fe32d22557b6b2de4bc0a3d924e2a38a13f2759aeb87095417a27e274737d0dcc01448899c3ebb50c284e9eb96fd1d4c22fb5d101dc6d290bf DIST coq-mathcomp-1.15.0.tar.gz 1359283 BLAKE2B 7a575e49f93c6527da877a4044ae97d82fa48f242c29b5ed22bc58154f422e14716cb481aa4de96963cfd3cf1aad5dcd76608d85ec4b68ce1a5601b13e3add3e SHA512 96d3bc53ab83740675e6d0bd6e31479e16d986994d1725e9a0466ef46cd517e4ced966d6b1e34b3ff1b15327a2058afcc914b91dba3c5354021d4ef224b8348c DIST coq-mathcomp-1.16.0.tar.gz 1377232 BLAKE2B f9246ff2a6e583facc31278728b0865fdfb4d9cb6422687643321712b22d7fa61e40dd95e7782ba8443f66b61f9f6a82caead767a6985c87e6fe731a04494713 SHA512 80dc82e0deea4b3e05811b9dca3cf7c0169387288a5cc5c7e95c452c7aa041a37df34d93546c6597c6717106e20dc98400c7b0bbb8d1d1915e2063cfe6fd300b diff --git a/sci-mathematics/coq-mathcomp/coq-mathcomp-1.14.0-r1.ebuild b/sci-mathematics/coq-mathcomp/coq-mathcomp-1.14.0-r1.ebuild deleted file mode 100644 index fcf362d97248..000000000000 --- a/sci-mathematics/coq-mathcomp/coq-mathcomp-1.14.0-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Mathematical Components for the Coq proof assistant" -HOMEPAGE="https://github.com/math-comp/math-comp/" -SRC_URI="https://github.com/math-comp/math-comp/archive/mathcomp-${PV}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}"/math-comp-mathcomp-${PV}/mathcomp - -LICENSE="CeCILL-B" -SLOT="0/${PV}" -KEYWORDS="~amd64" - -RDEPEND=">=sci-mathematics/coq-8.13.0:= <sci-mathematics/coq-8.16.0:=" -DEPEND="${RDEPEND}" - -# > make jobserver unavailable -src_compile() { - emake -j1 -} - -src_install() { - emake -j1 install DESTDIR="${D}" -} diff --git a/sci-mathematics/coq-mathcomp/coq-mathcomp-1.16.0.ebuild b/sci-mathematics/coq-mathcomp/coq-mathcomp-1.15.0-r1.ebuild index a8e1792a11d6..bb3f88518455 100644 --- a/sci-mathematics/coq-mathcomp/coq-mathcomp-1.16.0.ebuild +++ b/sci-mathematics/coq-mathcomp/coq-mathcomp-1.15.0-r1.ebuild @@ -13,5 +13,11 @@ LICENSE="CeCILL-B" SLOT="0/${PV}" KEYWORDS="~amd64" -RDEPEND=">=sci-mathematics/coq-8.16.0:=" +RDEPEND=" + dev-lang/ocaml:= + >=sci-mathematics/coq-8.16.0:= +" DEPEND="${RDEPEND}" + +# Do not complain about CFLAGS etc since ML projects do not use them. +QA_FLAGS_IGNORED='.*' diff --git a/sci-mathematics/coq-mathcomp/coq-mathcomp-1.15.0.ebuild b/sci-mathematics/coq-mathcomp/coq-mathcomp-1.16.0-r1.ebuild index 5e41229a4f4f..f90ad15beb45 100644 --- a/sci-mathematics/coq-mathcomp/coq-mathcomp-1.15.0.ebuild +++ b/sci-mathematics/coq-mathcomp/coq-mathcomp-1.16.0-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +COQ_MIN_V=8.16.0 + DESCRIPTION="Mathematical Components for the Coq proof assistant" HOMEPAGE="https://github.com/math-comp/math-comp/" SRC_URI="https://github.com/math-comp/math-comp/archive/mathcomp-${PV}.tar.gz @@ -13,5 +15,11 @@ LICENSE="CeCILL-B" SLOT="0/${PV}" KEYWORDS="~amd64" -RDEPEND=">=sci-mathematics/coq-8.16.0:=" +RDEPEND=" + >=sci-mathematics/coq-${COQ_MIN_V}:= + dev-lang/ocaml:= +" DEPEND="${RDEPEND}" + +# Do not complain about CFLAGS etc since ML projects do not use them. +QA_FLAGS_IGNORED='.*' diff --git a/sci-mathematics/coq-serapi/Manifest b/sci-mathematics/coq-serapi/Manifest index 2f41795b411e..427eaa5dae04 100644 --- a/sci-mathematics/coq-serapi/Manifest +++ b/sci-mathematics/coq-serapi/Manifest @@ -1,3 +1,4 @@ -DIST coq-serapi-0.16.0.tar.gz 270647 BLAKE2B 8189e70bfa4208a613ec7a89d6fc72c15a9c1c29ed49cd53a561b72b4b9e55196bcb92d5e962309d8843036c30ec177588e2db7dd091443947b02e78f2df1880 SHA512 56cc74e9d2b1e13c7ffb94b32e206671ac904f6d7e633c830175eed6f7cb75a2b212be916316784dc7d697c6e5779e27ed402d5e7edbee8b7d84d2c533dc38c3 DIST coq-serapi-0.16.1.tar.gz 271068 BLAKE2B 5e832f4b2d2627938f2399b3eff111a15987d7733e30ba6f6328dc0110631a1c42a212c5ed464037f8c521c11c46bf8bb8665bfdd93b5969949cdec584a42e18 SHA512 348a984897f99dd4f08a409251eaf50f792aa1fe96d71d5f895f3153c05131b2d6b15f10a18cf704e978676562547d0869a310e8d6969ffe69d5bdf1c212b756 DIST coq-serapi-0.16.2.tar.gz 272807 BLAKE2B 20a04ae8b18fba7c6d8346515d4f610750e32e6a521dc65afd7a624ae07ddea75b4f8aed237ba95ed16667f3867b35dd914b35eab966187f6f41f547f3bac8d6 SHA512 f7aba7009f14302246eabe595af7cb72103b8904e45c647783326f46d51b1331b30dd515364c4b909f02c42c5bf7bd367dc0fe64eb9c88b062cd79113b53306b +DIST coq-serapi-0.16.3.tar.gz 272910 BLAKE2B e3e5e070e98d9dd41d3b7ef589abcb57137925ed637be7c94aaa387dbe996ce72d4c98f37b6e8ee9ca196af6deb291afbb326ac6aeb8c1809331bbc1824a0786 SHA512 fccc946d87de4fbe797df6a898704ead04708323bdf3b799ced074ba1539d7d5b54d3cc439f7641fe3bf289069ca42278137a10c8de211b1563df9b6a61ad8c5 +DIST coq-serapi-0.17.0.tar.gz 273903 BLAKE2B 155d865650f773d71e0ddd10869852916de5e539b3b3f4d03d58259790482be45d668035975d5be768776f7ef5947f0d7227f0f6624bc7f64cefd009e9a83ecb SHA512 d9085b4215c233c47f78386d8771348768c9cbbf0716dfa4da3ff8c8c96d2e78b203098314175ef2bb9959096f8b0ec03a9fb5d696d0451eeee0713bd48afa2b diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.16.0-r1.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.16.3.ebuild index fed96a12b2dc..1c0727491cf7 100644 --- a/sci-mathematics/coq-serapi/coq-serapi-0.16.0-r1.ebuild +++ b/sci-mathematics/coq-serapi/coq-serapi-0.16.3.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -COQV=8.16.0 +COQ_MIN_V=8.16.0 +COQ_MAX_V=8.17.0 inherit elisp-common dune DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant" HOMEPAGE="https://github.com/ejgallego/coq-serapi/" + # The tarball in SRC_URI is comprised of <supported coq>+<package version> -SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQV}+${PV}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-${COQV}-${PV} +SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQ_MIN_V}+${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${COQ_MIN_V}-${PV} LICENSE="GPL-3+" SLOT="0/${PV}" @@ -21,8 +23,8 @@ IUSE="emacs +ocamlopt test" RESTRICT="!test? ( test )" RDEPEND=" - >=sci-mathematics/coq-${COQV}:= <sci-mathematics/coq-8.17:= - >=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:= + >=sci-mathematics/coq-${COQ_MIN_V}:= <sci-mathematics/coq-${COQ_MAX_V}:= + >=dev-ml/ppx_sexp_conv-0.13.0:= dev-ml/cmdliner:= dev-ml/ppx_compare:= dev-ml/ppx_deriving:= @@ -38,9 +40,10 @@ BDEPEND=" test? ( sci-mathematics/coq-mathcomp ) " -PATCHES=( "${FILESDIR}"/${PN}-sertop.el-path.patch ) SITEFILE="50sertop-gentoo.el" +PATCHES=( "${FILESDIR}"/${PN}-sertop.el-path.patch ) + src_compile() { dune_src_compile @@ -51,6 +54,7 @@ src_install() { dune_src_install rm -r "${D}"/usr/share/emacs || die + if use emacs ; then elisp-install ${PN} sertop.el{,c} elisp-site-file-install "${FILESDIR}/${SITEFILE}" diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.17.0.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.17.0.ebuild new file mode 100644 index 000000000000..2485ac135a10 --- /dev/null +++ b/sci-mathematics/coq-serapi/coq-serapi-0.17.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +COQ_MIN_V=8.17.0 +COQ_MAX_V=8.18.0 + +inherit elisp-common dune + +DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant" +HOMEPAGE="https://github.com/ejgallego/coq-serapi/" + +# The tarball in SRC_URI is comprised of <supported coq>+<package version> +SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQ_MIN_V}+${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${COQ_MIN_V}-${PV} + +LICENSE="GPL-3+" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="emacs +ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=sci-mathematics/coq-${COQ_MIN_V}:= <sci-mathematics/coq-${COQ_MAX_V}:= + >=dev-ml/ppx_sexp_conv-0.13.0:= + dev-ml/cmdliner:= + dev-ml/ppx_compare:= + dev-ml/ppx_deriving:= + dev-ml/ppx_deriving_yojson:= + dev-ml/ppx_hash:= + dev-ml/ppx_import:= + dev-ml/sexplib:= + dev-ml/yojson:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) + test? ( sci-mathematics/coq-mathcomp ) +" + +SITEFILE="50sertop-gentoo.el" + +PATCHES=( "${FILESDIR}"/${PN}-sertop.el-path.patch ) + +src_compile() { + dune_src_compile + + use emacs && elisp-compile sertop.el +} + +src_install() { + dune_src_install + + rm -r "${D}"/usr/share/emacs || die + + if use emacs ; then + elisp-install ${PN} sertop.el{,c} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest index e3924dcd3a5d..5bad33b4b1a2 100644 --- a/sci-mathematics/coq/Manifest +++ b/sci-mathematics/coq/Manifest @@ -1,5 +1,5 @@ DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240 DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252afc05e046267cae4265c1be71f89d0345f9e40ab3a93f5063080fd0224502cc0de808c7a0ddbb0edacab5fca SHA512 c355f0a9183f3669debd5f8f4ab96786215d0cccc37d1c2ac95a2d3c6115c8b0ee7ff7e23464b18444e2648ef3f8c221f0f3a28acf91199751cea2b74ee3fe8e DIST coq-8.15.2.tar.gz 7222794 BLAKE2B 2f187982a56cb0a512af838ee321b245f9a44b0c32f5413aafcef8e5b7f933e9b05ba521c3e681a6c6973ca2b7ec5965a8b69b2febb978ce7cf246755187f656 SHA512 6a5487912dedb6e54145bf3f177a091cffe13429ba2f73db7c1cc241fe10e86340c968e19cefba7d680facce55f4e914cbd16a317264b109a6f9a01ec822a8c5 -DIST coq-8.16.0.tar.gz 7397421 BLAKE2B 25b94002c4d1d1266ef948f0276df74d6a60c5b5100c7126232e0e33642be3ec14f33acfff5d0d5c17681676338374f694ca7c8c35200e522e480c3791f69dd8 SHA512 f324b68efcec0680a52c92d6e2fdd340a0e360e7d56d7fc3b4b781af3bec923d2fa2fdbb139b07d2253568a657a09c0d3da4cd5bdf984a6ab913e606056df4b3 DIST coq-8.16.1.tar.gz 7401345 BLAKE2B fa6bbcd6b4ee29feaf7475f58193209afeae0bf8b6e3640f2f1cf40dfcee7d7f1fb3f371e8790b8d11c993b5f234e9175f1f5036a7286b7c6569720ddd3985f7 SHA512 e9c82f1a180c2e3946628e8e039999a1841397a5b4cd77f158de69876fa43b5c0f61ce76c510cc2b2f646a489110aea59da452b88ddd7850d1eab4105f1382f5 +DIST coq-8.17.0.tar.gz 7504612 BLAKE2B 90ff0e187e13a6501580733f0e92dbaba0ddc520b418246c743f0c282e74cee3e1d69ad0249cddfd5b8f3ba363bc58cb91aad33d0936ae38afde0f4c97d47a72 SHA512 2f77bcb5211018b5d46320fd39fd34450eeb654aca44551b28bb50a2364398c4b34587630b6558db867ecfb63b246fd3e29dc2375f99967ff62bc002db9c3250 diff --git a/sci-mathematics/coq/coq-8.12.0-r2.ebuild b/sci-mathematics/coq/coq-8.12.0-r2.ebuild index 71295a252044..8ccc4c7a73ef 100644 --- a/sci-mathematics/coq/coq-8.12.0-r2.ebuild +++ b/sci-mathematics/coq/coq-8.12.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ HOMEPAGE="http://coq.inria.fr/" SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" -SLOT="0" +SLOT="0/${PV}" KEYWORDS="amd64 x86" IUSE="gtk debug +ocamlopt doc" diff --git a/sci-mathematics/coq/coq-8.13.0-r1.ebuild b/sci-mathematics/coq/coq-8.13.0-r1.ebuild index 2ce871790746..51731bcf5803 100644 --- a/sci-mathematics/coq/coq-8.13.0-r1.ebuild +++ b/sci-mathematics/coq/coq-8.13.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1" -SLOT="0" +SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="gtk debug +ocamlopt doc" diff --git a/sci-mathematics/coq/coq-8.15.2.ebuild b/sci-mathematics/coq/coq-8.15.2.ebuild index fc4bad973709..c94ce21f129a 100644 --- a/sci-mathematics/coq/coq-8.15.2.ebuild +++ b/sci-mathematics/coq/coq-8.15.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1" -SLOT="0" +SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="doc gtk debug +ocamlopt" RESTRICT="test" # fails @@ -37,7 +37,7 @@ BDEPEND=" dev-python/antlr4-python3-runtime dev-python/beautifulsoup4 dev-python/pexpect - dev-python/sphinx_rtd_theme + dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-bibtex dev-tex/latexmk dev-texlive/texlive-fontsextra diff --git a/sci-mathematics/coq/coq-8.16.1.ebuild b/sci-mathematics/coq/coq-8.16.1.ebuild index 8f3da8dda4ab..a8dc37656492 100644 --- a/sci-mathematics/coq/coq-8.16.1.ebuild +++ b/sci-mathematics/coq/coq-8.16.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1" -SLOT="0" +SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="doc gtk debug +ocamlopt" RESTRICT="test" # fails @@ -37,7 +37,7 @@ BDEPEND=" dev-python/antlr4-python3-runtime dev-python/beautifulsoup4 dev-python/pexpect - dev-python/sphinx_rtd_theme + dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-bibtex dev-tex/latexmk dev-texlive/texlive-fontsextra diff --git a/sci-mathematics/coq/coq-8.16.0.ebuild b/sci-mathematics/coq/coq-8.17.0.ebuild index 8f3da8dda4ab..6e20f85ae93c 100644 --- a/sci-mathematics/coq/coq-8.16.0.ebuild +++ b/sci-mathematics/coq/coq-8.17.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,18 +6,20 @@ EAPI=8 MY_PV=${PV/_p/pl} MY_P=${PN}-${MY_PV} -inherit desktop dune +inherit desktop dune edo DESCRIPTION="Proof assistant written in O'Caml" -HOMEPAGE="http://coq.inria.fr/" -SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" +HOMEPAGE="http://coq.inria.fr/ + https://github.com/coq/coq/" +SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gtk debug +ocamlopt" -RESTRICT="test" # fails +SLOT="0/${PV}" +KEYWORDS="~amd64 x86" +IUSE="debug doc gui +ocamlopt test" +RESTRICT="!test? ( test )" RDEPEND=" dev-ml/zarith:= @@ -25,19 +27,20 @@ RDEPEND=" dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) - gtk? ( + gui? ( >=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?] >=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?] ) " DEPEND="${RDEPEND}" BDEPEND=" + dev-ml/findlib doc? ( >=dev-java/antlr-4.7:4 dev-python/antlr4-python3-runtime dev-python/beautifulsoup4 dev-python/pexpect - dev-python/sphinx_rtd_theme + dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-bibtex dev-tex/latexmk dev-texlive/texlive-fontsextra @@ -45,67 +48,65 @@ BDEPEND=" dev-texlive/texlive-xetex media-fonts/freefont ) + test? ( dev-ml/ounit2 ) " DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md ) +src_prepare() { + # Remove failing tests. bug #904186 + rm -r test-suite/coq-makefile/timing || die + + default +} + src_configure() { - local myconf=( + export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/" + + dune_packages=( + coq-core + coq-stdlib + coqide-server + coq + ) + use gui && dune_packages+=( coqide ) + + emake clean + + local -a myconf=( -prefix /usr -libdir /usr/$(get_libdir)/coq -mandir /usr/share/man -docdir /usr/share/doc/${PF} -datadir /usr/share/coq -configdir /etc/xdg/${PN} - -with-doc $(usex doc) + -native-compiler $(usex ocamlopt yes no) ) - use debug && myconf+=( -debug ) - use ocamlopt || myconf+=( -byte-only ) - - if use gtk ; then - if use ocamlopt ; then - myconf+=( -coqide opt ) - else - myconf+=( -coqide byte ) - fi - else - myconf+=( -coqide no ) - fi - - export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/" - - echo "Configure options: ${myconf[@]}" - sh ./configure ${myconf[@]} || die "configure failed" + edob sh ./configure "${myconf[@]}" } src_compile() { - emake STRIP="true" VERBOSE=1 COQ_USE_DUNE="" world -} + emake DUNEOPT="--display=short --profile release" VERBOSE=1 dunestrap -src_test() { - emake STRIP="true" VERBOSE=1 COQ_USE_DUNE="" check + dune-compile ${dune_packages[@]} + + use doc && emake refman-html } src_install() { - local sym - local syms=( coq-core coqide-server ) - - emake STRIP="true" VERBOSE=1 COQ_USE_DUNE="" DESTDIR="${D}" install-library - dune-install coq-core coqide-server + dune-install ${dune_packages[@]} - if use gtk ; then - dune-install coqide - make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png" - syms+=( coqide ) + if use gui ; then + make_desktop_entry coqide "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png" fi - use doc && emake DESTDIR="${D}" install-doc-all - einstalldocs - # Dune installs into /usr/<libdir>/ocaml/<coq> but # Coq wants /usr/<libdir>/<coq> ; symlink those directories - for sym in ${syms[@]} ; do + local sym + for sym in ${dune_packages[@]} ; do dosym $(ocamlc -where)/${sym} /usr/$(get_libdir)/${sym} done + + einstalldocs } diff --git a/sci-mathematics/cryptominisat/Manifest b/sci-mathematics/cryptominisat/Manifest index ab7269c69b85..eebe71f07e88 100644 --- a/sci-mathematics/cryptominisat/Manifest +++ b/sci-mathematics/cryptominisat/Manifest @@ -1,2 +1 @@ DIST cryptominisat-5.11.4.tar.gz 1044845 BLAKE2B b6df4e61c5f37d24a61a5c782f08f223c413e19fc2b1625718f7d19d4df8f4d955a92ae447f6c98889927ddc7407b4790092086996a0a32879c7dcb614ca1024 SHA512 8593848c468a6b1ac3d9ae343384aa323fb6ddc17802c9b184c178b9a41314c463b1c5f02ffd19d6e844894c7998e41d6e9b808ed70dcc235aa595607f52bc76 -DIST cryptominisat-5.8.0.tar.gz 943785 BLAKE2B 534af88a8432c7e3da63989cad8fd5e1491bd69a80b44977fa681e0356e857a505a82dc860b0d04d07987e3edae2861da67ec9dd781261e03a1120dc342b9759 SHA512 3eb954f01524b189a8de57a05f6060471a083addc4b9077c1e32b769d26393ce3d33468819ba8169deedce43fc3663b0ad8bbad95c6afe5e562e438c57b75496 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"): diff --git a/sci-mathematics/cubicle/cubicle-1.2.0-r1.ebuild b/sci-mathematics/cubicle/cubicle-1.2.0-r2.ebuild index 8159f9f60a4a..756eb6aab056 100644 --- a/sci-mathematics/cubicle/cubicle-1.2.0-r1.ebuild +++ b/sci-mathematics/cubicle/cubicle-1.2.0-r2.ebuild @@ -14,10 +14,10 @@ SRC_URI="https://github.com/cubicle-model-checker/${PN}/archive/${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" -IUSE="emacs examples ocamlopt" +IUSE="emacs examples" RDEPEND=" - >=dev-lang/ocaml-4.09.0:=[ocamlopt=] + >=dev-lang/ocaml-4.09.0:=[ocamlopt] dev-ml/num:= emacs? ( >=app-editors/emacs-23.1:* ) " diff --git a/sci-mathematics/cvc4/cvc4-1.8-r2.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild index 7f7a9ad7aa88..d62729a94aa8 100644 --- a/sci-mathematics/cvc4/cvc4-1.8-r2.ebuild +++ b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR=emake -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-any-r1 DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems" @@ -33,6 +33,7 @@ S="${WORKDIR}"/${PN^^}-archived-${PV} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-toml.patch + "${FILESDIR}"/${P}-bash-5.2-fix.patch ) python_check_deps() { 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 <loganjerry@gmail.com> +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 <<EOF + /********************* */ diff --git a/sci-mathematics/dunshire/dunshire-0.1.1-r2.ebuild b/sci-mathematics/dunshire/dunshire-0.1.1-r3.ebuild index 07433b5d2252..396e22bb0249 100644 --- a/sci-mathematics/dunshire/dunshire-0.1.1-r2.ebuild +++ b/sci-mathematics/dunshire/dunshire-0.1.1-r3.ebuild @@ -3,13 +3,12 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 pypi DESCRIPTION="Python library to solve linear games over symmetric cones" HOMEPAGE="http://michael.orlitzky.com/code/dunshire/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="AGPL-3+" SLOT="0" diff --git a/sci-mathematics/easycrypt/Manifest b/sci-mathematics/easycrypt/Manifest index b2048b21a4d8..8e06e0b9306e 100644 --- a/sci-mathematics/easycrypt/Manifest +++ b/sci-mathematics/easycrypt/Manifest @@ -1,3 +1,2 @@ -DIST easycrypt-1.0_pre20220303.tar.gz 1193244 BLAKE2B f4d4b0661b7c58d9dd2c344efac45aa4257b46122cef81f98ced05792c1e4dd49d332421f09d0b11a28893096042a98a7415d06e1624aaa59cea0c71f17f4bb8 SHA512 bd9f1638631c9539aea3ee369705fbaafa06d575db395b3d170642af2450b7df735a18fe8f6aa6e8904eae62bdcd30743ab734f7c17c583ece7c146fee1bcf77 -DIST easycrypt-2022.04.tar.gz 1277930 BLAKE2B 4bb68325b9894e28dcf33f2b78f63c029375ba4f77d0df06cedff3a26be768827c9fb25f49cc8ecc8a2d341191fb0b9371825979f0f7cd14c69b3ced16ddc32c SHA512 9234de7f28999a6de79a3ecd27d3499ffb15fe651b2a577cf0b49fc73e034bbe1b4d99c2a7aafd3df70d9b4e095d1ae09ed8ff7a7885c020f9e5c990afe9b592 DIST easycrypt-2022.04_p20220505.tar.gz 1279876 BLAKE2B 10ae22e216b8a35973ad7d1dbffe1dba9ce328b67319577cd1a7fad957f08174d1651ee6c1bab8cdf12d8fda20cb85d5a334ad41dfb3e55f9ee8beb8a233a2eb SHA512 b1231e0be787a667c836d970236d47311e490443a66bc0a3834963557b32358ad9db2008e32d427d232f2a94c72afc65bd3330b6db1eb938335791ea997b4013 +DIST easycrypt-2022.04_p20230324.tar.gz 1296898 BLAKE2B 119cb10ad5c2cd50db9f70eb858e2779cae0350b9e5370060b8045f36684a9de87ad746e75c6a7e7fcc7ad93e40bde2164866bb16e67dd2ebc3409657760cbd8 SHA512 917d5ff2fe65a1fd02a19d700cfb77910290746023458b6ed9eb9dc1290faa5469571a3c77510caac8734ad7d2ada6c7fbfc75bb933d0a57e9c303a8cf207026 diff --git a/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild deleted file mode 100644 index 0e74e30a9b91..000000000000 --- a/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune - -DESCRIPTION="Computer-Aided Cryptographic Proofs" -HOMEPAGE="https://github.com/EasyCrypt/easycrypt" - -if [[ "${PV}" == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/EasyCrypt/${PN}.git" -else - SRC_URI="https://github.com/EasyCrypt/${PN}/archive/r${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-r${PV} -fi - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt" - -RDEPEND=" - >=dev-lang/ocaml-4.08.0:=[ocamlopt?] - >=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:= - dev-ml/batteries:= - dev-ml/camlzip:= - dev-ml/dune-build-info:= - dev-ml/dune-site:= - dev-ml/ocaml-inifiles:= - dev-ml/pcre-ocaml:= - dev-ml/yojson:= - dev-ml/zarith:= -" -DEPEND="${RDEPEND}" - -src_prepare() { - local theories="[\"$(ocamlc -where)/easycrypt/theories\"]" - sed -i "s|EcRelocate\.Sites\.theories|${theories}|g" src/ec.ml || die - - default -} diff --git a/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303-r1.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04_p20230324.ebuild index bb9b0527be75..8434aa25bbc1 100644 --- a/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303-r1.ebuild +++ b/sci-mathematics/easycrypt/easycrypt-2022.04_p20230324.ebuild @@ -3,30 +3,36 @@ EAPI=8 -[[ ${PV} == *_pre20220303 ]] && COMMIT=c98b014c131b6c0b147b852902953dd6c5771603 - inherit dune DESCRIPTION="Computer-Aided Cryptographic Proofs" -HOMEPAGE="https://github.com/EasyCrypt/easycrypt" +HOMEPAGE="https://github.com/EasyCrypt/easycrypt/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/EasyCrypt/${PN}.git" else - SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" + if [[ ${PV} == *_p20230324 ]] ; then + COMMIT=f62625928cc0970c88839c84897d1f6b17437519 + SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-${COMMIT} + else + SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + fi + KEYWORDS="~amd64" fi -LICENSE="CeCILL-B CeCILL-C" +LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64" IUSE="+ocamlopt" RDEPEND=" >=dev-lang/ocaml-4.08.0:=[ocamlopt?] - >=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:= + >=sci-mathematics/why3-1.6:= <sci-mathematics/why3-1.7:= dev-ml/batteries:= + dev-ml/camlp-streams:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest index 361eb7020548..9c0319db55ba 100644 --- a/sci-mathematics/eclib/Manifest +++ b/sci-mathematics/eclib/Manifest @@ -1,2 +1,2 @@ -DIST eclib-20220621.tar.bz2 921610 BLAKE2B f53f0648f09e427ae9b208a17c93f9808c2ab859cc41db6b5acb3b1382e9aaee93b17cd9d94c14e7f4941f140749d91b2ad94ad684f8a2c0f6033ac042cc89e7 SHA512 45cc47256f6ccbf2a00711d14533cffe8a3fc0dfea3d94d9823ac43af8a56cfe95485f0559c9141203910e85b1d3fa3284ee12ca5e53d083b74cbb2907afca42 DIST eclib-20221012.tar.bz2 922112 BLAKE2B 2a6e5dccdef7c3c3b8bb1a121706bbfbcaafa9fb50882e4e88f8fa826c3b1bcbec11dc55462cbd51da3ab263991ae357b151ff3bdbf453abfc30e82d2abdeac8 SHA512 9d04aefe9e35fbc1b18dd92b5ba872cf71f5ce1c94c9a0f1ff326c763bf144112d7d950ac80e2bd8d3780a303edeeac903754b4eb5fb241e87be7ef3f2738c19 +DIST eclib-20230424.tar.bz2 923074 BLAKE2B 00c314e54ff2ce37f3aa83b757c0f880aef563093ab33db5241dfeb1e78cfd21be4f6a5097965697d5b87aa1987da17bd47007a599717ebf39456717efa6ad2c SHA512 4c248c48fa563e53b9354f3822c4e95308320a809f2dcc3e116cba8a6f903b333e27b527da9a10dc8252052201c4fcf50d9747a75cf8438a98b9d3828eb3d9d9 diff --git a/sci-mathematics/eclib/eclib-20221012.ebuild b/sci-mathematics/eclib/eclib-20221012.ebuild index 0266953df5d9..f37e55f7be21 100644 --- a/sci-mathematics/eclib/eclib-20221012.ebuild +++ b/sci-mathematics/eclib/eclib-20221012.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ LICENSE="GPL-2" # but it's actually still at 10, probably due to a forgotten autoreconf # or something. SLOT="0/11" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="boost flint minimal test" RESTRICT="!test? ( test )" diff --git a/sci-mathematics/eclib/eclib-20220621.ebuild b/sci-mathematics/eclib/eclib-20230424.ebuild index 1a1ab3fc06b7..b6530c437e9e 100644 --- a/sci-mathematics/eclib/eclib-20220621.ebuild +++ b/sci-mathematics/eclib/eclib-20230424.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + DESCRIPTION="Programs for elliptic curves defined over the rational numbers" HOMEPAGE="https://github.com/JohnCremona/eclib" -SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/${PV}/${P}.tar.bz2" +SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/v${PV}/${P}.tar.bz2" LICENSE="GPL-2" -# Major version of /usr/lib64/libec.so -SLOT="0/10" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="boost flint minimal static-libs test" +SLOT="0/12" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="boost flint minimal test" RESTRICT="!test? ( test )" RDEPEND="sci-mathematics/pari:= @@ -21,12 +22,21 @@ RDEPEND="sci-mathematics/pari:= flint? ( sci-mathematics/flint:= )" DEPEND="${RDEPEND}" +src_prepare() { + default + # LT_CURRENT was bumped to 12 in this release but LT_AGE was left at + # two despite an interface being removed. Here we fix it so that the + # soname is correctly updated (and matches the expected subslot + # again). + sed -e 's/LT_AGE=2/LT_AGE=0/' -i configure.ac || die + eautoreconf +} + src_configure() { econf \ $(usex minimal --disable-allprogs "" "" "") \ $(use_with boost) \ - $(use_with flint) \ - $(use_enable static-libs static) + $(use_with flint) } src_install() { diff --git a/sci-mathematics/ent/ent-101202.ebuild b/sci-mathematics/ent/ent-101202.ebuild index 42778d0dd0c0..276a9a29fe86 100644 --- a/sci-mathematics/ent/ent-101202.ebuild +++ b/sci-mathematics/ent/ent-101202.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" BDEPEND="app-arch/unzip" diff --git a/sci-mathematics/flint/flint-2.9.0.ebuild b/sci-mathematics/flint/flint-2.9.0.ebuild index 0880ba0b8068..5a8694e18bfc 100644 --- a/sci-mathematics/flint/flint-2.9.0.ebuild +++ b/sci-mathematics/flint/flint-2.9.0.ebuild @@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+" # Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15 SLOT="0/17" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86" IUSE="doc ntl test" RESTRICT="!test? ( test )" diff --git a/sci-mathematics/flocq/Manifest b/sci-mathematics/flocq/Manifest index f04ae7c7ad49..094cfd9c64ee 100644 --- a/sci-mathematics/flocq/Manifest +++ b/sci-mathematics/flocq/Manifest @@ -1 +1,2 @@ DIST flocq-4.1.0.tar.gz 447412 BLAKE2B 1b993a0e86bd440602b16b94ed5aff4b95a3c732eca87c683d239702b285dee8eaaf7dad77f730ae4929bb24504e5fd12b9a181d48efac4c3db7f0606637c018 SHA512 677e0de1406b3c7e5504d114a5b18ec07c719bbad79a2cfb750ac309fd5ab09be5493afdb1786b5a188cece59fddcd4167e28bf3be4facbdea8fe3b11cdf1ab1 +DIST flocq-4.1.1.tar.gz 450132 BLAKE2B 00821a3e135156640320d1afd548bc1912953bba64cc675b7b6c94b4e3c792c444bfbb4ef1a3352adefa466548083e32c2b1e4b38747dcbc6ac6de6d72250a74 SHA512 7076b8d5e33b8225e0124b9f66f4e3e1ed3e30804c5bca28e30d5e176c1b8c5c3d777a28c243fada17ab4ed32f580c6d606b11f045d48f7acb15e03db59870c4 diff --git a/sci-mathematics/flocq/flocq-4.1.0.ebuild b/sci-mathematics/flocq/flocq-4.1.0-r1.ebuild index f48862539920..a547b9e58320 100644 --- a/sci-mathematics/flocq/flocq-4.1.0.ebuild +++ b/sci-mathematics/flocq/flocq-4.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,8 +14,14 @@ LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND=">=sci-mathematics/coq-8.12" -BDEPEND="${RDEPEND}" +RDEPEND=" + dev-lang/ocaml:= + >=sci-mathematics/coq-8.12:= +" +DEPEND="${RDEPEND}" + +# Do not complain about CFLAGS etc since ML projects do not use them. +QA_FLAGS_IGNORED='.*' src_compile() { ./remake --jobs=$(makeopts_jobs) || die diff --git a/sci-mathematics/flocq/flocq-4.1.1.ebuild b/sci-mathematics/flocq/flocq-4.1.1.ebuild new file mode 100644 index 000000000000..a547b9e58320 --- /dev/null +++ b/sci-mathematics/flocq/flocq-4.1.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multiprocessing + +DESCRIPTION="Formalization of floating-point arithmetic for the Coq proof assistant" +HOMEPAGE="http://flocq.gforge.inria.fr/ + https://gitlab.inria.fr/flocq/flocq/" +SRC_URI="https://flocq.gitlabpages.inria.fr/releases/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-lang/ocaml:= + >=sci-mathematics/coq-8.12:= +" +DEPEND="${RDEPEND}" + +# Do not complain about CFLAGS etc since ML projects do not use them. +QA_FLAGS_IGNORED='.*' + +src_compile() { + ./remake --jobs=$(makeopts_jobs) || die +} + +src_install() { + DESTDIR="${D}" ./remake install || die + + dodoc AUTHORS INSTALL.md NEWS.md README.md + + insinto /usr/share/${PN} + doins -r examples +} diff --git a/sci-mathematics/form/Manifest b/sci-mathematics/form/Manifest index 49efa7363065..e7450d4bc95c 100644 --- a/sci-mathematics/form/Manifest +++ b/sci-mathematics/form/Manifest @@ -1,3 +1,3 @@ -DIST form-4.2.1.tar.gz 1444257 BLAKE2B 27ac9ee1412e6f478324b170e37e6e31822b74f902a5739d5fa00558aa4c9f7a977bd5fe3d6982313f1232a774c592d44af07fec8a290266c31bf3a100e87d1a SHA512 5569ae3e487194b0d082f4a032fb4b8d57238218d92d9b04d5f51db2a73e065eb1efdc26011bda46723e902fa3f324010ca2f8e91ba9a077e87b0a07b40cf594 DIST form-4.3.0.tar.gz 1457721 BLAKE2B 029c62b0e1d92cf66be0290e45467e9de47f8ac9a593e7d012c13d877fb84aa1a212bb99b7a1a7b8b5b04c4cb056b58da80812faf5f0af5d33629c7632768ae6 SHA512 3f7f9cabf37d33fce0dcb7e091ac5ce60412ebe840fcea432655ab7f0c86c620200d60df085af3011d92d8057d9501583f16686257e5d097f6d0571d7f1b6742 +DIST form-4.3.1.tar.gz 1470480 BLAKE2B 210ff3b97a18a495c2d81de0cba7945d9c5a8e5e2ab3dc833ed01fedf701c15f459f0e1b171597d1997b892916a571295407eea75a631b83ce49c0b52e343c85 SHA512 7fdf925b4843e2a853340fc74cc9cf1b603100ddcab2c6ac3752a18e646296761e2c9ee3036a098e2168800f10b4e9a8512b6c871d6d61b5505c3403be9bbdad DIST form-mode.el.gz 6657 BLAKE2B 41d014e4ca8036249d53f5361012095e2ed2ef5e43543ba809a058f0ed241bd3ec984d9b61ab13a5b447faf07decf4e696362f24cacea3af5870cccdf43b1415 SHA512 aa81cc9c45a90af982179d56b874de0d152538653242ea028450675ab8421df2e0d53988c7efa3527845dae145c8047b71574191eedd90511fa89ad812851e25 diff --git a/sci-mathematics/form/form-4.3.0-r1.ebuild b/sci-mathematics/form/form-4.3.0-r1.ebuild index abdbf0481b5f..d3d5800ac1e2 100644 --- a/sci-mathematics/form/form-4.3.0-r1.ebuild +++ b/sci-mathematics/form/form-4.3.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools toolchain-funcs elisp-common +inherit autotools flag-o-matic toolchain-funcs elisp-common DESCRIPTION="Symbolic Manipulation System" HOMEPAGE="https://www.nikhef.nl/~form/ https://github.com/vermaseren/form/" @@ -34,6 +34,9 @@ src_prepare() { } src_configure() { + # Workaround for GCC -fchecking ICE, bug #904339 + append-cxxflags $(test-flags-CXX -Wno-uninitialized) + econf \ --enable-scalar \ --enable-largefile \ diff --git a/sci-mathematics/form/form-4.2.1.ebuild b/sci-mathematics/form/form-4.3.1.ebuild index e2728c87d4f6..d3d5800ac1e2 100644 --- a/sci-mathematics/form/form-4.2.1.ebuild +++ b/sci-mathematics/form/form-4.3.1.ebuild @@ -1,27 +1,31 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs elisp-common DESCRIPTION="Symbolic Manipulation System" HOMEPAGE="https://www.nikhef.nl/~form/ https://github.com/vermaseren/form/" -SRC_URI="https://github.com/vermaseren/${PN}/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/vermaseren/${PN}/releases/download/v${PV}/${P}.tar.gz + emacs? ( https://dev.gentoo.org/~grozin/form-mode.el.gz )" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="devref doc doxygen gmp mpi threads zlib" +IUSE="devref doc doxygen emacs gmp mpi threads zlib" RDEPEND=" gmp? ( dev-libs/gmp:0= ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} - devref? ( dev-texlive/texlive-latex ) - doc? ( dev-texlive/texlive-latex ) - doxygen? ( app-doc/doxygen )" + devref? ( dev-texlive/texlive-latexrecommended ) + doc? ( dev-texlive/texlive-latexrecommended ) + doxygen? ( app-doc/doxygen ) + emacs? ( app-editors/emacs:* )" + +SITEFILE="64${PN}-gentoo.el" src_prepare() { default @@ -30,6 +34,9 @@ src_prepare() { } src_configure() { + # Workaround for GCC -fchecking ICE, bug #904339 + append-cxxflags $(test-flags-CXX -Wno-uninitialized) + econf \ --enable-scalar \ --enable-largefile \ @@ -51,12 +58,12 @@ src_compile() { default if use devref; then pushd doc/devref > /dev/null || die "doc/devref does not exist" - LANG=C emake pdf + LANG=C VARTEXFONTS="${T}/fonts" emake pdf popd > /dev/null fi if use doc; then pushd doc/manual > /dev/null || die "doc/manual does not exist" - LANG=C emake pdf + LANG=C VARTEXFONTS="${T}/fonts" emake pdf popd > /dev/null fi if use doxygen; then @@ -78,4 +85,16 @@ src_install() { docinto html dodoc -r doc/doxygen/html/. fi + if use emacs; then + elisp-install ${PN} "${WORKDIR}"/*.el + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen } diff --git a/sci-mathematics/form/metadata.xml b/sci-mathematics/form/metadata.xml index d3a49a10ffe2..ad5766269fa2 100644 --- a/sci-mathematics/form/metadata.xml +++ b/sci-mathematics/form/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>grozin@gentoo.org</email> + <name>Andrey Grozin</name> + </maintainer> <maintainer type="project"> <email>sci-mathematics@gentoo.org</email> <name>Gentoo Mathematics Project</name> diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest index d23c3bae95e9..276c12bbc607 100644 --- a/sci-mathematics/fricas/Manifest +++ b/sci-mathematics/fricas/Manifest @@ -1,2 +1 @@ -DIST fricas-1.3.7-full.tar.bz2 38008318 BLAKE2B 079a0e2739c0f28c7fb76681e9562802cd7d6f16a0a0bcd8310bb11a6678b2aeabca9cc8effdf81d9464742bf4a20d07845f870717326afbd87feb48fe408493 SHA512 fd3742eb56c279adcdbae62a8eb5843781d0da4318f1b6e55310a9ac243c712b24fef214414c8d656b222be890ec4d9d30ad243b77b8eeaeea95e0ae3dda890a DIST fricas-1.3.8-full.tar.bz2 10878913 BLAKE2B 214eecd430a2b758a10d985f512f3c79f6b12de35bc29e8f0a3fd296fe871b2e9a6b362060cbeec317dc355bd3c661fcab44087feeaa092fe6afcdebd0fb94a8 SHA512 330554f9dc36b47451195e3dee88fe26a80ab2bf9b6750d651cd53c5ba16b9c9736176936c7c69e699685be25aa62b6a099ed7340913e946a4f5e53579835dbb diff --git a/sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch b/sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch new file mode 100644 index 000000000000..f5dd949abaa2 --- /dev/null +++ b/sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch @@ -0,0 +1,18 @@ +diff --git a/src/lisp/fricas-package.lisp b/src/lisp/fricas-package.lisp +index c0dfc4ef5..37e1afc1e 100644 +--- a/src/lisp/fricas-package.lisp ++++ b/src/lisp/fricas-package.lisp +@@ -34,7 +34,12 @@ + #+gcl + (shadow "QUIT") + +-(do-symbols (x "FRICAS-LISP") (export (list x))) ++;;; We use uninterned symbols because at this point we do not ++;;; want to add symbols to FRICAS-LISP ++(let ((#1=#:ls nil)) ++ (do-symbols (#2=#:el "FRICAS-LISP") (setf #1# (cons #2# #1#))) ++ (mapcar (lambda (#3=#:x) (export (list #3#))) #1#) ++) + + (export '(quit chdir |getEnv| |getCLArgs| |load_quietly| get-current-directory + trim-directory-name pad-directory-name diff --git a/sci-mathematics/fricas/fricas-1.3.7.ebuild b/sci-mathematics/fricas/fricas-1.3.7.ebuild deleted file mode 100644 index eefad5493a0a..000000000000 --- a/sci-mathematics/fricas/fricas-1.3.7.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit multilib elisp-common - -DESCRIPTION="FriCAS is a fork of Axiom computer algebra system" -HOMEPAGE="http://fricas.sourceforge.net/ - https://github.com/fricas/fricas - https://fricas.github.io/" -SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# Supported lisps, number 0 is the default -LISPS=( sbcl cmucl gcl ecls clisp clozurecl ) -# Version restrictions, . means no restrictions -REST=( . . . . . . ) -# command name: . means just ${LISP} -COMS=( . lisp . ecl . ccl ) - -IUSE="${LISPS[*]} X emacs gmp" -RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE ) - emacs? ( >=app-editors/emacs-23.1:* ) - gmp? ( dev-libs/gmp:= )" - -# Generating lisp deps -n=${#LISPS[*]} -for ((n--; n > 0; n--)); do - LISP=${LISPS[$n]} - if [ "${REST[$n]}" = "." ]; then - DEP="dev-lisp/${LISP}" - else - DEP="${REST[$n]}" - fi - RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? (" -done -if [ "${REST[0]}" = "." ]; then - DEP="dev-lisp/${LISPS[0]}" -else - DEP="${REST[0]}" -fi -RDEPEND="${RDEPEND} ${DEP}:=" -n=${#LISPS[*]} -for ((n--; n > 0; n--)); do - RDEPEND="${RDEPEND} )" -done - -DEPEND="${RDEPEND}" - -# necessary for clisp and gcl -RESTRICT="strip" - -src_configure() { - local LISP n GMP - LISP=sbcl - n=${#LISPS[*]} - for ((n--; n > 0; n--)); do - if use ${LISPS[$n]}; then - LISP=${COMS[$n]} - if [ "${LISP}" = "." ]; then - LISP=${LISPS[$n]} - fi - fi - done - einfo "Using lisp: ${LISP}" - - # bug #650788 - if [[ ${LISP} = sbcl || ${LISP} = ccl ]] - then GMP=$(use_with gmp) - else GMP='' - fi - - # aldor is not yet in portage - econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP} -} - -src_compile() { - # bug #300132 - emake -j1 -} - -src_test() { - emake -j1 all-input -} - -src_install() { - emake -j1 DESTDIR="${D}" install - dodoc README.rst FAQ - - if use emacs; then - sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \ - -i "${D}"/usr/bin/efricas \ - || die "sed efricas failed" - elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el - elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el - else - rm "${D}"/usr/bin/efricas || die "rm efricas failed" - fi - rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed" -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/fricas/fricas-1.3.8.ebuild b/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild index 2d11d0c22808..056e10ba687e 100644 --- a/sci-mathematics/fricas/fricas-1.3.8.ebuild +++ b/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,9 +30,9 @@ n=${#LISPS[*]} for ((n--; n > 0; n--)); do LISP=${LISPS[$n]} if [ "${REST[$n]}" = "." ]; then - DEP="dev-lisp/${LISP}" + DEP="dev-lisp/${LISP}" else - DEP="${REST[$n]}" + DEP="${REST[$n]}" fi RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? (" done @@ -52,6 +52,8 @@ DEPEND="${RDEPEND}" # necessary for clisp and gcl RESTRICT="strip" +PATCHES=( "${FILESDIR}"/${PN}-sbcl-2.3.2.patch ) + src_configure() { local LISP n GMP LISP=sbcl diff --git a/sci-mathematics/gappalib-coq/Manifest b/sci-mathematics/gappalib-coq/Manifest index 77c1b5979ea9..c717d3e5a5aa 100644 --- a/sci-mathematics/gappalib-coq/Manifest +++ b/sci-mathematics/gappalib-coq/Manifest @@ -1 +1,2 @@ DIST gappalib-coq-1.5.2.tar.gz 115236 BLAKE2B a2515d488e229cfe8dd44ac3508af9b8e0ad96dda7cb4ffdbea7f4d75e97a3263c29a043b6484351df995129c77af9af11d3c226dd4f63630816f50a9a50639a SHA512 4b3d8dcb5d97a5fb9fad9d9997eb1f19a62262ea930e157e10dd06ef7f99cc45a25a024f03ce984ebd0d142edd62dbbdbd832a4da41ea5eb8ea3287c7109dda2 +DIST gappalib-coq-1.5.3.tar.gz 119795 BLAKE2B c66eecbc32c0559cb4b818ad86f31bd3a29e90389f8fd98adf61426025b0d60b2919075487d4d8aa50c8b020909ed5d9f121c0ca516a5320b5a1246b6278ced4 SHA512 2a40386371bb3e940383e7568bf49b60ffc1d941a8aa7efd24bb88afa70d6cbdc8ed23ab849f2dbfb3add5055131ddebdb1df05840ed62f27dfd3caefc31e72f diff --git a/sci-mathematics/gappalib-coq/gappalib-coq-1.5.2.ebuild b/sci-mathematics/gappalib-coq/gappalib-coq-1.5.2-r1.ebuild index 6bf57a25ef10..5b11673ef1d8 100644 --- a/sci-mathematics/gappalib-coq/gappalib-coq-1.5.2.ebuild +++ b/sci-mathematics/gappalib-coq/gappalib-coq-1.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,10 +13,12 @@ SRC_URI="https://gappa.gitlabpages.inria.fr/releases/${P}.tar.gz" LICENSE="LGPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="ocamlopt" RDEPEND=" - >=sci-mathematics/coq-8.12 - sci-mathematics/flocq + dev-lang/ocaml:=[ocamlopt?] + >=sci-mathematics/coq-8.12:= + sci-mathematics/flocq:= sci-mathematics/gappa " DEPEND="${RDEPEND}" diff --git a/sci-mathematics/gappalib-coq/gappalib-coq-1.5.3.ebuild b/sci-mathematics/gappalib-coq/gappalib-coq-1.5.3.ebuild new file mode 100644 index 000000000000..5b11673ef1d8 --- /dev/null +++ b/sci-mathematics/gappalib-coq/gappalib-coq-1.5.3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multiprocessing + +DESCRIPTION="Allows the certificates Gappa generates to be imported by the Coq" +HOMEPAGE="https://gappa.gitlabpages.inria.fr/ + https://gitlab.inria.fr/gappa/coq/" +SRC_URI="https://gappa.gitlabpages.inria.fr/releases/${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ocamlopt" + +RDEPEND=" + dev-lang/ocaml:=[ocamlopt?] + >=sci-mathematics/coq-8.12:= + sci-mathematics/flocq:= + sci-mathematics/gappa +" +DEPEND="${RDEPEND}" +BDEPEND="dev-ml/findlib" + +# Do not complain about CFLAGS etc since ML projects do not use them. +QA_FLAGS_IGNORED='.*' + +src_compile() { + ./remake --jobs=$(makeopts_jobs) || die +} + +src_test() { + ./remake --jobs=$(makeopts_jobs) check || die +} + +src_install() { + DESTDIR="${D}" ./remake install || die + + dodoc AUTHORS INSTALL.md NEWS.md README.md +} diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest index 1da9f835f5de..56613b5a6eaa 100644 --- a/sci-mathematics/ginac/Manifest +++ b/sci-mathematics/ginac/Manifest @@ -1,3 +1 @@ -DIST ginac-1.7.11.tar.bz2 1077491 BLAKE2B 741e9c8adfec15c225c3656b935707f86292b98310b50533269b238d1a9746bf54d186074c879fdbdd23f915dde225d9ee34fdbd87977835e8f9e78af364d77d SHA512 35a029915c946fcc10ba7b78df6fe1ece9a9f2f6bc172816a923c35f5b495154ab356526b904ac2a16a1bd6b0a81c480c5abb39ef40238ca7b32d1acbf97276c -DIST ginac-1.8.0.tar.bz2 1124136 BLAKE2B 087c286f621ca5502c54c1765d948f0549a60668fd610bd16ea627af2f4056b13331097768771a0ac14807212de59b132608dc615bf2618dd487a9478dbf5a83 SHA512 6cacd0d87ffae24118f2fbaed4d201ee2d3812a751becef1982308e91cf489543db14443439da9333f3620dc5c8b1c32587e1aff0bed69e6e334310dc64edf49 -DIST ginac-1.8.2.tar.bz2 1142428 BLAKE2B 9322ac30cd73c5290b68503a277c43751728a8d774655398038023d87796e35b8d98dff968a14faf162969877ef335b383adfb3fe695dda1357fb0208cba424a SHA512 fc471cdc12b3c2597e4deb65dcca83fc9050c8a2d07a19baf605b060efe9facc9b9ffe824676c8489bdebb6f125f1052f313394d95cc2a91c29b00a45cbc403a +DIST ginac-1.8.6.tar.bz2 1152914 BLAKE2B 3d3d655cde0f5444fa01b0dde62a48d3c42b5a3b27e00d9608c56677fd031e639b7e4e6ac7c6cf68f807033cbe81432148d5525d76ad176b8dcd0d80aece07a1 SHA512 b10402d722e8216374dabdee9eba9e6de3b6afebd291a368697eb8efcd0eb8148237628bfb74713771c99977ccc46d972bacccaead3fcf35a1ab328744a7fb48 diff --git a/sci-mathematics/ginac/files/ginac-1.5.1-pkgconfig.patch b/sci-mathematics/ginac/files/ginac-1.5.1-pkgconfig.patch deleted file mode 100644 index 5a6784d6b802..000000000000 --- a/sci-mathematics/ginac/files/ginac-1.5.1-pkgconfig.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- ginac-1.4.4.org/ginac.pc.in 2009-03-16 21:17:22.000000000 +0530 -+++ ginac-1.4.4/ginac.pc.in 2009-03-16 21:25:28.000000000 +0530 -@@ -7,5 +7,5 @@ - Description: C++ library for symbolic calculations - Version: @VERSION@ - Requires: cln >= 1.1.6 --Libs: -L${libdir} -lginac @GINACLIB_RPATH@ -+Libs: -L${libdir} -lginac - Cflags: -I${includedir} diff --git a/sci-mathematics/ginac/files/ginac-1.8.6-unicode.patch b/sci-mathematics/ginac/files/ginac-1.8.6-unicode.patch new file mode 100644 index 000000000000..d7e4491f7434 --- /dev/null +++ b/sci-mathematics/ginac/files/ginac-1.8.6-unicode.patch @@ -0,0 +1,12 @@ +diff -r -U3 ginac-1.8.6.orig/ginac/numeric.cpp ginac-1.8.6/ginac/numeric.cpp +--- ginac-1.8.6.orig/ginac/numeric.cpp 2023-02-08 06:02:38.000000000 +0700 ++++ ginac-1.8.6/ginac/numeric.cpp 2023-02-17 16:13:45.137824611 +0700 +@@ -2139,7 +2139,7 @@ + /** The Binomial coefficients. It computes the binomial coefficients. For + * integer n and k and positive n this is the number of ways of choosing k + * objects from n distinct objects. If n is a negative integer, the formula +- * binomial(n,k) == (-1)^k*binomial(k-n-1,k) (if k≥0) ++ * binomial(n,k) == (-1)^k*binomial(k-n-1,k) (if k>=0) + * binomial(n,k) == (-1)^(n-k)*binomial(-k-1,n-k) (otherwise) + * is used to compute the result. */ + const numeric binomial(const numeric &n, const numeric &k) diff --git a/sci-mathematics/ginac/ginac-1.7.11.ebuild b/sci-mathematics/ginac/ginac-1.7.11.ebuild deleted file mode 100644 index 274bb38cdad8..000000000000 --- a/sci-mathematics/ginac/ginac-1.7.11.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_9 ) - -inherit python-any-r1 - -DESCRIPTION="C++ library and tools for symbolic calculations" -SRC_URI="http://www.ginac.de/${P}.tar.bz2" -HOMEPAGE="https://www.ginac.de/" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="doc examples" - -RDEPEND=">=sci-libs/cln-1.2.2" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-texlive/texlive-fontsrecommended - media-gfx/transfig - virtual/texi2dvi - )" - -PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch ) - -src_configure() { - econf \ - --disable-rpath \ - --disable-static -} - -src_compile() { - emake - - if use doc; then - local -x VARTEXFONTS="${T}"/fonts - emake -C doc/reference html pdf - emake -C doc/tutorial ginac.pdf ginac.html - fi -} - -src_install() { - default - - if use doc; then - pushd doc >/dev/null || die - newdoc tutorial/ginac.pdf tutorial.pdf - newdoc reference/reference.pdf reference.pdf - - docinto html/reference - dodoc -r reference/html_files/. - - docinto html - newdoc tutorial/ginac.html tutorial.html - popd >/dev/null || die - fi - - if use examples; then - pushd doc >/dev/null || die - docinto examples - dodoc examples/*.cpp examples/ginac-examples.* - docompress -x /usr/share/doc/${PF}/examples - popd >/dev/null || die - fi - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-mathematics/ginac/ginac-1.8.0.ebuild b/sci-mathematics/ginac/ginac-1.8.0.ebuild deleted file mode 100644 index 40379de9aa16..000000000000 --- a/sci-mathematics/ginac/ginac-1.8.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_9 ) - -inherit python-any-r1 - -DESCRIPTION="C++ library and tools for symbolic calculations" -SRC_URI="http://www.ginac.de/${P}.tar.bz2" -HOMEPAGE="https://www.ginac.de/" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples" - -RDEPEND=">=sci-libs/cln-1.2.2" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-texlive/texlive-fontsrecommended - media-gfx/transfig - virtual/texi2dvi - )" - -PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch ) - -src_configure() { - econf \ - --disable-rpath \ - --disable-static -} - -src_compile() { - emake - - if use doc; then - local -x VARTEXFONTS="${T}"/fonts - emake -C doc/reference html pdf - emake -C doc/tutorial ginac.pdf ginac.html - fi -} - -src_install() { - default - - if use doc; then - pushd doc >/dev/null || die - newdoc tutorial/ginac.pdf tutorial.pdf - newdoc reference/reference.pdf reference.pdf - - docinto html/reference - dodoc -r reference/html_files/. - - docinto html - newdoc tutorial/ginac.html tutorial.html - popd >/dev/null || die - fi - - if use examples; then - pushd doc >/dev/null || die - docinto examples - dodoc examples/*.cpp examples/ginac-examples.* - docompress -x /usr/share/doc/${PF}/examples - popd >/dev/null || die - fi - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-mathematics/ginac/ginac-1.8.2.ebuild b/sci-mathematics/ginac/ginac-1.8.6.ebuild index 318ae8355629..0bd93e779910 100644 --- a/sci-mathematics/ginac/ginac-1.8.2.ebuild +++ b/sci-mathematics/ginac/ginac-1.8.6.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-any-r1 @@ -29,7 +29,7 @@ BDEPEND=" virtual/texi2dvi )" -PATCHES=( "${FILESDIR}"/${PN}-1.8.2-pkgconfig.patch ) +PATCHES=( "${FILESDIR}"/${PN}-1.8.2-pkgconfig.patch "${FILESDIR}"/${PN}-1.8.6-unicode.patch ) src_configure() { econf \ diff --git a/sci-mathematics/ginac/metadata.xml b/sci-mathematics/ginac/metadata.xml index 7c3134727fb2..77b4449763bb 100644 --- a/sci-mathematics/ginac/metadata.xml +++ b/sci-mathematics/ginac/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>grozin@gentoo.org</email> + <name>Andrey Grozin</name> + </maintainer> <maintainer type="project"> <email>sci-mathematics@gentoo.org</email> <name>Gentoo Mathematics Project</name> diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index b02c398a95be..4035b2d2c2a9 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig" diff --git a/sci-mathematics/gmm/gmm-5.4.ebuild b/sci-mathematics/gmm/gmm-5.4.ebuild index b4afeb5c5595..8bac1a827bb2 100644 --- a/sci-mathematics/gmm/gmm-5.4.ebuild +++ b/sci-mathematics/gmm/gmm-5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ HOMEPAGE="http://getfem.org/gmm.html" LICENSE="|| ( LGPL-3 LGPL-3-with-linking-exception )" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" src_configure() { diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild index d3b81e1bc203..4c5cc18e67fa 100644 --- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild +++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc9220 LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~ppc-macos ~x64-macos" IUSE="+custom-tune openmp cpu_flags_x86_sse2" DEPEND="dev-libs/gmp:=" diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest index 949bd19ffb3e..3c8d0e70418b 100644 --- a/sci-mathematics/gsl-shell/Manifest +++ b/sci-mathematics/gsl-shell/Manifest @@ -1 +1,2 @@ DIST gsl-shell-2.3.2.tar.gz 3400376 BLAKE2B 8218b4d3232048fe7575631c7acc66d313520ee4d41a1dd2c267f021c8271a427673a575cc00f8f55a4868b8ec5e9626c0cbaa6ea9fa76662a726e436a527cf3 SHA512 6379380ab15a7ec477d67d36305ce76c551d32e88d8611447eeb6deaf9877c362392bce45599a2b2988331064c22626260c41f8548624c23e2c4e3c59c87c291 +DIST gsl-shell-2.3.5.tar.gz 2533145 BLAKE2B 9eec5ee0676429a08b628766450f366b6998c4fc14e6b3108c49a9bf2ef4019c9b7671edbb0def295849155676df6c2bc8975aacb4ff906befc243bed147d80c SHA512 9712714a6cce249b007e475916d870eb2ce8bbc4ab2f0e49b8644378243723c9a386c285eacf5a8c54e27e22bab63fb0cd74d4641652230a8682c201b7e63da8 diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.5-no-fetching.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.5-no-fetching.patch new file mode 100644 index 000000000000..7ab67369b849 --- /dev/null +++ b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.5-no-fetching.patch @@ -0,0 +1,64 @@ +diff --git a/meson.build b/meson.build +index 41f7e93..faf6e0d 100644 +--- a/meson.build ++++ b/meson.build +@@ -14,7 +14,7 @@ if host_machine.system() == 'darwin' + gsl_shell_defines += '-DDARWIN_MACOSX' + endif + +-gsl_shell_link_args = [] ++gsl_shell_link_args = ['-laggplatformX11'] + cc = meson.get_compiler('c') + if cc.get_id() == 'gcc' and get_option('buildtype') == 'release' + gsl_shell_link_args += ['-static-libgcc', '-static-libstdc++'] +@@ -25,19 +25,18 @@ cpp_utils_include = include_directories('src/cpp-utils') + + threads_dep = dependency('threads') + freetype_dep = dependency('freetype2') +-fox_dep = dependency('fox') +-libagg_dep = dependency('libagg', fallback: ['libagg', 'libagg_dep']) ++fox_dep = dependency('fox17') ++libagg_dep = dependency('libagg', 'libaggplatformX11', fallback: ['libagg', 'libagg_dep']) ++libX11_dep = dependency('X11') + +-luajit_proj = subproject('luajit', default_options: ['default_library=static', 'app=false', 'portable=true', 'shortfnsyn=true']) +-luajit_dep = luajit_proj.get_variable('lua_dep') ++luajit_dep = dependency('luajit') + + libgsl_options = ['default_library=static', 'blas=' + get_option('blas')] + foreach module_name : ['siman', 'wavelet', 'sparse', 'ode', 'monte', 'integ', 'min', 'fit'] + libgsl_options += module_name + '=false' + endforeach + +-libgsl_proj = subproject('gsl', default_options: libgsl_options) +-libgsl_dep = libgsl_proj.get_variable('libgsl_dep').as_link_whole() ++libgsl_dep = dependency('gsl') + + gsl_shell_bindir = 'bin' + gsl_shell_datadir = 'share/gsl-shell' +diff --git a/src/console/meson.build b/src/console/meson.build +index 2f5a3dc..3dfe7a5 100644 +--- a/src/console/meson.build ++++ b/src/console/meson.build +@@ -1,7 +1,7 @@ + # Readline not supported with meson build. + + executable('gsl-shell', 'gsl-shell-jit.c', +- dependencies: [libgsl_dep, libagg_dep, threads_dep, freetype_dep, luajit_dep], ++ dependencies: [libX11_dep, libgsl_dep, libagg_dep, threads_dep, freetype_dep, luajit_dep], + include_directories: gsl_shell_include, + cpp_args: gsl_shell_defines, + link_with: [libluagsl, libaggplot, libgdt], +diff --git a/src/fox-gui/meson.build b/src/fox-gui/meson.build +index 8f55259..fecefd7 100644 +--- a/src/fox-gui/meson.build ++++ b/src/fox-gui/meson.build +@@ -13,7 +13,7 @@ foxgui_sources = [ + + executable('gsl-shell-gui', + foxgui_sources, +- dependencies: [libgsl_dep, libagg_dep, threads_dep, freetype_dep, luajit_dep, fox_dep], ++ dependencies: [libX11_dep, libgsl_dep, libagg_dep, threads_dep, freetype_dep, luajit_dep, fox_dep], + include_directories: [gsl_shell_include, cpp_utils_include], + cpp_args: gsl_shell_defines + fox_gui_defines, + link_with: [libluagsl, libaggplot, libgdt], diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.3.5.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.3.5.ebuild new file mode 100644 index 000000000000..aaa1e8873371 --- /dev/null +++ b/sci-mathematics/gsl-shell/gsl-shell-2.3.5.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DOCS_BUILDER="sphinx" +DOCS_DIR="doc/user-manual" +DOCS_AUTODOC=0 + +inherit meson python-any-r1 docs + +MY_P=${P/_/-} + +DESCRIPTION="Lua interactive shell for sci-libs/gsl" +HOMEPAGE="https://www.nongnu.org/gsl-shell/" +SRC_URI="https://github.com/franko/gsl-shell/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +SLOT="0" +LICENSE="GPL-3" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=sci-libs/gsl-1.14:= + virtual/blas[eselect-ldso] + >=x11-libs/agg-2.5[X] + >=media-libs/freetype-2.4.10 + sys-libs/readline:0= + || ( media-fonts/ubuntu-font-family media-fonts/freefont media-fonts/dejavu ) + x11-libs/fox:1.7 + x11-libs/libX11 +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/luajit + virtual/pkgconfig + doc? ( virtual/latex-base ) +" + +PATCHES=( + "${FILESDIR}/${P}-no-fetching.patch" +) + +src_compile() { + meson_src_compile + docs_compile +} diff --git a/sci-mathematics/gsl-shell/metadata.xml b/sci-mathematics/gsl-shell/metadata.xml index 86a8f8253446..74456c83ce16 100644 --- a/sci-mathematics/gsl-shell/metadata.xml +++ b/sci-mathematics/gsl-shell/metadata.xml @@ -17,4 +17,7 @@ of easily access GSL functions without having to write a complete C application. <use> <flag name="fox">Build a <pkg>x11-libs/fox</pkg> GUI</flag> </use> + <upstream> + <remote-id type="github">franko/gsl-shell</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-mathematics/kind2/Manifest b/sci-mathematics/kind2/Manifest new file mode 100644 index 000000000000..f687573f8c7e --- /dev/null +++ b/sci-mathematics/kind2/Manifest @@ -0,0 +1 @@ +DIST kind2-1.9.0.tar.gz 2009655 BLAKE2B 531e019cd9cd6edf5799b4283c56eda677dd16e6feec5ab8047d30cf5399a94789b0fd9b39e1fc83a1794a9cf496657d7a3c5eb156a9d4c8358e8a00057504f3 SHA512 c2b441aed01e1e95ddc0ad59b0097d58b4c90a1cf04adcc3ec27d1383937dddac1999825eb3d02f81e3f9f4d146c8b5f2e9f2b315317b0566f91867bbb3e528a diff --git a/sci-mathematics/kind2/kind2-1.9.0.ebuild b/sci-mathematics/kind2/kind2-1.9.0.ebuild new file mode 100644 index 000000000000..012c60845bd5 --- /dev/null +++ b/sci-mathematics/kind2/kind2-1.9.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Multi-engine SMT-based automatic model checker" +HOMEPAGE="https://kind2-mc.github.io/kind2/ + https://github.com/kind2-mc/kind2/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kind2-mc/${PN}.git" +else + SRC_URI="https://github.com/kind2-mc/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-ml/menhir:= + dev-ml/num:= + dev-ml/yojson:= + dev-ml/zmq:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-ml/dune-build-info + test? ( dev-ml/ounit2 ) +" diff --git a/sci-mathematics/kind2/metadata.xml b/sci-mathematics/kind2/metadata.xml new file mode 100644 index 000000000000..faf6e30c3a71 --- /dev/null +++ b/sci-mathematics/kind2/metadata.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <maintainer type="project"> + <email>sci-mathematics@gentoo.org</email> + <name>Gentoo Mathematics Project</name> + </maintainer> + <longdescription> + Kind 2 is an open-source, multi-engine, SMT-based automatic model checker + for safety properties of finite-state or infinite-state synchronous + reactive systems expressed as in an extension of the Lustre language. In + its basic configuration it takes as input one or more Lustre files + annotated with properties to be proven invariant, and outputs for each + property either a confirmation or a counterexample, i.e., a sequence inputs + that falsifies the property. More advanced features include contract-based + compositional verification, proof generation for proven properties, and + contract-based test generation. + </longdescription> + <upstream> + <bugs-to>https://github.com/kind2-mc/kind2/issues/</bugs-to> + <remote-id type="github">kind2-mc/kind2</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-mathematics/kissat/kissat-3.0.0.ebuild b/sci-mathematics/kissat/kissat-3.0.0.ebuild index 3c36cf0cd9ef..4c1fed10488f 100644 --- a/sci-mathematics/kissat/kissat-3.0.0.ebuild +++ b/sci-mathematics/kissat/kissat-3.0.0.ebuild @@ -16,6 +16,8 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" +RDEPEND="!>=x11-terms/kitty-0.27" + src_configure() { local myopts=( CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest index 5e1584ea3d0d..a7e68689fb92 100644 --- a/sci-mathematics/lean/Manifest +++ b/sci-mathematics/lean/Manifest @@ -1,4 +1,4 @@ DIST lean-3.49.0.tar.gz 1918154 BLAKE2B 9f9973d00d2d5d5b7d26d50117c27754feb5132e88decd55859432a384dac2897184dcf8d841ad0034854657ac25e462dc69cdbe1cf2040787d108bb7e1370f4 SHA512 b4672843c2e923da8d56b91c14966fc2ec66c573564d68db9c52f9b40f2c97d82497f2ef6424b023c4ae50f6f0c11674e2d79053844ea669d226d0fe24077ade -DIST lean-3.50.1.tar.gz 1918323 BLAKE2B 3a26a6481a8472941a928a7b33b24231239e553cd4a4af5671f6a05f1fa68a54657518c4775b641239aa55401100e44c2797d7ae572405225657f1f7da8e193c SHA512 df2e5915e8a7f7e278e2d3472afe6cc23fec5de808b0cc1b20365ad41cfd03b1efda80523059a96c6b3d9b8b0ccab311700ee6a5d6c9751454ebe3b2f168cf77 -DIST lean-3.50.2.tar.gz 1918353 BLAKE2B 2a8c41eef0cc3c2d3e1b45ccd2383279a1a91c0de772c5fe3f1ffafc808db4b6e7342f2f72bd4c4120ed4248d60359c6e331f4adc1d26c6328b284549861c4de SHA512 58d085deb0354db0067e86e6097dad7f1543f356d4e50607b8cc049a19d867aa7ea03553bab3799c6ad18d0ef4fa468b0f966512d8bf0076526f90e93195a407 DIST lean-3.50.3.tar.gz 1918462 BLAKE2B f8cb3857989e4966c12a9b4f4a13403ceab0ae9d33ddf81970ef886fb1f46bfd14bfc15aea498ea360cc801224c60489f0ce3b33fe10bead4dcbf3f6a06eee93 SHA512 849b9e8854585ce119f87e8bea655bcb834f1f986bccbf5ffa148fd4a1aae2030b6be938adbf377f0076361a3d9338802e1af8965f01b9c4d2a0517be330beef +DIST lean-3.51.0.tar.gz 1918905 BLAKE2B 83131417011d89846084608fc9b6b5b8254584da63b2e2d7626064a170c3bd3780973483ce60afc49713df840e150c4ed92951bfd7fbdeb520791e58164313cd SHA512 712c5520d298cf7098f5e5d787ba91096d73ba08a15581f4478836c7790679950a1a0b0d7d9c876b1557ae7dc56b10430ac1b4227b5d30ac1ad398e196c2fb11 +DIST lean-3.51.1.tar.gz 1918894 BLAKE2B 9a240fe73193794a57001582c0623052cfc1c08ef3b155cac2d9dfc029202cb79b85e844fdf068e454498a35522ec3e18330da8c644bba3c6f708cbde04816f7 SHA512 dccdf6c3fbcd98115e62b9944645af6a2ce21412d63baa9565871807862e8d83cc6f29d1fb687f19b802240a5f9c019443caa00412ecfabe621744dff900e3ee diff --git a/sci-mathematics/lean/files/lean-3.50.3-gcc-13.patch b/sci-mathematics/lean/files/lean-3.50.3-gcc-13.patch new file mode 100644 index 000000000000..273dd5161080 --- /dev/null +++ b/sci-mathematics/lean/files/lean-3.50.3-gcc-13.patch @@ -0,0 +1,10 @@ +--- a/shell/lean_js_main.cpp ++++ b/shell/lean_js_main.cpp +@@ -4,6 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE. + + Author: Leonardo de Moura + */ ++#include <cstdint> + #include <iostream> + #include <string> + #include "shell/lean_js.h" diff --git a/sci-mathematics/lean/lean-3.50.3.ebuild b/sci-mathematics/lean/lean-3.50.3.ebuild index e008b81cf582..6c8c7551d8ef 100644 --- a/sci-mathematics/lean/lean-3.50.3.ebuild +++ b/sci-mathematics/lean/lean-3.50.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/leanprover-community/lean.git" else SRC_URI="https://github.com/leanprover-community/lean/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi S="${S}/src" @@ -27,7 +27,10 @@ IUSE="debug +threads" RDEPEND="dev-libs/gmp:=" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.50.3-gcc-13.patch + "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch +) src_configure() { local CMAKE_BUILD_TYPE @@ -39,7 +42,7 @@ src_configure() { filter-lto - local mycmakeargs=( + local -a mycmakeargs=( -DALPHA=ON -DAUTO_THREAD_FINALIZATION=ON -DJSON=ON # bug 833900 @@ -51,7 +54,7 @@ src_configure() { } src_test() { - local myctestargs=( + local -a myctestargs=( # Disable problematic "style_check" cpplint test, # this also removes the python test dependency --exclude-regex style_check diff --git a/sci-mathematics/lean/lean-3.50.2.ebuild b/sci-mathematics/lean/lean-3.51.0.ebuild index e008b81cf582..72a23985077c 100644 --- a/sci-mathematics/lean/lean-3.50.2.ebuild +++ b/sci-mathematics/lean/lean-3.51.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,7 +27,10 @@ IUSE="debug +threads" RDEPEND="dev-libs/gmp:=" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.50.3-gcc-13.patch + "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch +) src_configure() { local CMAKE_BUILD_TYPE @@ -39,7 +42,7 @@ src_configure() { filter-lto - local mycmakeargs=( + local -a mycmakeargs=( -DALPHA=ON -DAUTO_THREAD_FINALIZATION=ON -DJSON=ON # bug 833900 @@ -51,7 +54,7 @@ src_configure() { } src_test() { - local myctestargs=( + local -a myctestargs=( # Disable problematic "style_check" cpplint test, # this also removes the python test dependency --exclude-regex style_check diff --git a/sci-mathematics/lean/lean-3.50.1.ebuild b/sci-mathematics/lean/lean-3.51.1.ebuild index e008b81cf582..72a23985077c 100644 --- a/sci-mathematics/lean/lean-3.50.1.ebuild +++ b/sci-mathematics/lean/lean-3.51.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,7 +27,10 @@ IUSE="debug +threads" RDEPEND="dev-libs/gmp:=" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.50.3-gcc-13.patch + "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch +) src_configure() { local CMAKE_BUILD_TYPE @@ -39,7 +42,7 @@ src_configure() { filter-lto - local mycmakeargs=( + local -a mycmakeargs=( -DALPHA=ON -DAUTO_THREAD_FINALIZATION=ON -DJSON=ON # bug 833900 @@ -51,7 +54,7 @@ src_configure() { } src_test() { - local myctestargs=( + local -a myctestargs=( # Disable problematic "style_check" cpplint test, # this also removes the python test dependency --exclude-regex style_check diff --git a/sci-mathematics/lean/lean-3.9999.ebuild b/sci-mathematics/lean/lean-3.9999.ebuild index 307c5b95bc1b..72a23985077c 100644 --- a/sci-mathematics/lean/lean-3.9999.ebuild +++ b/sci-mathematics/lean/lean-3.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ inherit flag-o-matic cmake readme.gentoo-r1 DESCRIPTION="The Lean Theorem Prover" HOMEPAGE="https://leanprover-community.github.io/" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/leanprover-community/lean.git" else @@ -27,7 +27,10 @@ IUSE="debug +threads" RDEPEND="dev-libs/gmp:=" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.50.3-gcc-13.patch + "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch +) src_configure() { local CMAKE_BUILD_TYPE @@ -39,7 +42,7 @@ src_configure() { filter-lto - local mycmakeargs=( + local -a mycmakeargs=( -DALPHA=ON -DAUTO_THREAD_FINALIZATION=ON -DJSON=ON # bug 833900 @@ -51,7 +54,7 @@ src_configure() { } src_test() { - local myctestargs=( + local -a myctestargs=( # Disable problematic "style_check" cpplint test, # this also removes the python test dependency --exclude-regex style_check diff --git a/sci-mathematics/libpoly/libpoly-0.1.11.ebuild b/sci-mathematics/libpoly/libpoly-0.1.11.ebuild index b2e129113f07..f83360e390fa 100644 --- a/sci-mathematics/libpoly/libpoly-0.1.11.ebuild +++ b/sci-mathematics/libpoly/libpoly-0.1.11.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-single-r1 cmake diff --git a/sci-mathematics/lpsolve/Manifest b/sci-mathematics/lpsolve/Manifest index 7b249e4dc266..6f4877b98ae7 100644 --- a/sci-mathematics/lpsolve/Manifest +++ b/sci-mathematics/lpsolve/Manifest @@ -1,2 +1 @@ DIST lp_solve_5.5.2.11_source.tar.gz 556506 BLAKE2B 4c5b53ddadc9db2cbfb78fee141505ced17719f6bd7c780720c6960cc902165c7c3cffbadd048ad5d61ba3951fd65fd6ac08b8d1874dd57c7ac41a168bccd260 SHA512 24f5a14d0c77a71e1ab3f46e08ea3f85f2f116ae2d3d2c54acddc5fb138251ba258240284060827e1b8b7ef15d580acecc242329ec775802fe5e8028407499bc -DIST lpsolve-5.5.2.0.tar.xz 737000 BLAKE2B 912690a7e4ed5fd5d475f322f5c168554fb3d47281545f42d2383ccbe72b3cb0036f72878c94899889972e266e9cf6ad73e59ac1e822deae753ae5b31a00c9b8 SHA512 341bff74dccf805cfd3aa4ee844a51f3c46ce875e88b1bf079a6ff0074f7cbd27420ec9c6a66a2530098a85c967457214543895651f4c570b956324a51bb9fe6 diff --git a/sci-mathematics/lpsolve/lpsolve-5.5.2.0-r1.ebuild b/sci-mathematics/lpsolve/lpsolve-5.5.2.0-r1.ebuild deleted file mode 100644 index 00511e365804..000000000000 --- a/sci-mathematics/lpsolve/lpsolve-5.5.2.0-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Mixed Integer Linear Programming (MILP) solver" -HOMEPAGE="https://sourceforge.net/projects/lpsolve/" -SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" - -DEPEND="sci-libs/colamd" -RDEPEND="${DEPEND}" - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-mathematics/lpsolve/lpsolve-5.5.2.11-r2.ebuild b/sci-mathematics/lpsolve/lpsolve-5.5.2.11-r2.ebuild index adb1c37d72e4..63989ca46f5f 100644 --- a/sci-mathematics/lpsolve/lpsolve-5.5.2.11-r2.ebuild +++ b/sci-mathematics/lpsolve/lpsolve-5.5.2.11-r2.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/lp_solve_$(ver_cut 1-2) LICENSE="LGPL-2.1" SLOT="0/55" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" DEPEND="sci-libs/colamd" RDEPEND="${DEPEND}" diff --git a/sci-mathematics/mathematica/Manifest b/sci-mathematics/mathematica/Manifest index 7a6a8e62ab4a..35f7e055fb48 100644 --- a/sci-mathematics/mathematica/Manifest +++ b/sci-mathematics/mathematica/Manifest @@ -5,4 +5,5 @@ DIST Mathematica_12.2.0_LINUX.sh 4454613844 BLAKE2B 03b0567afe001fd0781ea6daf0f2 DIST Mathematica_13.0.0_BNDL_LINUX.sh 5118155611 BLAKE2B ff15a9def53f7fb808b117ecf2573f415b928c13a86d15634e6282c8f8542b32fa42ff76baeac95faa1242dc4350b0db28231c5cb7f36bc5b57425c2804bf996 SHA512 05008559c531a6920745d0047be0f2c42cb6994309db3f2ee2ad44151655f43d88de063a4952c5ac5544818e2da8973305ee46f44e74d7301da21cdf710cbd5b DIST Mathematica_13.0.1_BNDL_LINUX.sh 5094982487 BLAKE2B 55375b6038422fd5f11db36b33bc1162064c8d6a88575c982ce53b15678bf7b19dc62d66336b2105cbaa18a7fe86ba64f09db40e494c15d558f3ebd92ea025fe SHA512 cf4106202dfcf290f0dbe9e8062457eb705c2802f608e60f2810fc31e166ab60b5726c0c9bf675fadb02f5628af1dc2d25db8d02119dc63381eef8a88cdb6ec6 DIST Mathematica_13.1.0_LINUX.sh 2032362325 BLAKE2B d044fe1ed3c71e6ebc2357c440af6feaeb360962aea32843abbdfe40f124a29bd07bf0c3a5a35f8bac29c97a7d23dbcd79967b6d0028d01e09c9b662fc1f2b95 SHA512 3d84313be4da86d72cc652b0ec7dbbbf6d815debbde4c9ab855f447dda36aeccb416e90d298f0be975ae86fdf55f20aa7597b0d96d291ebdf6e4eb0dc2ca5433 +DIST Mathematica_13.2.1_BNDL_LINUX.sh 5512713048 BLAKE2B 266a6979faab891c6fc10a1bc690ee21ad3af01413a2af29d81c27dffc92d8a10a2947aefe978dfcf16378e8f8f0d33145f99930840eeb2843d73270d2ad0de9 SHA512 2062b2ce7f6e7f33b8623607ef71475091b877112f03ffbc32671f513b71925aad8489f25e1b01ec75b5d4d7bee03bb2dc8b2627f767633de578ecae1d86b7f6 DIST WLDocs_13.1.0_LINUX.sh 3546448755 BLAKE2B e5dbf6bf9cd60a313329df8591c281215039d7efa7c83a53f3b2d4e176765b62efae3ff04628ecf6905e76bbaf6867e87c96bd6188d13df2b981bea5a633335a SHA512 2107b37b30fc76974d040e746ca26ddb5df23bbacb9d8fabcd546a7cf789f1daaf70179c53890bed2385430665f601fbbc1f9829bf64f61068909ea8774f91d2 diff --git a/sci-mathematics/mathematica/mathematica-13.2.1.ebuild b/sci-mathematics/mathematica/mathematica-13.2.1.ebuild new file mode 100644 index 000000000000..d5bae7e2927e --- /dev/null +++ b/sci-mathematics/mathematica/mathematica-13.2.1.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CHECKREQS_DISK_BUILD=20G +inherit check-reqs desktop unpacker xdg + +DESCRIPTION="Wolfram Mathematica" +HOMEPAGE="https://www.wolfram.com/mathematica/" +SRC_URI="Mathematica_${PV}_BNDL_LINUX.sh" +S="${WORKDIR}" + +LICENSE="all-rights-reserved" +KEYWORDS="-* ~amd64" +SLOT="0" +IUSE="cuda doc ffmpeg R" + +RESTRICT="strip mirror bindist fetch" + +# Mathematica comes with a lot of bundled stuff. We should place here only what we +# explicitly override with LD_PRELOAD. +# RLink (libjri.so) requires dev-lang/R +# FFmpegTools (FFmpegToolsSystem-5.0.so) requires media-video/ffmpeg +RDEPEND=" + cuda? ( dev-util/nvidia-cuda-toolkit ) + media-libs/freetype + ffmpeg? ( <media-video/ffmpeg-5 ) + R? ( dev-lang/R ) + virtual/libcrypt +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + dev-util/patchelf +" + +# we need this a few times +MPN="Mathematica" +MPV=$(ver_cut 1-2) +M_BINARIES="MathKernel Mathematica WolframKernel wolframscript math mathematica mcc wolfram" +M_TARGET="opt/Wolfram/${MPN}/${MPV}" + +# we might as well list all files in all QA variables... +QA_PREBUILT="opt/*" + +src_unpack() { + /bin/sh "${DISTDIR}/${A}" --nox11 --keep --target "${S}/unpack_app" -- "-help" || die +} + +src_install() { + local ARCH='-x86-64' + + pushd "${S}/unpack_app" > /dev/null || die + # fix ACCESS DENIED issue when installer generate desktop files + sed -e "s|xdg-desktop-icon|xdg-dummy-command|g" -i "Unix/Installer/MathInstaller" || die + sed -e "s|xdg-desktop-menu|xdg-dummy-command|g" -i "Unix/Installer/MathInstaller" || die + sed -e "s|xdg-icon-resource|xdg-dummy-command|g" -i "Unix/Installer/MathInstaller" || die + sed -e "s|xdg-mime|xdg-dummy-command|g" -i "Unix/Installer/MathInstaller" || die + # fix ACCESS DENIED issue when installer check the avahi-daemon + sed -e "s|avahi-daemon -c|true|g" -i "Unix/Installer/MathInstaller" || die + /bin/sh "Unix/Installer/MathInstaller" -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die + popd > /dev/null || die + + if ! use doc; then + einfo "Removing documentation" + rm -r "${S}/${M_TARGET}/Documentation" || die + fi + + # fix world writable file QA problem for files + while IFS= read -r -d '' i; do + chmod o-w "${i}" || die + done < <(find "${S}/${M_TARGET}" -type f -print0) + + einfo 'Removing MacOS- and Windows-specific files' + find "${S}/${M_TARGET}" -type d -\( -name Windows -o -name Windows-x86-64 \ + -o -name MacOSX -o -name MacOSX-x86-64 -o -name Macintosh -\) \ + -exec rm -rv {} + || die + + if ! use cuda; then + einfo 'Removing cuda support' + rm -r "${S}/${M_TARGET}/SystemFiles/Components/CUDACompileTools/LibraryResources/Linux-x86-64/CUDAExtensions.so" || die + fi + + # Linux-x86-64/AllVersions is the supported version, other versions remove + einfo 'Removing unsupported RLink versions' + rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux-x86-64/3.5.0" || die + rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux-x86-64/3.6.0" || die + rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux/AllVersions" || die + # RLink can't use if R not used + if ! use R; then + einfo 'Removing RLink support' + rm -r "${S}/${M_TARGET}/SystemFiles/Links/RLink/SystemFiles/Libraries/Linux-x86-64/AllVersions/libjri.so" || die + fi + # FFmpegTools can't use if ffmpeg not used + if ! use ffmpeg; then + einfo 'Removing FFmpegTools support' + rm -r "${S}/${M_TARGET}/SystemFiles/Links/FFmpegTools/LibraryResources/Linux-x86-64/FFmpegToolsSystem"*.so || die + fi + + # fix RPATH + while IFS= read -r -d '' i; do + # Use \x7fELF header to separate ELF executables and libraries + # Skip .o files and static files to avoid surprises + [[ $(od -t x1 -N 4 "${i}") == *"7f 45 4c 46"* ]] || continue + [[ -f "${i}" && "${i: -2}" != ".o" ]] || continue + [[ "$(file "${i}")" == *"dynamically"* ]] || continue + einfo "Fixing RPATH of ${i}" + patchelf --set-rpath \ +'/'"${M_TARGET}"'/SystemFiles/Libraries/Linux-x86-64:'\ +'/'"${M_TARGET}"'/SystemFiles/Libraries/Linux-x86-64/Qt/lib:'\ +'/'"${M_TARGET}"'/SystemFiles/Java/Linux-x86-64/lib:'\ +'/'"${M_TARGET}"'/SystemFiles/Java/Linux-x86-64/lib/jli:'\ +'$ORIGIN' "${i}" || \ + die "patchelf failed on ${i}" + done < <(find "${S}/${M_TARGET}" -type f -print0) + + # fix broken symbolic link + ln -sf "/${M_TARGET}/SystemFiles/Kernel/Binaries/Linux-x86-64/wolframscript" "${S}/${M_TARGET}/Executables/wolframscript" || die + + # move all over + mv "${S}"/opt "${ED}"/opt || die + + # the autogenerated symlinks point into sandbox, remove + rm "${ED}"/opt/bin/* || die + + # install wrappers instead + for name in ${M_BINARIES} ; do + einfo "Generating wrapper for ${name}" + echo '#!/bin/sh' >> "${T}/${name}" || die + echo 'QT_QPA_PLATFORM="wayland;xcb"' >> "${T}/${name}" || die + echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1:/$(get_libdir)/libcrypt.so.1 /${M_TARGET}/Executables/${name} \$*" \ + >> "${T}/${name}" || die + dobin "${T}/${name}" + done + for name in ${M_BINARIES} ; do + einfo "Symlinking ${name} to /opt/bin" + dosym ../../usr/bin/${name} /opt/bin/${name} + done + + # fix some embedded paths and install desktop files + for filename in $(find "${ED}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica*.desktop") ; do + einfo "Fixing ${filename}" + sed -e "s|${S}||g" -e 's|^\t\t||g' -i "${filename}" || die + echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" || die + domenu "${filename}" + done + + # install icons + for iconsize in 16 32 64 128 256; do + local iconfile="${ED}/${M_TARGET}/SystemFiles/FrontEnd/SystemResources/X/App-${iconsize}.png" + if [ -e "${iconfile}" ]; then + newicon -s "${iconsize}" "${iconfile}" wolfram-mathematica.png + fi + done + + # install mime types + insinto /usr/share/mime/application + for filename in $(find "${ED}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do + basefilename=$(basename "${filename}") + mv "${filename}" "${T}/${basefilename#application-}" || die + doins "${T}/${basefilename#application-}" + done +} + +pkg_nofetch() { + einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}" + einfo "in your \$\{DISTDIR\}." + einfo "Note that to actually run and use Mathematica you need a valid license." + einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}" +} diff --git a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild index 812a7aaeeb5b..c18adafa5977 100644 --- a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild +++ b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest index cf9ef845e6a1..eb65305d2a41 100644 --- a/sci-mathematics/maxima/Manifest +++ b/sci-mathematics/maxima/Manifest @@ -1 +1,2 @@ DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef +DIST maxima-5.47.0.tar.gz 47939891 BLAKE2B 46f97c81ff8fd227d04759103ac683c034820e29b7ecd78ad76e3a43a8911d29d1a20007fe4ccb37da88eaa3888d71c8b98a55bc4e692cf72b154391e91a4533 SHA512 953b98336eb086069edaa917981372450ce165dedd7a7b39b181d3f2d8b089551eea943e0084148eaa3ded395dcba9135509d3d11d9132ab7a3ad8bb800d3a11 diff --git a/sci-mathematics/maxima/maxima-5.46.0.ebuild b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild index fd4032a3ba0b..e106fab26432 100644 --- a/sci-mathematics/maxima/maxima-5.46.0.ebuild +++ b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools elisp-common flag-o-matic python-single-r1 xdg-utils diff --git a/sci-mathematics/maxima/maxima-5.47.0.ebuild b/sci-mathematics/maxima/maxima-5.47.0.ebuild new file mode 100644 index 000000000000..22da4534cb1e --- /dev/null +++ b/sci-mathematics/maxima/maxima-5.47.0.ebuild @@ -0,0 +1,228 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools elisp-common flag-o-matic python-single-r1 xdg-utils + +DESCRIPTION="Free computer algebra environment based on Macsyma" +HOMEPAGE="http://maxima.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2 GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + +IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test" +RESTRICT="test" # bug 838202 + +# Languages +LANGS="de es pt pt_BR" +for lang in ${LANGS}; do + IUSE="${IUSE} l10n_${lang/_/-}" +done + +LISP_DEPEND=" + clisp? ( dev-lisp/clisp:= ) + clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) + clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) + cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) + ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) + gcl? ( <dev-lisp/gcl-2.6.14[ansi,readline] ) + sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) +" + +# LISP_DEPEND is included in both BDEPEND and DEPEND because the various +# lisp engines are used to both compile and run maxima. It's possible +# that they don't (all?) need to be listed in DEPEND; who knows. +BDEPEND=" + ${LISP_DEPEND} + test? ( sci-visualization/gnuplot ) + sys-apps/texinfo +" + +DEPEND=" + ${LISP_DEPEND} + virtual/libcrypt:= + emacs? ( >=app-editors/emacs-26:* ) + gui? ( dev-lang/tk:0 ) +" + +# texlive-latexrecommended needed by imaxima for breqn.sty +# +# VTK is an optional plotting backend that can be enabled by +# running "draw_renderer: 'vtk;" within maxima. +# +# It's NON-optional for the scene() command, but that command is +# currently useless since Tcl/Tk support was dropped in sci-libs/vtk. +# Thus we include VTK only as an optional dependency. +# +# We require app-misc/rlwrap for any lisps that don't support readline +# themselves. +RDEPEND=" + ${DEPEND} + X? ( + x11-misc/xdg-utils + sci-visualization/gnuplot[gd] + vtk? ( + ${PYTHON_DEPS} + sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}] + ) + ) + emacs? ( + virtual/latex-base + app-emacs/auctex + app-text/ghostscript-gpl + dev-texlive/texlive-latexrecommended + )" + +# Maxima can make use of X features like plotting (and launching a PNG +# viewer) from the console, but you can't use the xmaxima GUI without X. +REQUIRED_USE=" + vtk? ( ${PYTHON_REQUIRED_USE} ) + || ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl ) + gui? ( X )" + +TEXMF="${EPREFIX}"/usr/share/texmf-site + +pkg_setup() { + # Set the PYTHON variable to whatever it should be. + use vtk && python-single-r1_pkg_setup +} + +PATCHES=( + "${FILESDIR}/imaxima-0.patch" + "${FILESDIR}/xdg-utils-1.patch" + "${FILESDIR}/wish-2.patch" + "${FILESDIR}/rmaxima-0.patch" + "${FILESDIR}/emacs-0.patch" + "${FILESDIR}/clisp-1.patch" + "${FILESDIR}/clozurecl-3.patch" + "${FILESDIR}/cmucl-1.patch" + "${FILESDIR}/sbcl-2.patch" +) + +src_prepare() { + default + + # bug #343331 + rm share/Makefile.in || die + rm src/Makefile.in || die + touch src/*.mk + touch src/Makefile.am + + eautoreconf +} + +src_configure() { + local CONFS="" + + # enable existing translated doc + if use nls; then + for lang in ${LANGS}; do + if use "l10n_${lang/_/-}"; then + CONFS="${CONFS} --enable-lang-${lang}" + fi + done + fi + + # Using raw-ldflags fixes the error, + # + # x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option + # value (expected an integer): 1 -Wl + # + # when building the maxima.fas library for ECL. See upstream bugs: + # + # * https://sourceforge.net/p/maxima/bugs/3759/ + # * https://gitlab.com/embeddable-common-lisp/ecl/-/issues/636 + # + # The 32-bit and 64-bit version of the clozurecl executable + # are both called "ccl" on Gentoo, so we need the additional + # use_with for clozurecl64. See bugs 665364 and 715278.... + # + # The usex works around https://sourceforge.net/p/maxima/bugs/3757/ + # + econf ${CONFS} \ + LDFLAGS="$(raw-ldflags)" \ + $(use_enable clisp) \ + $(use_enable clozurecl ccl) \ + $(use_enable clozurecl64 ccl64) \ + $(usex clozurecl64 "--with-ccl64=ccl" "") \ + $(use_enable cmucl) \ + $(use_enable ecls ecl) \ + $(use_enable emacs) \ + $(use_enable gcl) \ + $(use_with gui wish) \ + $(use_enable sbcl) \ + --with-lispdir="${EPREFIX}/${SITELISP}/${PN}" +} + +src_compile() { + emake + if use emacs; then + pushd interfaces/emacs/emaxima > /dev/null + elisp-compile *.el + popd > /dev/null + pushd interfaces/emacs/imaxima > /dev/null + BYTECOMPFLAGS="-L . -L ../emaxima" + elisp-compile *.el + popd > /dev/null + fi +} + +src_install() { + docompress -x /usr/share/info + emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install + + # do not use dodoc because interfaces can't read compressed files + # read COPYING before attempt to remove it from dodoc + insinto /usr/share/${PN}/${PV}/doc + doins AUTHORS COPYING README README-lisps.md + dodir /usr/share/doc + dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} + + if use emacs; then + elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp} + elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el + + rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die + insinto ${TEXMF}/tex/latex/emaxima + doins interfaces/emacs/emaxima/emaxima.sty + + insinto /usr/share/${PN}/${PV}/doc/imaxima + doins interfaces/emacs/imaxima/README + doins -r interfaces/emacs/imaxima/imath-example + + if ! use gcl; then + # This emacs package is used to run gcl, maxima, gdb, etc. + # all at once and possibly in the same buffer. As such, it's + # no use without gcl (more to the point: it requires gcl.el). + find "${ED}" -name 'dbl.el' -type f -delete || die + fi + fi + + if use ecls; then + # Use ECL to find the path where it expects to load packages from. + ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)") + insinto "${ECLLIB#${EPREFIX}}" + doins src/binary-ecl/maxima.fas + fi +} + +pkg_postinst() { + xdg_mimeinfo_database_update + if use emacs; then + elisp-site-regen + mktexlsr + fi +} + +pkg_postrm() { + xdg_mimeinfo_database_update + if use emacs; then + elisp-site-regen + mktexlsr + fi +} diff --git a/sci-mathematics/maxima/metadata.xml b/sci-mathematics/maxima/metadata.xml index e6f94974231a..8c7e1e80faa5 100644 --- a/sci-mathematics/maxima/metadata.xml +++ b/sci-mathematics/maxima/metadata.xml @@ -1,18 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>grozin@gentoo.org</email> + <name>Andrey Grozin</name> + </maintainer> <maintainer type="project"> <email>sci-mathematics@gentoo.org</email> <name>Gentoo Mathematics Project</name> </maintainer> <longdescription lang="en"> Computer Algebra system, descendent of Macsyma. - Maxima is a system for the manipulation of symbolic and - numerical expressions, including differentiation, integration, - Taylor series, Laplace transforms, ordinary differential - equations, systems of linear equations, and vectors, matrices, - and tensors. Maxima produces high precision results by using - exact fractions and arbitrarily long floating point representations, + Maxima is a system for the manipulation of symbolic and + numerical expressions, including differentiation, integration, + Taylor series, Laplace transforms, ordinary differential + equations, systems of linear equations, and vectors, matrices, + and tensors. Maxima produces high precision results by using + exact fractions and arbitrarily long floating point representations, and can plot functions and data in two and three dimensions. </longdescription> <use> diff --git a/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild b/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild index 32304b03acd4..cb277918c6f8 100644 --- a/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild +++ b/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -H=99d707bc3c600a9d6052a46a7c85f05b74c589a2 +[[ ${PV} == 20220303 ]] && COMMIT=99d707bc3c600a9d6052a46a7c85f05b74c589a2 DESCRIPTION="Sample databases for Metamath" -HOMEPAGE="http://us.metamath.org/mpeuni/mmset.html" +HOMEPAGE="http://us.metamath.org/mpeuni/mmset.html + https://github.com/metamath/set.mm/" -if [[ "${PV}" == *9999* ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/metamath/set.mm.git" else - SRC_URI="https://github.com/metamath/set.mm/archive/${H}.tar.gz - -> ${P}.tar.gz" + SRC_URI="https://github.com/metamath/set.mm/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}"/set.mm-${H} + S="${WORKDIR}"/set.mm-${COMMIT} fi LICENSE="CC0-1.0" diff --git a/sci-mathematics/minisat/files/minisat-2.2.1-musl.patch b/sci-mathematics/minisat/files/minisat-2.2.1-musl.patch new file mode 100644 index 000000000000..3a25d5964318 --- /dev/null +++ b/sci-mathematics/minisat/files/minisat-2.2.1-musl.patch @@ -0,0 +1,41 @@ +From 4c8afcd6bfbf2cbdb5ebe271f20503a6d34d7d49 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org> +Date: Mon, 6 Feb 2023 17:09:18 +0100 +Subject: [PATCH] utils/System.*: use fpu_control only on glibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug: https://github.com/vprover/vampire/pull/432 +Signed-off-by: Maciej Barć <xgqt@gentoo.org> +--- + minisat/utils/System.cc | 2 +- + minisat/utils/System.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/minisat/utils/System.cc b/minisat/utils/System.cc +index 282f98ed..112708f7 100644 +--- a/minisat/utils/System.cc ++++ b/minisat/utils/System.cc +@@ -97,7 +97,7 @@ double Minisat::memUsedPeak(bool /*strictlyPeak*/) { return 0; } + + void Minisat::setX86FPUPrecision() + { +-#if defined(__linux__) && defined(_FPU_EXTENDED) && defined(_FPU_DOUBLE) && defined(_FPU_GETCW) ++#if defined(__GLIBC__) && defined(_FPU_EXTENDED) && defined(_FPU_DOUBLE) && defined(_FPU_GETCW) + // Only correct FPU precision on Linux architectures that needs and supports it: + fpu_control_t oldcw, newcw; + _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); +diff --git a/minisat/utils/System.h b/minisat/utils/System.h +index a51d4c2e..189fcbff 100644 +--- a/minisat/utils/System.h ++++ b/minisat/utils/System.h +@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #ifndef Minisat_System_h + #define Minisat_System_h + +-#if defined(__linux__) ++#if defined(__GLIBC__) + #include <fpu_control.h> + #endif + diff --git a/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild b/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild index 15d260429e0f..ac28363ef0f5 100644 --- a/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild +++ b/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,10 +6,11 @@ EAPI=8 inherit cmake DESCRIPTION="Small yet efficient SAT solver with reference paper" -HOMEPAGE="http://minisat.se/Main.html" +HOMEPAGE="http://minisat.se/Main.html + https://github.com/stp/minisat/" SRC_URI="https://github.com/stp/${PN}/archive/releases/${PV}.tar.gz -> ${P}.tar.gz doc? ( http://minisat.se/downloads/MiniSat.pdf )" -S="${WORKDIR}/${PN}-releases-${PV}" +S="${WORKDIR}"/${PN}-releases-${PV} LICENSE="MIT" SLOT="0/${PV}" @@ -19,9 +20,13 @@ IUSE="doc" RDEPEND="sys-libs/zlib:=" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) +PATCHES=( + "${FILESDIR}"/${P}-cmake.patch + "${FILESDIR}"/${P}-musl.patch +) src_install() { cmake_src_install + use doc && dodoc "${DISTDIR}"/MiniSat.pdf } diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest index 6d6e6df96096..111f546fdc06 100644 --- a/sci-mathematics/nauty/Manifest +++ b/sci-mathematics/nauty/Manifest @@ -1,5 +1,3 @@ DIST nauty-includes.patch 2530 BLAKE2B 8789bc2f65b89aa3bbf27e517f1c56340f9bde089ef54aa28757c66c3954b5c54e8a09b6989ad8d57098970240dd1838baa0003766fe10c7f6c32041abf461e3 SHA512 d11f530fecb86edc9e95f0b4d91240778047c0e84d6259c80490358baf0a3eeaa112acfe1fcdb594da6c6e17855f5e21cb75c88446b8d6d9e96402be0e5e6af2 -DIST nauty27r4.tar.gz 1731562 BLAKE2B 104481e5af3333b60574a7185848832ad08b0cfeb8378e3c89ddd3f2cc87023cd701889356fa196b529ddbf19232a733fe3e694d9573adef04c2ad86baaf38e5 SHA512 2ed691bf0a6806f77cccbd95ee7687a66b6e6342493a0d65636166727cf4ea8cd887187d88a3154d911f665deb8d6f5bbaba33c8a1b740a564a1fc52bf4b4520 DIST nauty2_8_6.tar.gz 1546765 BLAKE2B be8aa8ef816c8833a79876e6bf99b0dc4a23922f48684c8a3272c01b0b4eb64959366cae363fbda4200354a0833942b64e85c009fc35a3d6fa02f9b74c9b9a74 SHA512 9bc597d4341a6a67aece0ad95ecd4a649f675def73e97af1d215cf7399cbd3fb8e39f140cbd6f69740f2083c7a5739d5089e746bb3f831250709e0d2b43548b5 -DIST nauty_2.7r4+ds-1.debian.tar.xz 45712 BLAKE2B e4a7a1d2b70b5fa969f708bbd56b47aaf422c268be23ffa7ceb3f9cc21ff8d27270556adadd43fe60309e7840e1541a586b1d9d42d90ba6207801e170b747922 SHA512 7384e7637a875c35f6da94707576aa26a94f981a750eb80991a837fa9ae245680f11ca57cf24a9efe1164dcd386c9888270688c1b3de30d1a81b67bb7c670dd9 DIST nauty_2.8.6+ds-1.debian.tar.xz 62852 BLAKE2B fcbbed54b10d9dd4bdf82d8a72ef91866a235c7679266b8f395e2fe6b44a679e98f85462a42037094d856130d5456d9989749c416932f895bc17df8ef32241a2 SHA512 3784e0ec15c64ea6850f9198c61af3924fcedf1ffa4715fbd53a9bd1cd7defd69b543a8d4e6d46ef727918661409e2de77c89c3ca79f36769c1335b30bdd305c diff --git a/sci-mathematics/nauty/nauty-2.7.4.ebuild b/sci-mathematics/nauty/nauty-2.7.4.ebuild deleted file mode 100644 index a07631e57792..000000000000 --- a/sci-mathematics/nauty/nauty-2.7.4.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -MY_PV1=$(ver_rs 2 'r') -MY_PV=$(ver_rs 1 '' $(ver_rs 2 'r')) -DEBIAN_PATCH_VERSION=1 - -DESCRIPTION="Computing automorphism groups of graphs and digraphs" -HOMEPAGE="https://pallini.di.uniroma1.it/" - -SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV1}+ds-${DEBIAN_PATCH_VERSION}.debian.tar.xz - https://src.fedoraproject.org/rpms/nauty/raw/f35/f/nauty-includes.patch" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~riscv x86" -IUSE="examples" - -BDEPEND="sys-apps/help2man" -DEPEND="dev-libs/gmp:0 - sys-libs/zlib - sci-mathematics/cliquer" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}${MY_PV}" - -DOCS=( schreier.txt formats.txt changes24-27.txt ) - -PATCHES=( - "${WORKDIR}"/debian/patches/upstream-fix-gt_numorbits.patch - "${WORKDIR}"/debian/patches/upstream-C2help2man.patch - "${WORKDIR}"/debian/patches/upstream-autotoolization.patch - "${DISTDIR}"/nauty-includes.patch - "${WORKDIR}"/debian/patches/unbundle-cliquer.patch -) - -src_prepare() { - default - rm makefile || die - - # The debian patch looks for <cliquer.h>, but the autotools-form of - # cliquer installs that header as <cliquer/cliquer.h>. - sed -e 's~<cliquer\.h>~<cliquer/cliquer\.h>~' -i nautycliquer.h || die - - # The debian autotools patch has only a placeholder in LT_INIT for - # the version that we must provide. - sed -e "s/@INJECTVER@/${PV}/" -i configure.ac || die - - # This is not great, since consumers should expect to see the - # upstream versioning scheme in e.g. PKG_CHECK_MODULES. However, the - # upstream version is next to impossible to use for comparisons, so - # at least this fixes the QA warning and makes the pkg-config - # version useful on Gentoo? - sed -e "s/^Version:.*/Version: ${PV}/" -i nauty.pc.in || die - - eautoreconf -} - -src_configure() { - # Fedora has a patch to enable popcnt at runtime on CPUs that support it, - # but their patch isn't applying cleanly. What's worse, the patch doesn't - # support clang (bug 732020). - econf --disable-static \ - --disable-popcnt \ - --enable-tls \ - --enable-generic -} - -src_install() { - default - - if use examples; then - docinto examples - dodoc nautyex*.c - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild b/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild index 60c6882b1049..b7d960f6657a 100644 --- a/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild +++ b/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" +KEYWORDS="amd64 ~arm ~riscv x86" IUSE="cpu_flags_x86_popcnt examples" BDEPEND="sys-apps/help2man" diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest index dca93e793264..29d799e77b20 100644 --- a/sci-mathematics/normaliz/Manifest +++ b/sci-mathematics/normaliz/Manifest @@ -1 +1,2 @@ +DIST normaliz-3.10.0.tar.gz 5177794 BLAKE2B ef2ed089da0bf7b286f477837d8793466c1b030ea0f321cd74e910461a6bd28705f971d1b987ef59aa783311dc247e2838d5acf850cb1948e429c98e1ca440f0 SHA512 febc43f846607dcfca8bcf462e8ccf655e2e6e10dcb2741412c08489fc9b2e99410306dc4b078084bfe73e41113849b201e6f7f5a8e2ae07508ebf1c043f95a3 DIST normaliz-3.9.3.tar.gz 4946498 BLAKE2B 3faff64fda86216ee11b0f55ba1341d70988472f65eedafe5b52bf6b05abd817add2dbab45144de0a43d02c501caf3c4a89d66c2b2d621b81188a2a5100d158f SHA512 5d6866cc35835c196d22d6b4b0d5f0e3e2e00f772553115fbbabd8415b20388cf367cf9a282904a72c03c2ef482b804f7009d67e3334add4fc37f3bab675da6c diff --git a/sci-mathematics/normaliz/normaliz-3.10.0.ebuild b/sci-mathematics/normaliz/normaliz-3.10.0.ebuild new file mode 100644 index 000000000000..055e1f8973ca --- /dev/null +++ b/sci-mathematics/normaliz/normaliz-3.10.0.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Tool for computations in affine monoids and more" +HOMEPAGE="https://www.normaliz.uni-osnabrueck.de/" +SRC_URI="https://github.com/Normaliz/Normaliz/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/3" +KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="doc extras nauty openmp" + +RDEPEND=" + dev-libs/gmp:=[cxx(+)] + nauty? ( sci-mathematics/nauty ) +" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" +# Only a boost header is needed -> not RDEPEND + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + # Fix C standard compliance. + default + eautoreconf +} + +src_configure() { + # flint (and arb, which doesn't make an appearance in ./configure --help) + # is somehow connected to e-antic, which we do not yet package. Likewise + # we have no packages for cocoalib or hashlibrary. + econf \ + $(use_enable openmp) \ + $(use_with nauty) \ + --without-cocoalib \ + --without-hashlibrary \ + --without-flint \ + --without-e-antic \ + --disable-static +} + +src_compile() { + # Clobber the default "AM_LDFLAGS = -Wl,-s" to avoid QA warnings + # about pre-stripped binaries. + emake AM_LDFLAGS="" +} + +src_install() { + default + + use doc && dodoc doc/Normaliz.pdf doc/NmzShortRef.pdf + if use extras; then + newdoc Singular/normaliz.pdf singular-normaliz.pdf + insinto /usr/share/${PN} + doins Singular/normaliz.lib + doins Macaulay2/Normaliz.m2 + fi + + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild index 0562c712af64..816840466f1c 100644 --- a/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild +++ b/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ppc x86" +KEYWORDS="amd64 arm ~ppc x86" # pod2man BDEPEND="dev-lang/perl" diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index 527eddbd2f74..0cdd26e02f7c 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -1,2 +1,3 @@ -DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5 SHA512 1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e +DIST octave-8.1.0.tar.xz 26957620 BLAKE2B d1d90a242b1517dd0284af454b9de83238c5f515690c1ffd8bd5d8c43ff6c690ccab590a877e74631394295b97292d71b2dc1c62ea50f0c4ff3e9ac728f67dbf SHA512 7e43e1a272cb51e981d4f534bbed2c2915bb714be3f151f98862ed8ecec1ee3a90600dd22778077b6cdecee4c802a2e4d13a49c339cef683e1356941b9e1cd1d +DIST octave-8.2.0.tar.xz 26970452 BLAKE2B c5bd03861681a7e194a0fb195433d085fc7d98eb3c6f65929ad53c93afef199062902293082e5aeab7c5e15e0045093efbebcc860052e6081708947483425f2f SHA512 9f56428e990c6aa71a5cfe7698602ba681535c36b140fa9248536c260afebd19f6125c92a0fd6d14fab5a794de49e03ccc98e89ac879108f635b3ffc4ec40514 diff --git a/sci-mathematics/octave/octave-6.4.0-r5.ebuild b/sci-mathematics/octave/octave-8.1.0.ebuild index 9c173fa095d8..212af2b3d89a 100644 --- a/sci-mathematics/octave/octave-6.4.0-r5.ebuild +++ b/sci-mathematics/octave/octave-8.1.0.ebuild @@ -3,39 +3,43 @@ EAPI=8 -inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg-utils +inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg DESCRIPTION="High-level interactive language for numerical computations" -LICENSE="GPL-3" HOMEPAGE="https://www.gnu.org/software/octave/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" +LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl - portaudio postscript +qhull +qrupdate readline sndfile +sparse - ssl static-libs sundials X zlib" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo # documentation to text (see scripts/help/help.m). # -# (un)zip isn't mentioned, but there's a test that uses it (bug 775254). +# (un)zip isn't mentioned, but there's a test that uses it (bug #775254). # +# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not +# ideal, but both "graphicsmagick" and "imagemagick" are global USE +# flags whose existing descriptions conflict with the obvious way we +# would want to use them in octave. In any case, upstream doesn't really +# support imagemagick, only graphicsmagick (bug 864785). RDEPEND=" app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-apps/texinfo - dev-libs/libpcre:3= - sys-libs/ncurses:0= + dev-libs/libpcre2 + sys-libs/ncurses:= sys-libs/zlib virtual/blas virtual/lapack - curl? ( net-misc/curl:0= ) + curl? ( net-misc/curl:= ) fftw? ( sci-libs/fftw:3.0= ) - glpk? ( sci-mathematics/glpk:0= ) + fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] ) + glpk? ( sci-mathematics/glpk:= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 @@ -47,14 +51,15 @@ RDEPEND=" dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) - hdf5? ( sci-libs/hdf5:0= ) - java? ( >=virtual/jre-1.6.0:* ) + hdf5? ( sci-libs/hdf5:= ) + imagemagick? ( media-gfx/graphicsmagick:=[cxx] ) + java? ( >=virtual/jre-1.8:* ) + json? ( dev-libs/rapidjson ) opengl? ( - media-libs/freetype:2= - media-libs/fontconfig:1.0= + media-libs/freetype:= + media-libs/fontconfig:= virtual/glu - >=x11-libs/fltk-1.3:1=[opengl,xft] - x11-libs/gl2ps:0= + x11-libs/gl2ps:= ) portaudio? ( media-libs/portaudio ) postscript? ( @@ -62,56 +67,73 @@ RDEPEND=" media-gfx/pstoedit media-gfx/transfig ) - qhull? ( media-libs/qhull:0= ) - qrupdate? ( sci-libs/qrupdate:0= ) - readline? ( sys-libs/readline:0= ) + qhull? ( media-libs/qhull:= ) + qrupdate? ( sci-libs/qrupdate:= ) + readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) sparse? ( - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/ccolamd:0= - sci-libs/cholmod:0= - sci-libs/colamd:0= - sci-libs/cxsparse:0= - sci-libs/umfpack:0= + sci-libs/arpack:= + sci-libs/camd:= + sci-libs/ccolamd:= + sci-libs/cholmod:= + sci-libs/colamd:= + sci-libs/cxsparse:= + sci-libs/umfpack:= ) ssl? ( - dev-libs/openssl:0= + dev-libs/openssl:= ) - sundials? ( <sci-libs/sundials-6.2.0:= ) - X? ( x11-libs/libX11:0= )" -# bug #846968 for sundials < dep -DEPEND="${RDEPEND} + sundials? ( >=sci-libs/sundials-4:= ) + X? ( x11-libs/libX11:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/gperf + virtual/pkgconfig doc? ( dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric dev-texlive/texlive-metapost virtual/latex-base ) - java? ( >=virtual/jdk-1.6.0 ) + java? ( >=virtual/jdk-1.8:* ) + gui? ( dev-qt/linguist-tools:5 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) - || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )" -BDEPEND=" - virtual/pkgconfig - gui? ( dev-qt/linguist-tools:5 )" +" + +# There are three ways to plot in Octave: +# +# 1. The old gnuplot renderer +# 2. The OpenGL renderer using the FLTK backend +# 3. The OpenGL renderer using the Qt backend +# +# It's possible to use the Qt GUI without OpenGL, but OpenGL rendering +# is all that FLTK is used for, so it doesn't make sense to enable +# USE=fltk without USE=opengl. +# +# Building without either USE=gnuplot or USE=opengl is technically legal, +# but will leave you unable to plot anything. +# +# Octave's FLTK support is unofficially deprecated, in the sense that +# you'll often get "why are you using FLTK?" in response to +# bugs. (Upstream bug 59321 for a random example.) In the future, it +# will probably make sense to merge USE=opengl and USE=X into USE=gui, +# dropping USE=fltk entirely. +REQUIRED_USE=" + fltk? ( opengl X ) + gui? ( X ) + opengl? ( || ( fltk gui ) ) +" PATCHES=( "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch - "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch - "${FILESDIR}/${PN}-6.4.0-slibtool.patch" "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch ) src_prepare() { default - # nasty prefix hacks for fltk:1 linking - if use prefix; then - use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" - fi - # occasional fail on install, force regeneration (bug #401189) rm doc/interpreter/contributors.texi || die @@ -122,13 +144,16 @@ src_configure() { # libstdc++ bug, bug #887815 append-cxxflags -U_GLIBCXX_ASSERTIONS - # unfortunate dependency on mpi from hdf5 (bug #302621) + # Unfortunate dependency on mpi from hdf5 (bug #302621) use hdf5 && has_version sci-libs/hdf5[mpi] && \ export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77 - # tell autoconf where to find qt binaries, fix bug #837752 - export MOC="$(qt5_get_bindir)/moc" UIC="$(qt5_get_bindir)/uic" RCC="$(qt5_get_bindir)/rcc" \ - LRELEASE="$(qt5_get_bindir)/lrelease" QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \ + # Tell autoconf where to find qt binaries, fix bug #837752 + export MOC="$(qt5_get_bindir)/moc" \ + UIC="$(qt5_get_bindir)/uic" \ + RCC="$(qt5_get_bindir)/rcc" \ + LRELEASE="$(qt5_get_bindir)/lrelease" \ + QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \ QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator" # Some of these use_with flags are a bit mismatched. The configure @@ -139,23 +164,17 @@ src_configure() { # --with-sundials_ida (no-op) with USE="sundials" # --without-sundials_ida (disables it) with USE="-sundials" # - # The --disable-no-undefined flag is needed because otherwise, the - # build system appends --no-undefined to LDFLAGS and then proceeds - # to undefine things. GNU libtool ignores this, but slibtool (for - # example) does not (bug 776583). econf \ --localstatedir="${EPREFIX}/var/state/octave" \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ --disable-64 \ - --disable-jit \ - --disable-no-undefined \ --enable-shared \ --with-z \ --with-bz2 \ - $(use_enable static-libs static) \ $(use_enable doc docs) \ $(use_enable java) \ + $(use_enable json rapidjson) \ $(use_enable readline) \ $(use_with curl) \ $(use_with fftw fftw3) \ @@ -163,11 +182,12 @@ src_configure() { $(use_enable fftw fftw-threads) \ $(use_with glpk) \ $(use_with hdf5) \ + $(use_with imagemagick magick GraphicsMagick++) \ $(use_with opengl) \ - $(use_with opengl fltk) \ + $(use_with fltk) \ $(use_with ssl openssl) \ $(use_with portaudio) \ - $(use_with qhull) \ + $(use_with qhull qhull_r) \ $(use_with qrupdate) \ $(use_with gui qt 5) \ $(use_with sndfile) \ @@ -182,8 +202,11 @@ src_configure() { } src_compile() { - export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox + # Otherwise it will write to /var/cache/fonts/ and trip sandbox + export VARTEXFONTS="${T}/fonts" + default + if use java; then pax-mark m "${S}/src/.libs/octave-cli" fi @@ -191,28 +214,20 @@ src_compile() { src_install() { default + if use doc; then dodoc $(find doc -name '*.pdf') else - # bug 566134, macros.texi is installed by make install if use doc + # bug #566134, macros.texi is installed by make install if use doc insinto /usr/share/${PN}/${PV}/etc doins doc/interpreter/macros.texi fi - [[ -e test/fntests.log ]] && dodoc test/fntests.log + use java && \ java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar" + echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die doenvd 99octave -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/sci-mathematics/octave/octave-8.2.0.ebuild b/sci-mathematics/octave/octave-8.2.0.ebuild new file mode 100644 index 000000000000..d0d284820f9f --- /dev/null +++ b/sci-mathematics/octave/octave-8.2.0.ebuild @@ -0,0 +1,241 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg + +DESCRIPTION="High-level interactive language for numerical computations" +HOMEPAGE="https://www.gnu.org/software/octave/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + +# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs +# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo +# documentation to text (see scripts/help/help.m). +# +# (un)zip isn't mentioned, but there's a test that uses it (bug #775254). +# +# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not +# ideal, but both "graphicsmagick" and "imagemagick" are global USE +# flags whose existing descriptions conflict with the obvious way we +# would want to use them in octave. In any case, upstream doesn't really +# support imagemagick, only graphicsmagick (bug 864785). +RDEPEND=" + app-arch/bzip2 + app-arch/unzip + app-arch/zip + app-text/ghostscript-gpl + sys-apps/texinfo + dev-libs/libpcre2 + sys-libs/ncurses:= + sys-libs/zlib + virtual/blas + virtual/lapack + curl? ( net-misc/curl:= ) + fftw? ( sci-libs/fftw:3.0= ) + fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] ) + glpk? ( sci-mathematics/glpk:= ) + gnuplot? ( sci-visualization/gnuplot ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qthelp:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + x11-libs/qscintilla:= + ) + hdf5? ( sci-libs/hdf5:= ) + imagemagick? ( media-gfx/graphicsmagick:=[cxx] ) + java? ( >=virtual/jre-1.8:* ) + json? ( dev-libs/rapidjson ) + opengl? ( + media-libs/freetype:= + media-libs/fontconfig:= + virtual/glu + x11-libs/gl2ps:= + ) + portaudio? ( media-libs/portaudio ) + postscript? ( + app-text/epstool + media-gfx/pstoedit + media-gfx/transfig + ) + qhull? ( media-libs/qhull:= ) + qrupdate? ( sci-libs/qrupdate:= ) + readline? ( sys-libs/readline:= ) + sndfile? ( media-libs/libsndfile ) + sparse? ( + sci-libs/arpack:= + sci-libs/camd:= + sci-libs/ccolamd:= + sci-libs/cholmod:= + sci-libs/colamd:= + sci-libs/cxsparse:= + sci-libs/umfpack:= + ) + ssl? ( + dev-libs/openssl:= + ) + sundials? ( >=sci-libs/sundials-4:= ) + X? ( x11-libs/libX11:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/gperf + virtual/pkgconfig + doc? ( + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-plaingeneric + dev-texlive/texlive-metapost + virtual/latex-base + ) + java? ( >=virtual/jdk-1.8:* ) + gui? ( dev-qt/linguist-tools:5 ) + qrupdate? ( app-misc/pax-utils ) + sparse? ( app-misc/pax-utils ) +" + +# There are three ways to plot in Octave: +# +# 1. The old gnuplot renderer +# 2. The OpenGL renderer using the FLTK backend +# 3. The OpenGL renderer using the Qt backend +# +# It's possible to use the Qt GUI without OpenGL, but OpenGL rendering +# is all that FLTK is used for, so it doesn't make sense to enable +# USE=fltk without USE=opengl. +# +# Building without either USE=gnuplot or USE=opengl is technically legal, +# but will leave you unable to plot anything. +# +# Octave's FLTK support is unofficially deprecated, in the sense that +# you'll often get "why are you using FLTK?" in response to +# bugs. (Upstream bug 59321 for a random example.) In the future, it +# will probably make sense to merge USE=opengl and USE=X into USE=gui, +# dropping USE=fltk entirely. +REQUIRED_USE=" + fltk? ( opengl X ) + gui? ( X ) + opengl? ( || ( fltk gui ) ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch + "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch +) + +src_prepare() { + default + + # occasional fail on install, force regeneration (bug #401189) + rm doc/interpreter/contributors.texi || die + + eautoreconf +} + +src_configure() { + # libstdc++ bug, bug #887815 + append-cxxflags -U_GLIBCXX_ASSERTIONS + + # Unfortunate dependency on mpi from hdf5 (bug #302621) + use hdf5 && has_version sci-libs/hdf5[mpi] && \ + export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77 + + # Tell autoconf where to find qt binaries, fix bug #837752 + export MOC="$(qt5_get_bindir)/moc" \ + UIC="$(qt5_get_bindir)/uic" \ + RCC="$(qt5_get_bindir)/rcc" \ + LRELEASE="$(qt5_get_bindir)/lrelease" \ + QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \ + QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator" + + # Some of these use_with flags are a bit mismatched. The configure + # script offers only --without-foo, and detects "foo" automatically + # unless --without-foo is specified. Passing --with-foo is not an + # error, however, so it kind of works. We wind up with, for example, + # + # --with-sundials_ida (no-op) with USE="sundials" + # --without-sundials_ida (disables it) with USE="-sundials" + # + local myeconfargs=( + --localstatedir="${EPREFIX}/var/state/octave" + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" + --disable-64 + --enable-shared + --with-z + --with-bz2 + + # bug #901965 + --without-libiconv-prefix + --without-libreadline-prefix + + $(use_enable doc docs) + $(use_enable java) + $(use_enable json rapidjson) + $(use_enable readline) + $(use_with curl) + $(use_with fftw fftw3) + $(use_with fftw fftw3f) + $(use_enable fftw fftw-threads) + $(use_with glpk) + $(use_with hdf5) + $(use_with imagemagick magick GraphicsMagick++) + $(use_with opengl) + $(use_with fltk) + $(use_with ssl openssl) + $(use_with portaudio) + $(use_with qhull qhull_r) + $(use_with qrupdate) + $(use_with gui qt 5) + $(use_with sndfile) + $(use_with sparse arpack) + $(use_with sparse umfpack) + $(use_with sparse colamd) + $(use_with sparse ccolamd) + $(use_with sparse cholmod) + $(use_with sparse cxsparse) + $(use_with sundials sundials_ida) + $(use_with X x) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # Otherwise it will write to /var/cache/fonts/ and trip sandbox + export VARTEXFONTS="${T}/fonts" + + default + + if use java; then + pax-mark m "${S}/src/.libs/octave-cli" + fi +} + +src_install() { + default + + if use doc; then + dodoc $(find doc -name '*.pdf') + else + # bug #566134, macros.texi is installed by make install if use doc + insinto /usr/share/${PN}/${PV}/etc + doins doc/interpreter/macros.texi + fi + + use java && \ + java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar" + + echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die + doenvd 99octave + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sci-mathematics/opensmt/Manifest b/sci-mathematics/opensmt/Manifest index cfff6834edf3..5c761352c1a5 100644 --- a/sci-mathematics/opensmt/Manifest +++ b/sci-mathematics/opensmt/Manifest @@ -1 +1,2 @@ DIST opensmt-2.4.3.tar.gz 1912077 BLAKE2B d945d5b85d81b9b991f2f881f2d8f160dbefad8ce6484cf0d28c9a35c0fa64d18f45442a59cdd45bd29fcf526a09717d902d30376dfe2784de2d4df9627f803b SHA512 a2adbbdebb133d7e97428c0ac9bf4c2413c95bca61567c5475f889f550904fc33a385712536c9026b38a1645b73c943876fa36724b634db061cb7cc0932543f2 +DIST opensmt-2.5.0.tar.gz 1940493 BLAKE2B ee643815b9da8bdc4a3a074a438eacdfde778347f4090aa7403e34859a9d51a17db8992c38a0e9f7a808384b0413abfbe2aa7b360dda44181344528159666945 SHA512 d70972eae376b927694f893ff9b6e4bfba7d0cfffe63545b5a0d582b594c3538643c9ae0121e75cf85aec3876eb4a45df2766c3a7700d07da05d1d6081953f42 diff --git a/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch b/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch new file mode 100644 index 000000000000..5f80a0de116c --- /dev/null +++ b/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch @@ -0,0 +1,132 @@ +From e88b83b3b52ebc6ff4cdf1f92a876861fc2c5598 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org> +Date: Mon, 6 Feb 2023 17:27:34 +0100 +Subject: [PATCH] use fpu_control only on glibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Maciej Barć <xgqt@gentoo.org> +--- + bin/opensmt.C | 4 ++-- + src/bin/opensmt.cc | 2 +- + src/minisat/core/Main.C | 4 ++-- + src/minisat/simp/Main.C | 4 ++-- + src/minisat/utils/System.h | 2 +- + src/parallel/opensmtSplitter.cc | 4 ++-- + 6 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/bin/opensmt.C b/bin/opensmt.C +index cb9c8943b..898a8fdd3 100644 +--- a/bin/opensmt.C ++++ b/bin/opensmt.C +@@ -44,7 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #include <csignal> + #include <iostream> + +-#if defined(__linux__) ++#if defined(__GLIBC__) + #include <fpu_control.h> + #endif + +@@ -84,7 +84,7 @@ int main( int argc, char * argv[] ) + // the repeatability of experiments that might be compromised + // by the floating point unit approximations on doubles + // +-#if defined(__linux__) && !defined( SMTCOMP ) ++#if defined(__GLIBC__) && !defined( SMTCOMP ) + fpu_control_t oldcw, newcw; + _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); + #endif +diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc +index 6db12ffd8..67bfcd712 100644 +--- a/src/bin/opensmt.cc ++++ b/src/bin/opensmt.cc +@@ -47,7 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #endif + #endif // ENABLE_LINE_EDITING + +-#if defined(__linux__) ++#if defined(__GLIBC__) + #include <fpu_control.h> + #endif + +diff --git a/src/minisat/core/Main.C b/src/minisat/core/Main.C +index acef32cd5..2c232b71b 100644 +--- a/src/minisat/core/Main.C ++++ b/src/minisat/core/Main.C +@@ -74,7 +74,7 @@ static inline uint64_t memUsed(void) { + static inline uint64_t memUsed() { return 0; } + #endif + +-#if defined(__linux__) ++#if defined(__GLIBC__) + #include <fpu_control.h> + #endif + +@@ -287,7 +287,7 @@ int main(int argc, char** argv) + + + reportf("This is MiniSat 2.0 beta\n"); +-#if defined(__linux__) ++#if defined(__GLIBC__) + fpu_control_t oldcw, newcw; + _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); + reportf("WARNING: for repeatability, setting FPU to use double precision\n"); +diff --git a/src/minisat/simp/Main.C b/src/minisat/simp/Main.C +index b6d194631..a3f22fb4f 100644 +--- a/src/minisat/simp/Main.C ++++ b/src/minisat/simp/Main.C +@@ -74,7 +74,7 @@ static inline uint64_t memUsed(void) { + static inline uint64_t memUsed() { return 0; } + #endif + +-#if defined(__linux__) ++#if defined(__GLIBC__) + #include <fpu_control.h> + #endif + +@@ -244,7 +244,7 @@ const char* hasPrefix(const char* str, const char* prefix) + int main(int argc, char** argv) + { + reportf("This is MiniSat 2.0 beta\n"); +-#if defined(__linux__) ++#if defined(__GLIBC__) + fpu_control_t oldcw, newcw; + _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); + reportf("WARNING: for repeatability, setting FPU to use double precision\n"); +diff --git a/src/minisat/utils/System.h b/src/minisat/utils/System.h +index 5f9dc3f53..4b7f9c9f5 100644 +--- a/src/minisat/utils/System.h ++++ b/src/minisat/utils/System.h +@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #ifndef Minisat_System_h + #define Minisat_System_h + +-#if defined(__linux__) ++#if defined(__GLIBC__) + #include <fpu_control.h> + #endif + +diff --git a/src/parallel/opensmtSplitter.cc b/src/parallel/opensmtSplitter.cc +index 05246e187..4b8c01a1a 100644 +--- a/src/parallel/opensmtSplitter.cc ++++ b/src/parallel/opensmtSplitter.cc +@@ -27,7 +27,7 @@ + #endif + #endif // ENABLE_LINE_EDITING + +-#if defined(__linux__) ++#if defined(__GLIBC__) + #include <fpu_control.h> + #endif + +@@ -55,7 +55,7 @@ int main( int argc, char * argv[] ) + // the repeatability of experiments that might be compromised + // by the floating point unit approximations on doubles + // +-#if defined(__linux__) ++#if defined(__GLIBC__) + fpu_control_t oldcw, newcw; + _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); + #endif diff --git a/sci-mathematics/opensmt/opensmt-2.4.3-r1.ebuild b/sci-mathematics/opensmt/opensmt-2.4.3-r2.ebuild index b1e67e45cbad..f46f590a012c 100644 --- a/sci-mathematics/opensmt/opensmt-2.4.3-r1.ebuild +++ b/sci-mathematics/opensmt/opensmt-2.4.3-r2.ebuild @@ -25,7 +25,7 @@ REQUIRED_USE="?? ( libedit readline )" RESTRICT="!test? ( test )" RDEPEND=" - dev-libs/gmp:= + dev-libs/gmp:=[cxx] readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit:= ) " @@ -36,6 +36,8 @@ BDEPEND=" test? ( dev-cpp/gtest ) " +PATCHES=( "${FILESDIR}"/${P}-musl.patch ) + src_prepare() { cmake_src_prepare diff --git a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild b/sci-mathematics/opensmt/opensmt-2.5.0.ebuild index 089f834988bc..479c6c7e252f 100644 --- a/sci-mathematics/opensmt/opensmt-2.4.3.ebuild +++ b/sci-mathematics/opensmt/opensmt-2.5.0.ebuild @@ -25,7 +25,7 @@ REQUIRED_USE="?? ( libedit readline )" RESTRICT="!test? ( test )" RDEPEND=" - dev-libs/gmp:= + dev-libs/gmp:=[cxx] readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit:= ) " @@ -36,11 +36,12 @@ BDEPEND=" test? ( dev-cpp/gtest ) " +# PATCHES=( "${FILESDIR}"/${PN}-2.4.3-musl.patch ) + src_prepare() { cmake_src_prepare echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die - echo "add_subdirectory(unit)" > "${S}"/parallel-test/CMakeLists.txt || die } src_configure() { diff --git a/sci-mathematics/pari-data/pari-data-20191216.ebuild b/sci-mathematics/pari-data/pari-data-20191216.ebuild index 06f8b1185bc4..83c3b554cc9e 100644 --- a/sci-mathematics/pari-data/pari-data-20191216.ebuild +++ b/sci-mathematics/pari-data/pari-data-20191216.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ done LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" S="${WORKDIR}" diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest index 9e878940b366..1fbe614ae199 100644 --- a/sci-mathematics/pari/Manifest +++ b/sci-mathematics/pari/Manifest @@ -1,2 +1 @@ -DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9 -DIST pari-2.15.2.tar.gz 5176694 BLAKE2B b3aa021cb0b786dfde691b150d38c0ee9e9844ff5d2554d7a4f0cd85b27c8077696433b14c0b2128930b7db2191e7db99bdebc200e03607554cc4a9394ea42a4 SHA512 fa9e8713484ab5d659dcf7cf65de0fbaf28334969f443bfaffb8fc19c2305631435fc5635e090cbd8033758ea18200a62c47e8434067af9a86565832e96d489c +DIST pari-2.15.3.tar.gz 5178288 BLAKE2B d9cc11526360e9fc7688e0a3195a85302d6bf95039051c9419aa18c5bf91eff837d64d9acabb0a51a6e15a3614a5cab4acbf0a502dba5417982514f27721d47d SHA512 9e127850759bac0c0a9b32c6660a55018ec6c6781aaa14c42667f26655444f55c08e100fe186aec8ad1f574d883d76888b13fbafb65d1f4741e2018b78ff307b diff --git a/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch b/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch deleted file mode 100644 index 6d6e6726ddf7..000000000000 --- a/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config/Makefile.SH b/config/Makefile.SH -index 27c6d5b..43debb1 100644 ---- a/config/Makefile.SH -+++ b/config/Makefile.SH -@@ -185,7 +185,7 @@ LD = $LD \$(LD_FLAVOR) - LDFLAGS = $LDFLAGS - DLLD_FLAVOR = \$(LD_FLAVOR) - DLLD = $DLLD \$(DLLD_FLAVOR) --DLLDFLAGS = $DLLDFLAGS -+DLLDFLAGS = $DLLDFLAGS \$(LDFLAGS) - EXTRADLLDFLAGS = $EXTRADLLDFLAGS - RUNTEST = $RUNTEST - diff --git a/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch b/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch deleted file mode 100644 index 5f03d77d9e7c..000000000000 --- a/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/config/Makefile.SH b/config/Makefile.SH -index 27c6d5b..43debb1 100644 ---- a/config/Makefile.SH -+++ b/config/Makefile.SH -@@ -366,9 +366,9 @@ clean: cleanall - .headers: $HEADERS - @touch \$@ - --install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-examples install-cfg -+install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-cfg - --install: install-doc install-nodata install-data -+install: install-nodata install-data - - install-include: - -mkdir -p \$(INCLUDEDIR)/pari -@@ -425,7 +425,7 @@ install-cfg:: - \$(INSTALL_DATA) $desc/PARI/822.pm \$(DATADIR)/PARI;\ - \$(INSTALL_DATA) $desc/\$(DESC) \$(DATADIR); fi - --install-doc: install-docdvi install-doctex -+install-doc: install-docpdf install-doctex install-examples - - install-doctex: - -mkdir -p \$(BINDIR) \$(DOCDIR) diff --git a/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch b/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch deleted file mode 100644 index b8af421c0e56..000000000000 --- a/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch +++ /dev/null @@ -1,34 +0,0 @@ -A fix for upstream bug 2441 and gentoo bug 892035, with the changes to -CHANGES and the test suite stripped out (they don't apply cleanly). - -From 6f556664bea5dae9d7101533be65f10b9d6332e2 Mon Sep 17 00:00:00 2001 -From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr> -Date: Fri, 20 Jan 2023 11:13:46 +0100 -Subject: [PATCH 1/1] ellcard(ellinit([1,1]*ffgen([41,16])))-> impossible - inverse [#2441] - -find_isogenous_from_Atkin: check that the kernel divides the division polynomial ---- - CHANGES | 1 + - src/basemath/ellsea.c | 3 ++- - src/test/32/ellff | 3 ++- - src/test/in/ellff | 3 +++ - 4 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/basemath/ellsea.c b/src/basemath/ellsea.c -index a6871fa6a7..05f148eadd 100644 ---- a/src/basemath/ellsea.c -+++ b/src/basemath/ellsea.c -@@ -852,7 +852,8 @@ find_isogenous_from_Atkin(GEN a4, GEN a6, ulong ell, struct meqn *MEQN, GEN g, G - GEN a4t, a6t, h; - a4a6t(&a4t, &a6t, ell, E4t, E6t, T, p); - h = find_kernel(a4, a6, ell, a4t, a6t, pp1, T, p, pp, e); -- if (h) return gerepilecopy(ltop, mkvec3(a4t, a6t, h)); -+ if (h && signe(Fq_elldivpolmod(a4, a6, ell, h, T, pp))==0) -+ return gerepilecopy(ltop, mkvec3(a4t, a6t, h)); - } - } - pari_err_BUG("find_isogenous_from_Atkin, kernel not found"); --- -2.30.2 - diff --git a/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch b/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch deleted file mode 100644 index d504326b7b43..000000000000 --- a/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0888050e8f3fc8c07e42331651c970d80c8d6a90 Mon Sep 17 00:00:00 2001 -From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr> -Date: Wed, 25 Jan 2023 18:42:09 +0100 -Subject: [PATCH] TOP_Make.SH: add target install-docvi, install-doctex [#2444] - ---- - config/TOP_Make.SH | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/TOP_Make.SH b/config/TOP_Make.SH -index d2543c91eb..e60fd5f6ee 100644 ---- a/config/TOP_Make.SH -+++ b/config/TOP_Make.SH -@@ -42,7 +42,7 @@ all:: - @\$(MAKE) gp - @-cd doc && \$(MAKE) doc - --gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra:: -+gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-doctex install-docdvi install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra:: - @dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\ - if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\ - cd \$\$dir && \$(MAKE) \$@ --- -2.30.2 - diff --git a/sci-mathematics/pari/files/pari-2.9.4-strip.patch b/sci-mathematics/pari/files/pari-2.9.4-strip.patch deleted file mode 100644 index f4a8af322c45..000000000000 --- a/sci-mathematics/pari/files/pari-2.9.4-strip.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -r -U2 pari-2.9.4.orig/config/Makefile.SH pari-2.9.4/config/Makefile.SH ---- pari-2.9.4.orig/config/Makefile.SH 2017-11-09 16:26:14.000000000 +0700 -+++ pari-2.9.4/config/Makefile.SH 2018-01-13 16:18:04.208394407 +0700 -@@ -250,5 +250,5 @@ - LN = $ln_s - CP_F = cp -f --STRIP = strip -+STRIP = true - STRIPFLAGS = - diff --git a/sci-mathematics/pari/pari-2.13.4-r1.ebuild b/sci-mathematics/pari/pari-2.13.4-r1.ebuild deleted file mode 100644 index 8a3f70f9f496..000000000000 --- a/sci-mathematics/pari/pari-2.13.4-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Computer-aided number theory C library and tools" -HOMEPAGE="https://pari.math.u-bordeaux.fr/" -SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz" - -LICENSE="GPL-2" - -# The subslot is the value of $soname_num obtained from -# upstream's config/version script. -SLOT="0/7" -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="data doc fltk gmp test threads X" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig - doc? ( virtual/latex-base ) -" -DEPEND=" - sys-libs/readline:0= - data? ( sci-mathematics/pari-data ) - doc? ( X? ( x11-misc/xdg-utils ) ) - fltk? ( x11-libs/fltk:1= ) - gmp? ( dev-libs/gmp:0= ) - X? ( x11-libs/libX11:0= )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}"-2.9.4-strip.patch - "${FILESDIR}/${PN}"-2.9.4-ppc.patch - "${FILESDIR}/${PN}"-2.11.2-no-automagic.patch - "${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch - "${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch - "${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch -) - -src_prepare() { - default - - # move doc dir to a gentoo doc dir and replace acroread by xdg-open - sed -i \ - -e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \ - -e 's:"acroread":"xdg-open":' \ - doc/gphelp.in || die "Failed to fix doc dir" - - # These tests fail when LaTeX is not installed (which we don't - # require without USE=doc), most likely due to output formatting - # issues but I haven't deleted my LaTeX installation to check. - # There's no real upstream support for enabling/disabling the LaTeX - # docs, so this is probably the correctest way to skip these tests. - if ! use doc; then - rm src/test/{in,32}/help || die - fi -} - -src_configure() { - tc-export CC CXX PKG_CONFIG - - # Workaraound to "asm operand has impossible constraints" as - # suggested in bug #499996. - use x86 && append-cflags $(test-flags-CC -fno-stack-check) - - # need to force optimization here, as it breaks without - if is-flag -O0; then - replace-flags -O0 -O2 - elif ! is-flag -O?; then - append-flags -O2 - fi - - # sysdatadir installs a pari.cfg stuff which is informative only. - # It is supposed to be for "architecture-dependent" data. - # It needs to be easily discoverable for downstream packages such as gp2c. - # We set LD to "" so that it is set to the value of the compiler used - # which is how a normal end user is expected to configure it. pari's build - # system do not cope very well with a naked linker, it is expecting a - # compiler driver. See https://bugs.gentoo.org/722090 - LD="" ./Configure \ - --prefix="${EPREFIX}"/usr \ - --datadir="${EPREFIX}/usr/share/${PN}" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --sysdatadir="${EPREFIX}"/usr/share/pari \ - --mandir="${EPREFIX}"/usr/share/man/man1 \ - --with-readline="${EPREFIX}"/usr \ - --with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \ - --with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \ - $(use_with fltk) \ - $(use_with gmp) \ - --without-qt \ - $(usex threads "--mt=pthread" "" "" "") \ - || die "./Configure failed" -} - -src_compile() { - emake gp - - if use doc; then - # To prevent sandbox violations by metafont - VARTEXFONTS="${T}/fonts" emake docpdf - fi -} - -src_test() { - # Welcome to the jungle, where the tests fail if you make your - # terminal bigger. - emake COLUMNS=80 test-all -} - -src_install() { - DOCS=( AUTHORS CHANGES* COMPAT NEW README* ) - default - - if use doc; then - docompress -x "/usr/share/doc/${PF}" - emake \ - DESTDIR="${D}" \ - EXDIR="${ED}/usr/share/doc/${PF}/examples" \ - DOCDIR="${ED}/usr/share/doc/${PF}" \ - install-doc - fi -} diff --git a/sci-mathematics/pari/pari-2.15.2-r2.ebuild b/sci-mathematics/pari/pari-2.15.3.ebuild index c25f507e52f3..664fd8a019f8 100644 --- a/sci-mathematics/pari/pari-2.15.2-r2.ebuild +++ b/sci-mathematics/pari/pari-2.15.3.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-2" # The subslot is the value of $soname_num obtained from # upstream's config/version script. SLOT="0/8" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="data doc examples fltk gmp test threads X" RESTRICT="!test? ( test )" @@ -33,10 +33,8 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}"-2.9.4-ppc.patch - "${FILESDIR}/${PN}"-2.11.2-no-automagic.patch "${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch - "${FILESDIR}/${PN}"-2.15.2-ellsea-r1.patch - "${FILESDIR}/${PN}"-2.15.2-install-doctex.patch + "${FILESDIR}/${PN}"-2.11.2-no-automagic.patch ) src_prepare() { diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest index 1d6310cc9c0a..c091688e3fb8 100644 --- a/sci-mathematics/petsc/Manifest +++ b/sci-mathematics/petsc/Manifest @@ -2,3 +2,4 @@ DIST petsc-3.16.0-fftw-without-mpi.patch.bz2 5824 BLAKE2B 59615b1bbaf8ca1da92d7d DIST petsc-3.16.0.tar.gz 16748960 BLAKE2B 87f9fdb79a9c44e5f476fa4746ad0cbe72f3eda9f6039f2e4743105626701d7c8d6c010fdb9d89becf8619288d0b7a60c8bc4e2fc0793eac5b39030b02c04fd9 SHA512 5280032fb4ec4d058733788bb0ae674e7400565e204133bd10ed88a2965230ec7adeaca2d498267ce661377ca7e6f9d948992206b1d679587606cb422c004655 DIST petsc-3.17.1.tar.gz 17082265 BLAKE2B de1bfe45f93e18e32181499e59912df9225c8e24d75f52e641e552fd43e4d5be48d549d284365b173aa93e51603f5b7740eaac0557ff8c7c96b370f4683257f6 SHA512 8c81cc148b1a899a55e54a013d61519ec7b44f98f7ae30c3f8d0e83ba285b23f4b4d9e2cd483c531d337bc41887e4079b727ba73676b1b653910140291e93575 DIST petsc-3.18.2.tar.gz 18409507 BLAKE2B 999d4fc80dedb5f9ce58333b6052b15ff499e3d5e4fee3e37639f5e3d2c5e86b514290d01e75b71795467436254d2cb8b05dac3d6252c80db898010bbed95544 SHA512 a8e9757144a20d61c004f54615821df7f9dbd920af71fea4674eb0fd1bf9f0b50dbc5c89aae285fef35a23daf67ba9647e479a6e92dbcd26e53fd8302735a47b +DIST petsc-3.19.1.tar.gz 16659061 BLAKE2B 8c7b22e5f97756261a5d0e8b707670d55db53e209fd1e116a2adb517d42f5e8bd5ecc911c9e967b88a8dc60a2d872c1d7a279539c65064884b4cfbe856434ad3 SHA512 5b9b71599a95e2d82d18d5313c424a08eead0c10f27f40c82159839ef0fa8aeda88ddea693a12d58b8ac29a41c4138e8188a3c91d6af540196ee3a977cf9539d diff --git a/sci-mathematics/petsc/petsc-3.19.1.ebuild b/sci-mathematics/petsc/petsc-3.19.1.ebuild new file mode 100644 index 000000000000..f57281175844 --- /dev/null +++ b/sci-mathematics/petsc/petsc-3.19.1.ebuild @@ -0,0 +1,236 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} pypy3 ) + +inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs + +DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation" +HOMEPAGE="https://www.mcs.anl.gov/petsc" +SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="afterimage boost complex-scalars debug +examples fftw +fortran hdf5 hypre int64 mpi metis mumps scotch superlu threads X" + +# readd sparse when suitesparse-5.6.0 is in tree +# sparse? ( >=sci-libs/suitesparse-5.6.0 >=sci-libs/cholmod-1.7.0 ) +# $(use_with sparse suitesparse) \ +RDEPEND=" + virtual/blas + virtual/lapack + + afterimage? ( media-libs/libafterimage ) + boost? ( dev-libs/boost ) + fftw? ( sci-libs/fftw:3.0[mpi?] ) + hdf5? ( sci-libs/hdf5[mpi?] ) + hypre? ( >=sci-libs/hypre-2.18.0[int64?,mpi?] ) + metis? ( >=sci-libs/parmetis-4 ) + mpi? ( virtual/mpi[fortran?] ) + mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) + scotch? ( sci-libs/scotch[int64?,mpi?] ) + superlu? ( >=sci-libs/superlu-5 ) + X? ( x11-libs/libX11 ) +" +DEPEND=" + ${RDEPEND} + ${PYTHON_DEPS} +" +BDEPEND=" + dev-util/cmake + sys-apps/which + virtual/pkgconfig +" + +# hypre and superlu curretly exclude each other due to missing linking to hypre +# if both are enabled +REQUIRED_USE=" + afterimage? ( X ) + complex-scalars? ( !hypre !superlu ) + fftw? ( mpi ) + hdf5? ( mpi ) + hypre? ( mpi !superlu ) + mumps? ( mpi scotch ) + scotch? ( mpi ) + superlu? ( !hypre ) +" +PATCHES=( + "${FILESDIR}/${PN}-3.7.0-disable-rpath.patch" + "${FILESDIR}"/${PN}-3.16.0-fix_sandbox_violation.patch +) + +# petsc uses --with-blah=1 and --with-blah=0 to en/disable options +petsc_enable() { + use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0" +} +# add external library: +# petsc_with use_flag libname libdir +# petsc_with use_flag libname include linking_libs +petsc_with() { + local myuse p=${2:-${1}} + if use ${1}; then + myuse="--with-${p}=1" + if [[ $# -ge 4 ]]; then + myuse="${myuse} --with-${p}-include=${EPREFIX}${3}" + shift 3 + myuse="${myuse} --with-${p}-lib=$@" + else + myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}" + fi + else + myuse="--with-${p}=0" + fi + echo ${myuse} +} + +# select between configure options depending on use flag +petsc_select() { + use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4" +} + +src_configure() { + # bug 548498 + # PETSc runs mpi processes during configure that result in a sandbox + # violation by trying to open /proc/mtrr rw. This is not easy to + # mitigate because it happens in libpciaccess.so called by libhwloc.so, + # which is used by libmpi.so. + addpredict /proc/mtrr + # if mpi is built with knem support it needs /dev/knem too + addpredict /dev/knem + + # configureMPITypes with openmpi-2* insists on accessing the scaling + # governor rw. + addpredict /sys/devices/system/cpu/ + + # bug 771711 + # configureMPIEXEC and configureMPITypes access /dev/nvidiactl + addpredict /dev/nvidiactl + + # bug 810841 + addpredict /dev/kfd + + local myopt + + use debug && myopt="debug" || myopt="opt" + + # environmental variables expected by petsc during build + + export PETSC_DIR="${S}" + export PETSC_ARCH="linux-gnu-c-${myopt}" + + if use debug; then + strip-flags + filter-flags -O* + fi + + tc-export AR RANLIB + + # C Support on CXX builds is enabled if possible i.e. when not using + # complex scalars (no complex type for both available at the same time) + + econf \ + scrollOutput=1 \ + AR="${AR}" \ + CFLAGS="${CFLAGS} -fPIC" \ + CPPFLAGS="${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS} -fPIC" \ + CXXOPTFLAGS="${CXXFLAGS} -fPIC" \ + FCFLAGS="${FCFLAGS} -fPIC" \ + FFLAGS="${FFLAGS} -fPIC" \ + LDFLAGS="${LDFLAGS}" \ + MAKEFLAGS="${MAKEFLAGS}" \ + RANLIB="${RANLIB}" \ + --prefix="${EPREFIX}/usr/$(get_libdir)/petscdir/" \ + --with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \ + --with-cmake:BOOL=1 \ + --with-gnu-compilers \ + --with-imagemagick=0 \ + --with-petsc-arch="${PETSC_ARCH}" \ + --with-precision=double \ + --with-python=0 \ + --with-shared-libraries \ + --with-single-library \ + --with-windows-graphics=0 \ + $(petsc_enable debug debugging) \ + $(petsc_enable fortran) \ + $(petsc_enable mpi) \ + $(petsc_enable mpi mpi-compilers) \ + $(petsc_enable threads pthread) \ + $(petsc_select complex-scalars scalar-type complex real) \ + $(petsc_select mpi cc mpicc $(tc-getCC)) \ + $(petsc_select mpi cxx mpicxx $(tc-getCXX)) \ + $(petsc_with afterimage afterimage /usr/include/libAfterImage -lAfterImage) \ + $(petsc_with hypre hypre /usr/include/hypre -lHYPRE) \ + $(petsc_with superlu superlu /usr/include/superlu -lsuperlu) \ + $(petsc_with scotch ptscotch /usr/include/scotch [-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \ + $(petsc_with mumps scalapack /usr/include/scalapack -lscalapack) \ + $(petsc_with mumps mumps /usr/include [-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \ + $(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \ + $(use int64 && echo "--with-index-size=64") \ + $(use_with boost) \ + $(use_with fftw) \ + $(use_with hdf5) \ + $(use_with X x) \ + $(use_with X x11) +} + +src_install() { + emake DESTDIR="${ED}" install + + # + # Clean up the mess: + # + + # put all include directories under a proper subdirectory + mkdir "${ED}"/usr/include || die "mkdir failed (include)" + mv "${ED}"/usr/{$(get_libdir)/petscdir/include,include/petsc} || die "mv failed (include)" + + # put libraries and pkconfig file into proper place + mv "${ED}"/usr/$(get_libdir)/petscdir/lib/{libpetsc*,pkgconfig} \ + "${ED}/usr/$(get_libdir)" || die "mv failed (lib)" + + # move share to proper location + mv "${ED}"/usr/{$(get_libdir)/petscdir/share,share} || die "mv failed (share)" + + # fix pc files: + sed -i \ + -e 's#include$#include/petsc#' \ + -e "s#lib\$#$(get_libdir)#" \ + -e "s#^prefix=.*petscdir\$#prefix=${EPREFIX}/usr#" \ + "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc || die "sed failed (pkgconfig)" + + # recreate a "valid" petscdir: + for i in "${ED}"/usr/$(get_libdir)/*; do + [ $(basename $i) = petscdir ] && continue + ln -s "${EPREFIX}/usr/$(get_libdir)/$(basename $i)" \ + "${ED}/usr/$(get_libdir)/petscdir/lib/$(basename $i)" || die "ln failed (petscdir)" + done + ln -s "${EPREFIX}"/usr/include/petsc/ \ + "${ED}/usr/$(get_libdir)/petscdir/include" || die "ln failed (petscdir)" + mkdir "${ED}/usr/$(get_libdir)/petscdir/share" || die "mkdir fialed (petscdir)" + ln -s "${EPREFIX}"/usr/share/petsc/ \ + "${ED}/usr/$(get_libdir)/petscdir/share/petsc" || die "ln failed (petscdir)" + + # automatically symlink petsc matlab modules: + mkdir -p "${ED}"/usr/share/octave/site/m/ + ln -s "${EPREFIX}"/usr/share/petsc/matlab "${ED}"/usr/share/octave/site/m/petsc || die "ln failed (matlab)" + + if use examples; then + mkdir -p "${ED}"/usr/share/doc/${PF} || die "mkdir failed (examples)" + mv "${ED}"/usr/share/petsc/examples "${ED}"/usr/share/doc/${PF} || die "mv failed (examples)" + ln -s "${EPREFIX}"/usr/share/doc/${PF}/examples "${ED}"/usr/share/petsc/examples || die "ln failed (examples)" + docompress -x /usr/share/doc/${PF}/examples + else + rm -r "${ED}"/usr/share/petsc/examples || die "rm failed (examples)" + fi + + # add PETSC_DIR to environmental variables + cat >> 99petsc <<- EOF + PETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petscdir + EOF + doenvd 99petsc +} diff --git a/sci-mathematics/plfit/Manifest b/sci-mathematics/plfit/Manifest new file mode 100644 index 000000000000..03611001ad5e --- /dev/null +++ b/sci-mathematics/plfit/Manifest @@ -0,0 +1 @@ +DIST plfit-0.9.3.tar.gz 178880 BLAKE2B 611c4d30fa39cb05f8324670c484fd504abf2b1638602f5fede31438bf831f8aa3d7f3a5c6f2edbab377c99bf5f67763149f288581778fdd2fe9a1596a0d4a23 SHA512 6ca0fab75f607b27801576ff6752002079e11c736d0c3f6a669f20bb2869a254aa3ba124a5f6df1ad1daed25c59c8b0952838478cd42570e6d399958f0796e84 diff --git a/sci-mathematics/plfit/metadata.xml b/sci-mathematics/plfit/metadata.xml new file mode 100644 index 000000000000..fad11365ac2d --- /dev/null +++ b/sci-mathematics/plfit/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mjo@gentoo.org</email> + </maintainer> + <maintainer type="project"> + <email>sci-mathematics@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">ntamas/plfit</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-mathematics/plfit/plfit-0.9.3.ebuild b/sci-mathematics/plfit/plfit-0.9.3.ebuild new file mode 100644 index 000000000000..f5c15c46b845 --- /dev/null +++ b/sci-mathematics/plfit/plfit-0.9.3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Fit power-law distributions to empirical data" +HOMEPAGE="https://github.com/ntamas/plfit" +SRC_URI="https://github.com/ntamas/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz" +# plfit is gpl-2 and its source headers say "or later." The upstream +# doc/ directory contains MIT and BSD licenses for two components. +LICENSE="BSD GPL-2+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2" + +DOCS=( CHANGELOG.md README.rst doc/THANKS ) + +src_configure() { + local mycmakeargs=( + -DPLFIT_COMPILE_PYTHON_MODULE=OFF + -DPLFIT_USE_SSE=OFF + -DPLFIT_USE_OPENMP=OFF + ) + if use cpu_flags_x86_sse || use cpu_flags_x86_sse2; then + # plfit chooses which to use at compile time based on the + # constants __SSE__ and __SSE2__. + mycmakeargs+=( -DPLFIT_USE_SSE=ON ) + fi + cmake_src_configure +} diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest index d90af33d1051..b5a148defe82 100644 --- a/sci-mathematics/polymake/Manifest +++ b/sci-mathematics/polymake/Manifest @@ -1,2 +1,2 @@ DIST polymake-4.6-minimal.tar.bz2 5634651 BLAKE2B 6ee24fa6e70fdf746ea298d78e21e17fe38c5837ae2d3153e53656b4b003555b06897f463220b59474eed1111135dfa61c080d08d6363391afca51011f331122 SHA512 90f04c67bf297fb1b9f5a51d1654ff12385860b1fc80278a8b47f65970f11a1e0f33ede8a839b54a12422e772c8b76302ff78cc467712a2486f6e76ce0d5ab20 -DIST polymake-4.8-minimal.tar.bz2 7283871 BLAKE2B 0f54282e0b07e357a6e746cb4c4b579c65a6eb6b942c541047a0213529191404a36666ac38279351ffef944fddb2cd299fcbe7ac6d9873368fb00ec221bc81e5 SHA512 d3ce7426fa78194254271274849aadb1b7f1afe176c16f79da7e5569ec30004e20a46d3c3a09d45ecb3210d73c850427920ca8a36f93c7f7d9420827fe2a3a00 +DIST polymake-4.9-minimal.tar.bz2 7287220 BLAKE2B 4a40c3177bc146c16ae7924c2911bd96a26e7eec82963dba1293db272e60a6efea59bd27575951ecbe343862c1c28ecf1f2eb5c2bd1b9b09ef475a7ef44a6b95 SHA512 5c762a59b135dbb1bbcff9a0133a17c20529dc14a5af19efc2afbc1ae773ea3834ccc6b97db130ec91d9cd7a3a20988360b1d844f70272724794ac81ab42658f diff --git a/sci-mathematics/polymake/polymake-4.8.ebuild b/sci-mathematics/polymake/polymake-4.9.ebuild index 66795c00f8c7..3217de2e4b3d 100644 --- a/sci-mathematics/polymake/polymake-4.8.ebuild +++ b/sci-mathematics/polymake/polymake-4.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-mathematics/primecount/Manifest b/sci-mathematics/primecount/Manifest index 108b8d583077..1e26ee5dd234 100644 --- a/sci-mathematics/primecount/Manifest +++ b/sci-mathematics/primecount/Manifest @@ -1,2 +1 @@ -DIST primecount-7.4.tar.gz 372374 BLAKE2B ca16004e1a1fe209452d1c4aa9d4dfe7816ff581ffbb9717ae9a8224815df0b672871ec3d749000099a91c8ee50bcc3c43cea3dcb9ff999436544bed2c2f5fde SHA512 20b33a1c0d2338f422a0da8723bafd35689f9c93918c7dcf64068aee1cd5e03f41d0ef49e39a7e920828b478e8faeda4fea477dacca1145c852f24d1f5e6ab5b DIST primecount-7.6.tar.gz 382074 BLAKE2B f665db8724b32b2f057db96fdd6421d7a996ed4bda7f43cd405e6c05b59abab8672407c41b6fafdd9c68dae3f51b65305112c0724c95ce3fdb33b9dbfaadfbff SHA512 643372d9a011dba8a49f21eabc00068b77a5ef5dc6d12e6b55230b97f14dc9d1d855bb7ad662beda548e4ff1396f1b06d473e2fe4b81e7dbe9926aaadc4da360 diff --git a/sci-mathematics/primecount/primecount-7.4.ebuild b/sci-mathematics/primecount/primecount-7.4.ebuild deleted file mode 100644 index 457c9e552afa..000000000000 --- a/sci-mathematics/primecount/primecount-7.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="Highly optimized CLI and library to count primes" -HOMEPAGE="https://github.com/kimwalisch/primecount" -SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/7" # subslot is first component of libprimecount.so version -KEYWORDS="amd64" -IUSE="cpu_flags_x86_popcnt +executable openmp test" -RESTRICT="!test? ( test )" - -DEPEND=">=sci-mathematics/primesieve-8.0:=" -RDEPEND="${DEPEND}" - -DOCS=( - ChangeLog - README.md - doc/Credits.md - doc/Easy-Special-Leaves.md - doc/Hard-Special-Leaves.md - doc/Records.md - doc/References.md - doc/alpha-factor-dr.pdf - doc/alpha-factor-gourdon.pdf - doc/alpha-factor-lmo.pdf - doc/libprimecount.md -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIBPRIMESIEVE="OFF" - -DBUILD_PRIMECOUNT="$(usex executable)" - -DBUILD_STATIC_LIBS="OFF" - -DBUILD_TESTS="$(usex test)" - -DWITH_OPENMP="$(usex openmp)" - -DWITH_POPCNT="$(usex cpu_flags_x86_popcnt)" - ) - - cmake_src_configure -} diff --git a/sci-mathematics/primecount/primecount-7.6.ebuild b/sci-mathematics/primecount/primecount-7.6.ebuild index 4675e44b1d5d..7ea70f3af335 100644 --- a/sci-mathematics/primecount/primecount-7.6.ebuild +++ b/sci-mathematics/primecount/primecount-7.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> LICENSE="BSD-2" SLOT="0/7" # subslot is first component of libprimecount.so version -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="cpu_flags_x86_popcnt +executable openmp test" RESTRICT="!test? ( test )" diff --git a/sci-mathematics/primesieve/Manifest b/sci-mathematics/primesieve/Manifest index 2b5abb76ed6b..d61583c50cca 100644 --- a/sci-mathematics/primesieve/Manifest +++ b/sci-mathematics/primesieve/Manifest @@ -1,2 +1 @@ DIST primesieve-11.0.tar.gz 125086 BLAKE2B ac425b6435bc95efbfc3d7458b59719af390508db811e0a993a606397166771cfcb9c0269249341fb6f678aafa8bae4a89e7a914176f61a608e6ccdfd0cab22b SHA512 1be9ff9d07068cab1ca69315010238ab15e5ba3b674bd45e9a0e11d20418810ece05a8df3853796118193468ac2ac6e24391f82d6db9581658ce59ddabb5b7fc -DIST primesieve-8.0.tar.gz 119635 BLAKE2B e769cfe35752e809cf1611b3a9034bc79d16311c73d5065880cbec9c8179a2149ee9a3a6e277466691c44adf07781e1c7f9aa53f140714c4c9d408b24df17848 SHA512 213785c89868f224091fe76a74b98a896c374a7a96e2bdb44b07f4c6288bd50e22d9a563382fb512e71a1ad366d8b94e74fcc8b5f58bb94c85b4d435fbb6a571 diff --git a/sci-mathematics/primesieve/primesieve-11.0.ebuild b/sci-mathematics/primesieve/primesieve-11.0.ebuild index 44fb41efb869..311cdce23898 100644 --- a/sci-mathematics/primesieve/primesieve-11.0.ebuild +++ b/sci-mathematics/primesieve/primesieve-11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/kimwalisch/primesieve" SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" SLOT="0/11" # subslot is first component of libprimesieve.so version -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="doc +executable test" RESTRICT="!test? ( test )" diff --git a/sci-mathematics/primesieve/primesieve-8.0.ebuild b/sci-mathematics/primesieve/primesieve-8.0.ebuild deleted file mode 100644 index 70bfdd3e99f2..000000000000 --- a/sci-mathematics/primesieve/primesieve-8.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="CLI and library for quickly generating prime numbers" -HOMEPAGE="https://github.com/kimwalisch/primesieve" -SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD-2" -SLOT="0/10" # subslot is first component of libprimesieve.so version -KEYWORDS="amd64" -IUSE="doc +executable test" -RESTRICT="!test? ( test )" - -BDEPEND="doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz )" -DEPEND="" -RDEPEND="" - -DOCS=( - ChangeLog - README.md - doc/ALGORITHMS.md - doc/CPP_API.md - doc/C_API.md -) - -src_configure() { - local mycmakeargs=( - -DBUILD_DOC="$(usex doc)" - -DBUILD_PRIMESIEVE="$(usex executable)" - -DBUILD_STATIC_LIBS="OFF" - -DBUILD_TESTS="$(usex test)" - ) - - if use doc; then - DOCS+=( - "${BUILD_DIR}/doc/html" - "${BUILD_DIR}/doc/latex/refman.pdf" - ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_build doc -} diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest index c39749c73f29..e25fe781af5c 100644 --- a/sci-mathematics/singular/Manifest +++ b/sci-mathematics/singular/Manifest @@ -1,2 +1,3 @@ DIST singular-4.3.1p1.tar.gz 15090370 BLAKE2B d4e40378b3892b98b1f78c3928c8a40484336ea25ea4dcd4b3a1e5f651281d2cdb06d92c9cc64427ce76e91c5bf4eaa1c3b643df174a24c188823ae808817ad9 SHA512 d27d8e042ea085e49aed6a0697056c36e78e62ea0b9d17751cdf4c556cf4f6efce3b34b411c77aef97c6d90675bea11c97651eb7009634cb8a9b630ec820a06e DIST singular-4.3.1p3.tar.gz 14991986 BLAKE2B 0ae2585a362839914d3a134bfe637f6faa34d95f58937f2adcca0c5a35e3218eb36554bae8187f5bb3a423dcac445c836e9bfff2d0d1a19d4e14a4452b84d839 SHA512 f092683f4a92158d82a2e694f284662c6285bac5faaa7d5e5695a84a220012fb8a733b4bbc52820def3037e1596ea4c2ab3846f58a3a3fb19e01bf7595790462 +DIST singular-4.3.2p1.tar.gz 15013729 BLAKE2B 00276f2417cd9e2b71afcae66c2aeb7f9d4f434f5a90deeee56dded66e6d5e0020ab0b06b6561e41f5b196262993732ffeb9196f59315f1b6a081b0029fc99a1 SHA512 451054a0bf33b9d1c94a63f0946e1eb7b3e7b92bc025b6aa4f64e65183aeebd6354bac5f87f6e8b35cb713b30e97af5c66f92f02683144bb426f5e3a828db616 diff --git a/sci-mathematics/singular/singular-4.3.1_p3.ebuild b/sci-mathematics/singular/singular-4.3.1_p3.ebuild index b51070f29cc5..ad7f220f5d21 100644 --- a/sci-mathematics/singular/singular-4.3.1_p3.ebuild +++ b/sci-mathematics/singular/singular-4.3.1_p3.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}" LICENSE="BSD GPL-2 GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux" +KEYWORDS="amd64 ~ppc ~riscv x86 ~x86-linux" IUSE="emacs examples polymake +readline static-libs" RDEPEND=" diff --git a/sci-mathematics/singular/singular-4.3.2_p1.ebuild b/sci-mathematics/singular/singular-4.3.2_p1.ebuild new file mode 100644 index 000000000000..82abd43c1f8e --- /dev/null +++ b/sci-mathematics/singular/singular-4.3.2_p1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp-common + +MY_PN=Singular +MY_PV=$(ver_rs 3 '') +# Consistency is different... +MY_DIR2=$(ver_cut 1-3 ${PV}) +MY_DIR=$(ver_rs 1- '-' ${MY_DIR2}) + +DESCRIPTION="Computer algebra system for polynomial computations" +HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular" +SRC_URI="https://www.singular.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-${MY_DIR2}" + +LICENSE="BSD GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux" +IUSE="emacs examples polymake +readline static-libs" + +# The interactive help uses "info" from sys-apps/texinfo. +RDEPEND=" + dev-lang/perl + dev-libs/gmp:0 + dev-libs/ntl:= + sci-libs/cddlib + sci-mathematics/flint + sys-apps/texinfo + emacs? ( >=app-editors/emacs-23.1:* ) + polymake? ( sci-mathematics/polymake ) + readline? ( sys-libs/readline ) +" +DEPEND="${RDEPEND}" + +SITEFILE=60${PN}-gentoo.el + +src_configure() { + local myconf=( + --disable-debug + --disable-doc + --disable-optimizationflags + --disable-pyobject-module + --disable-python + --disable-python-module + --disable-python_module + --enable-factory + --enable-gfanlib + --enable-libfac + --with-flint + --with-gmp + --with-libparse + --with-ntl + --without-python + --without-pythonmodule + $(use_enable emacs) + $(use_enable polymake polymake-module) + $(use_enable static-libs static) + $(use_with readline) + ) + econf "${myconf[@]}" +} + +src_compile() { + default + + if use emacs; then + pushd "${S}"/emacs + elisp-compile *.el || die "elisp-compile failed" + popd + fi +} + +src_install() { + # Do not compress singular's info file (singular.hlp) + # some consumer of that file do not know how to deal with compression + docompress -x /usr/share/info + + default + + dosym Singular /usr/bin/"${PN}" + + # purge .la file + find "${ED}" -name '*.la' -delete || die +} + +src_test() { + # SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from + # an already installed version of singular may be used and cause segfault + # See https://github.com/Singular/Sources/issues/980 + SINGULAR_PROCS_DIR="" emake check +} + +pkg_postinst() { + einfo "Additional functionality can be enabled by installing" + einfo "sci-mathematics/4ti2" + + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sci-mathematics/slepc/Manifest b/sci-mathematics/slepc/Manifest index 5c0d593e316c..989e43b029f9 100644 --- a/sci-mathematics/slepc/Manifest +++ b/sci-mathematics/slepc/Manifest @@ -1,3 +1,5 @@ DIST slepc-3.16.0.tar.gz 5486237 BLAKE2B 28f45036ba7e6aa2b227c6f25e2c8edf7fc6914f3150043a7e310f270d24e669f32172897b558687c33a809c484e314a865296d4879a622d85004d329ec3bd1c SHA512 15ba9e4626fe3cf44142448b77869fa6d313bb7c026736d5552dfbab1ce350c2e2f2379fb647a1c236af8cb95895e4442dca1defa741a5b2b9172cbdf0baf75f DIST slepc-3.17.1.tar.gz 5450177 BLAKE2B ec4f597085a176a010797d599779cc4532e52996105bb76f755073876ebb81026c580cb5759a03bda58cb2de2767b1dcdb01ff0d946f218117edb2a7a6557414 SHA512 5429aa7516ec0b2fee8158f9317634faf1c963aa60237be81a0392d5f2fa9f531db59b4a9ad04e266d808befdbd71b5a30259b4abc639a1da2defffd74acd35b DIST slepc-3.18.1.tar.gz 6013016 BLAKE2B 1526b7e6e0f0387a8410cfcbee9bc62f35f930420b86bcb58146b16f73b28b349c6aad0ef59e02a635c374a0a8b6eb16ac50b7bcb79ce6c06a3de56029db551a SHA512 d366844c492be6bf77edabdbe0d61672ead45605fc299c25ac24bf14d9d15bc107bb62f0d08aa403a5f269a2b12ae4d7cd3768958d792812e6c1924b93a27be4 +DIST slepc-3.19.0.tar.gz 1803822 BLAKE2B 742cc773e649d46ff8513263ef53fe5d62f6cac537d5444eeeb494d0816d496a5c0c2f260615aa8a82ebdc983877302acf7d0c88f01bd4bea66246149dabac13 SHA512 edb8c589c162766a7b4a81b484356f2a5b2f70a7c90c87e39efda1a00f6fe544d7ae644e8903059b7dab990c1fa2129cd5d1c7dbb759511483ab43d3d691419c +DIST slepc-with-docs-3.19.0.tar.gz 6320650 BLAKE2B 32d383d7ddfe6cf21755fcae768517830076d38ef4c0d844c0a4270194de541a32849883d951f1a47d98491be05866b415de3ca6148b9d9cdf0bfc5e6487234e SHA512 48695c8449a323755a5d8bd3e88560e72ef82a48d0d1150e2a751a323db02836b76666bbaea3bb44c9a79b900a93337f6ced12aba6cfd939a7c1edae49f17e71 diff --git a/sci-mathematics/slepc/slepc-3.19.0.ebuild b/sci-mathematics/slepc/slepc-3.19.0.ebuild new file mode 100644 index 000000000000..3622655a7bd1 --- /dev/null +++ b/sci-mathematics/slepc/slepc-3.19.0.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit python-any-r1 + +DESCRIPTION="Scalable Library for Eigenvalue Problem Computations" +HOMEPAGE="https://slepc.upv.es/" +SRC_URI=" + !doc? ( https://slepc.upv.es/download/distrib/${P}.tar.gz ) + doc? ( https://slepc.upv.es/download/distrib/${PN}-with-docs-${PV}.tar.gz )" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="arpack complex-scalars doc +examples mpi" + +REQUIRED_USE="arpack? ( mpi )" + +RDEPEND=" + =sci-mathematics/petsc-$(ver_cut 1-2)*:=[examples,mpi=,complex-scalars=] + arpack? ( sci-libs/arpack[mpi=] ) + mpi? ( virtual/mpi ) +" + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + dev-util/cmake +" + +MAKEOPTS="${MAKEOPTS} V=1" + +src_unpack() { + use doc || unpack ${P}.tar.gz + use doc && unpack ${PN}-with-docs-${PV}.tar.gz +} + +src_configure() { + # *sigh* + addpredict "${PETSC_DIR}"/.nagged + + # Make sure that the environment is set up correctly: + unset PETSC_DIR + unset PETSC_ARCH + source "${EPREFIX}"/etc/env.d/99petsc + export PETSC_DIR + export PETSC_ARCH + export SLEPC_DIR="${S}" + + # configure is a custom python script and doesn't want to have default + # configure arguments that we set with econf + if use arpack; then + ./configure \ + --prefix="${EPREFIX}/usr/$(get_libdir)/slepcdir" \ + --with-arpack=1 \ + --with-arpack-lib="$(usex mpi "-lparpack -larpack" "-larpack")" + else + ./configure \ + --prefix="${EPREFIX}/usr/$(get_libdir)/slepcdir" \ + --with-arpack=0 + fi +} + +src_install() { + emake DESTDIR="${ED}" install + + # + # Clean up the mess: + # + + # put all include directories under a proper subdirectory + mkdir "${ED}"/usr/include || die "mkdir failed (include)" + mv "${ED}"/usr/{$(get_libdir)/slepcdir/include,include/slepc} || die "mv failed (include)" + + # put libraries and pkconfig file into proper place + mv "${ED}"/usr/$(get_libdir)/slepcdir/lib/{libslepc*,pkgconfig} \ + "${ED}/usr/$(get_libdir)" || die "mv failed (lib)" + + # move share to proper location + mv "${ED}"/usr/{$(get_libdir)/slepcdir/share,share} || die "mv failed (share)" + + # fix pc files: + sed -i \ + -e 's#include$#include/slepc#' \ + -e "s#lib\$#$(get_libdir)#" \ + -e "s#^prefix=.*slepcdir\$#prefix=${EPREFIX}/usr#" \ + "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc || die "sed failed (pkgconfig)" + + # recreate a "valid" slepcdir: + for i in "${ED}"/usr/$(get_libdir)/*; do + [ $(basename $i) = slepcdir ] && continue + ln -s "${EPREFIX}/usr/$(get_libdir)/$(basename $i)" \ + "${ED}/usr/$(get_libdir)/slepcdir/lib/$(basename $i)" || die "ln failed (slepcdir)" + done + ln -s "${EPREFIX}"/usr/include/slepc/ \ + "${ED}/usr/$(get_libdir)/slepcdir/include" || die "ln failed (slepcdir)" + mkdir "${ED}/usr/$(get_libdir)/slepcdir/share" || die "mkdir fialed (slepcdir)" + ln -s "${EPREFIX}"/usr/share/slepc/ \ + "${ED}/usr/$(get_libdir)/slepcdir/share/slepc" || die "ln failed (slepcdir)" + + if use examples; then + mkdir -p "${ED}"/usr/share/doc/${PF} || die "mkdir failed (examples)" + mv "${ED}"/usr/share/slepc/examples "${ED}"/usr/share/doc/${PF} || die "mv failed (examples)" + ln -s "${EPREFIX}"/usr/share/doc/${PF}/examples "${ED}"/usr/share/slepc/examples || die "ln failed (examples)" + docompress -x /usr/share/doc/${PF}/examples + else + rm -r "${ED}"/usr/share/slepc/examples || die "rm failed (examples)" + fi + + if use doc ; then + dodoc docs/slepc.pdf + docinto html + dodoc -r docs/*.html docs/manualpages + fi + + # add PETSC_DIR to environmental variables + cat >> 99slepc <<- EOF + SLEPC_DIR=${EPREFIX}/usr/$(get_libdir)/slepcdir + EOF + doenvd 99slepc +} diff --git a/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild b/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild index 30f4b003bd3f..dc297a1f0de8 100644 --- a/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild +++ b/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild @@ -3,21 +3,23 @@ EAPI=8 -H=32d7fa8751f668f9e9a18e4e96df3337b53d2150 +[[ ${PV} == *_p20211018 ]] && COMMIT=32d7fa8751f668f9e9a18e4e96df3337b53d2150 inherit java-pkg-2 java-ant-2 DESCRIPTION="Interpolating SMT-solver computing Craig interpolants for various theories" -HOMEPAGE="http://ultimate.informatik.uni-freiburg.de/smtinterpol/" -SRC_URI="https://github.com/ultimate-pa/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${H}" +HOMEPAGE="http://ultimate.informatik.uni-freiburg.de/smtinterpol/ + https://github.com/ultimate-pa/smtinterpol/" +SRC_URI="https://github.com/ultimate-pa/${PN}/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${COMMIT} LICENSE="LGPL-3" SLOT="0" KEYWORDS="amd64 ~x86" -DEPEND=">=virtual/jdk-1.8" RDEPEND=">=virtual/jre-1.8" +DEPEND=">=virtual/jdk-1.8" PATCHES=( "${FILESDIR}"/${PN}-Version.template-version.patch diff --git a/sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch b/sci-mathematics/stp/files/stp-2.3.3-CMakeLists.txt-fix_cflags.patch index 93817e209376..93817e209376 100644 --- a/sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch +++ b/sci-mathematics/stp/files/stp-2.3.3-CMakeLists.txt-fix_cflags.patch diff --git a/sci-mathematics/stp/files/stp-2.3.3-cstdint.patch b/sci-mathematics/stp/files/stp-2.3.3-cstdint.patch new file mode 100644 index 000000000000..4c010848ee36 --- /dev/null +++ b/sci-mathematics/stp/files/stp-2.3.3-cstdint.patch @@ -0,0 +1,11 @@ +--- a/./include/stp/AST/ASTNode.h ++++ b/./include/stp/AST/ASTNode.h +@@ -24,6 +24,8 @@ THE SOFTWARE. + #ifndef ASTNODE_H + #define ASTNODE_H + ++#include <cstdint> ++ + #include "stp/AST/NodeFactory/HashingNodeFactory.h" + #include "stp/Util/Attributes.h" + #include "ASTInternal.h" diff --git a/sci-mathematics/stp/files/stp-stp.py-library_path.patch b/sci-mathematics/stp/files/stp-2.3.3-stp.py-library_path.patch index 60b54aa2c1da..60b54aa2c1da 100644 --- a/sci-mathematics/stp/files/stp-stp.py-library_path.patch +++ b/sci-mathematics/stp/files/stp-2.3.3-stp.py-library_path.patch diff --git a/sci-mathematics/stp/stp-2.3.3-r2.ebuild b/sci-mathematics/stp/stp-2.3.3-r3.ebuild index 8c6578dface1..3aa8309bf123 100644 --- a/sci-mathematics/stp/stp-2.3.3-r2.ebuild +++ b/sci-mathematics/stp/stp-2.3.3-r3.ebuild @@ -3,21 +3,26 @@ EAPI=8 -OC_H=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45 -GT_H=2ad076167a676e3ed62f90b754b30fac5caa1f88 +OC_COMMIT=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45 +GT_COMMIT=2ad076167a676e3ed62f90b754b30fac5caa1f88 -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit flag-o-matic python-single-r1 cmake DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors" HOMEPAGE="https://stp.github.io/ https://github.com/stp/stp/" -SRC_URI="https://github.com/stp/stp/archive/${PV}.tar.gz -> ${P}.tar.gz +SRC_URI=" + https://github.com/stp/stp/archive/${PV}.tar.gz + -> ${P}.tar.gz test? ( - https://github.com/stp/OutputCheck/archive/${OC_H}.tar.gz -> ${P}_OutputCheck.tar.gz - https://github.com/stp/googletest/archive/${GT_H}.tar.gz -> ${P}_gtest.tar.gz - )" + https://github.com/stp/OutputCheck/archive/${OC_COMMIT}.tar.gz + -> ${P}_OutputCheck.tar.gz + https://github.com/stp/googletest/archive/${GT_COMMIT}.tar.gz + -> ${P}_gtest.tar.gz + ) +" LICENSE="GPL-2+ MIT" SLOT="0/${PV}" @@ -38,11 +43,15 @@ RDEPEND=" python? ( ${PYTHON_DEPS} ) " DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-python/lit )" +BDEPEND=" + sys-apps/help2man + test? ( dev-python/lit ) +" PATCHES=( - "${FILESDIR}"/stp-CMakeLists.txt-fix_cflags.patch - "${FILESDIR}"/stp-stp.py-library_path.patch + "${FILESDIR}"/${P}-CMakeLists.txt-fix_cflags.patch + "${FILESDIR}"/${P}-cstdint.patch + "${FILESDIR}"/${P}-stp.py-library_path.patch ) pkg_setup() { @@ -82,7 +91,7 @@ src_configure() { CMAKE_BUILD_TYPE=Release fi - local mycmakeargs=( + local -a mycmakeargs=( -DTEST_C_API=OFF # C API test fail -DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON') # double negation -DENABLE_PYTHON_INTERFACE=$(usex python) diff --git a/sci-mathematics/vampire/files/vampire-4.6.1-musl.patch b/sci-mathematics/vampire/files/vampire-4.6.1-musl.patch new file mode 100644 index 000000000000..4d3d4c56041e --- /dev/null +++ b/sci-mathematics/vampire/files/vampire-4.6.1-musl.patch @@ -0,0 +1,40 @@ +From 48733f4e2d9500b3bdc54563cf117c7fa07193ed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org> +Date: Mon, 6 Feb 2023 14:34:05 +0100 +Subject: [PATCH] Minisat/utils/System.*: use fpu_control only on glibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Maciej Barć <xgqt@gentoo.org> +--- + Minisat/utils/System.cc | 2 +- + Minisat/utils/System.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Minisat/utils/System.cc b/Minisat/utils/System.cc +index 942ddb712..2936faa5d 100644 +--- a/Minisat/utils/System.cc ++++ b/Minisat/utils/System.cc +@@ -104,7 +104,7 @@ double Minisat::memUsedPeak(bool) { + + void Minisat::setX86FPUPrecision() + { +-#if defined(__linux__) && defined(_FPU_EXTENDED) && defined(_FPU_DOUBLE) && defined(_FPU_GETCW) ++#if defined(__GLIBC__) && defined(_FPU_EXTENDED) && defined(_FPU_DOUBLE) && defined(_FPU_GETCW) + // Only correct FPU precision on Linux architectures that needs and supports it: + fpu_control_t oldcw, newcw; + _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); +diff --git a/Minisat/utils/System.h b/Minisat/utils/System.h +index ecdde991b..fd501eeec 100644 +--- a/Minisat/utils/System.h ++++ b/Minisat/utils/System.h +@@ -26,7 +26,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #ifndef Minisat_System_h + #define Minisat_System_h + +-#if defined(__linux__) ++#if defined(__GLIBC__) + #include <fpu_control.h> + #endif + diff --git a/sci-mathematics/vampire/vampire-4.6.1-r2.ebuild b/sci-mathematics/vampire/vampire-4.6.1-r2.ebuild index d5579bce688d..0d3a66debc59 100644 --- a/sci-mathematics/vampire/vampire-4.6.1-r2.ebuild +++ b/sci-mathematics/vampire/vampire-4.6.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,6 +32,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-musl.patch ) + src_configure() { # -Werror=strict-aliasing warnings, bug #863269 filter-lto diff --git a/sci-mathematics/vampire/vampire-4.7-r1.ebuild b/sci-mathematics/vampire/vampire-4.7-r1.ebuild index 69e581237127..975da65ac817 100644 --- a/sci-mathematics/vampire/vampire-4.7-r1.ebuild +++ b/sci-mathematics/vampire/vampire-4.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -H=2d02e4655e1b08d1ca9ee7c0aade40f59f046460 # "bump to 4.7" +[[ ${PV} == 4.7 ]] && COMMIT=2d02e4655e1b08d1ca9ee7c0aade40f59f046460 # "bump to 4.7" inherit flag-o-matic cmake @@ -15,9 +15,9 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/vprover/${PN}.git" EGIT_SUBMODULES=() else - SRC_URI="https://github.com/vprover/${PN}/archive/${H}.tar.gz + SRC_URI="https://github.com/vprover/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${H} + S="${WORKDIR}"/${PN}-${COMMIT} KEYWORDS="~amd64 ~x86" fi @@ -36,6 +36,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${PN}-4.6.1-musl.patch ) + src_configure() { # -Werror=strict-aliasing warnings, bug #863269 filter-lto diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest index afc57cb3d37d..1653ff46cefc 100644 --- a/sci-mathematics/why3-for-spark/Manifest +++ b/sci-mathematics/why3-for-spark/Manifest @@ -1,3 +1 @@ -DIST 8bb5801e17b8b23453262da69c981c091959eec7?filename=why3-2020-20200429-199EF-src.tar.gz 9739066 BLAKE2B c7c11a92d4926f90be9ffa94d74e65ad78423953b53ee617565ccfcea4a5a60b251367b0712c30d170ab717d5868f7d95d62694f38c3d2f52805a28a6522ab8a SHA512 61cd5509957230ff81186d2507b9749b182cdc44698f6658337ce294d210742e57164d25d7c0eb3eb5ea0c53f5f46dea099e6a0769fadcb709a5a8557ed3cae3 -DIST why3-2019-20190517-197BB-src.tar.gz 9439414 BLAKE2B 68072064e8ee9152528c90afc948047a1f4d58b960ac05b276761fdca5ba1204100c75f33db7bb0ea1a8a646b734e62892ed41bd875b954354f52b8f9d498d4a SHA512 9169a4ff9ee994a19f9f04b689d1b9c679f5340bcd631d7d49b4c55064f505bd5a6ca8149077e5d24d36f5365f0cab58587094e86f352a9105fc46f10c0746ba DIST why3-2021-20210519-19ADF-src.tar.gz 10386938 BLAKE2B 93b6323c562126244f5cccef34088a521fe3dc1cec07c966e94472503ec8492707b20a641936449307f0439e711a82260d36679cbc69f53df8e7886a1d3673c3 SHA512 65e3c1430001962f2c7cce786f3e30f14b5295cff89c4087d95c1545e81743723319ba0309dbe15c4c46552110b25ff57addc3ee085dade02ea59a2273b127db diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2019-flags.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2019-flags.patch deleted file mode 100644 index b562bb02cd84..000000000000 --- a/sci-mathematics/why3-for-spark/files/why3-for-spark-2019-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/Makefile.in 2020-06-12 21:03:33.375534124 +0200 -+++ b/Makefile.in 2020-06-12 21:03:48.623283408 +0200 -@@ -96,7 +96,7 @@ - - WARNINGS = A-4-9-41-44-45-50-52@5@8@48 - --OFLAGS = -w $(WARNINGS) -safe-string -keep-locs -bin-annot -dtypes -g $(INCLUDES) -+OFLAGS = -w $(WARNINGS) -safe-string -keep-locs -bin-annot -dtypes -g $(INCLUDES) -cclib "$(LDFLAGS)" -ccopt "$(CFLAGS)" - BFLAGS = -w $(WARNINGS) -safe-string -keep-locs -bin-annot -dtypes -g $(INCLUDES) - - OLINKFLAGS = -linkall $(EXTCMXA) -@@ -664,13 +664,13 @@ - all: $(TOOLS) - - lib/why3server$(EXE): $(SERVER_O) -- $(CC) -Wall -o $@ $^ -+ $(CC) -Wall $(CFLAGS) -o $@ $^ $(LDFLAGS) - - lib/why3cpulimit$(EXE): $(CPULIM_O) -- $(CC) -Wall -o $@ $^ -+ $(CC) -Wall $(CFLAGS) -o $@ $^ $(LDFLAGS) - - %.o: %.c -- $(CC) -Wall -O -g -o $@ -c $< -+ $(CC) -Wall -O -g $(CFLAGS) -o $@ -c $< - - uninstall-bin:: - rm -f $(LIBDIR)/why3/why3server$(EXE) $(LIBDIR)/why3/why3cpulimit$(EXE) diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2019-gentoo.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2019-gentoo.patch deleted file mode 100644 index 2dab12ddfbd3..000000000000 --- a/sci-mathematics/why3-for-spark/files/why3-for-spark-2019-gentoo.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/gnat/gnat_config.ml 2017-10-18 09:07:03.118919785 +0200 -+++ b/src/gnat/gnat_config.ml 2017-10-18 09:07:45.198216939 +0200 -@@ -12,10 +12,7 @@ - | Limit_Check of Gnat_expl.check - | Limit_Line of Gnat_loc.loc - --let spark_prefix = -- (Filename.dirname -- (Filename.dirname (Filename.dirname -- (Filename.dirname Sys.executable_name)))) -+let spark_prefix = "/usr" - - let rec file_concat l = - match l with ---- a/Makefile.in 2020-05-27 21:19:08.736241502 +0200 -+++ b/Makefile.in 2020-05-27 21:19:14.042156954 +0200 -@@ -50,7 +50,6 @@ - OCAMLINSTALLLIB = $(DESTDIR)@OCAMLINSTALLLIB@ - OCAMLBEST = @OCAMLBEST@ - OCAMLVERSION = @OCAMLVERSION@ --CC = gcc - COQC = @COQC@ - COQDEP = @COQDEP@ - FRAMAC_LIBDIR = $(DESTDIR)@FRAMAC_LIBDIR@ diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-flags.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-flags.patch deleted file mode 100644 index 2e5247ac3fa6..000000000000 --- a/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/Makefile.in 2020-06-12 21:03:33.375534124 +0200 -+++ b/Makefile.in 2020-06-12 21:03:48.623283408 +0200 -@@ -121,7 +121,7 @@ - - WARNINGS = A-4-9-41-44-45-50-52@5@8@48 - --FLAGS = -w $(WARNINGS) -safe-string -keep-locs -bin-annot -dtypes -g $(INCLUDES) -+FLAGS = -w $(WARNINGS) -safe-string -keep-locs -bin-annot -dtypes -g $(INCLUDES) -cclib "$(LDFLAGS)" -ccopt "$(CFLAGS)" - OFLAGS = $(FLAGS) - BFLAGS = $(FLAGS) - -@@ -664,13 +664,13 @@ - all: $(TOOLS) - - lib/why3server$(EXE): $(SERVER_O) -- $(CC) -Wall -o $@ $^ -+ $(CC) -Wall $(CFLAGS) -o $@ $^ $(LDFLAGS) - - lib/why3cpulimit$(EXE): $(CPULIM_O) -- $(CC) -Wall -o $@ $^ -+ $(CC) -Wall $(CFLAGS) -o $@ $^ $(LDFLAGS) - - %.o: %.c -- $(CC) -Wall -O -g -o $@ -c $< -+ $(CC) -Wall -O -g $(CFLAGS) -o $@ -c $< - - uninstall-bin:: - rm -f $(LIBDIR)/why3/why3server$(EXE) $(LIBDIR)/why3/why3cpulimit$(EXE) diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2021-make.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2021-make.patch new file mode 100644 index 000000000000..fa23a1c32c5c --- /dev/null +++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2021-make.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2023-04-02 22:54:43.160504917 +0200 ++++ b/Makefile.in 2023-04-02 22:55:05.194152231 +0200 +@@ -9,6 +9,8 @@ + # # + #################################################################### + ++.NOTPARALLEL: ++ + VERBOSEMAKE ?= @enable_verbose_make@ + + ifeq ($(VERBOSEMAKE),yes) diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild deleted file mode 100644 index f83359f0ee7e..000000000000 --- a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MYP=why3-${PV}-20190517-197BB-src - -DESCRIPTION="Platform for deductive program verification" -HOMEPAGE="https://why3.lri.fr/" -SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54 - -> ${MYP}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64" -IUSE="doc emacs gtk html hypothesis-selection +ocamlopt zarith zip" -RESTRICT="strip" - -DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=] - >=dev-ml/ocamlbuild-0.14.0 - <=dev-ml/menhir-20190924:= - dev-ml/num:= - doc? ( dev-tex/rubber ) - gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) - emacs? ( >=app-editors/emacs-23.1:* ) - html? ( dev-tex/hevea:= ) - hypothesis-selection? ( dev-ml/ocamlgraph:= ) - zarith? ( dev-ml/zarith:= ) - zip? ( >=dev-ml/camlzip-1.07:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-flags.patch -) - -QA_FLAGS_IGNORED=( - /usr/lib64/why3/commands/why3shell - /usr/lib64/why3/commands/why3extract - /usr/lib64/why3/commands/why3execute - /usr/lib64/why3/commands/why3prove - /usr/lib64/why3/commands/why3wc - /usr/lib64/why3/commands/why3doc - /usr/lib64/why3/commands/why3replay - /usr/lib64/why3/commands/why3webserver - /usr/lib64/why3/plugins/python.cmxs - /usr/lib64/why3/plugins/hypothesis_selection.cmxs - /usr/lib64/why3/plugins/tptp.cmxs - /usr/lib64/why3/plugins/dimacs.cmxs - /usr/lib64/why3/plugins/genequlin.cmxs - /usr/lib64/ocaml/why3/why3.cmxs - /usr/lib64/ocaml/why3/why3extract.cmxs - /usr/bin/why3 - /usr/bin/why3config - /usr/bin/why3session - /usr/bin/gnat_server - /usr/bin/gnatwhy3 - /usr/bin/why3realize -) - -REQUIRED_USE="html? ( doc )" - -src_prepare() { - find examples -name \*gz | xargs gunzip - default -} - -src_configure() { - econf \ - --disable-pvs-libs \ - --disable-isabelle-libs \ - --enable-verbose-make \ - --disable-coq-libs \ - $(use_enable doc) \ - $(use_enable emacs emacs-compilation) \ - $(use_enable gtk ide) \ - $(use_enable html html-doc) \ - $(use_enable hypothesis-selection) \ - $(use_enable ocamlopt native-code) \ - $(use_enable zarith) \ - $(use_enable zip) -} - -src_compile() { - emake -j1 - if use ocamlopt; then - emake byte - fi - use doc && emake doc -} - -src_install() { - emake DESTDIR="${D}" -j1 install - emake DESTDIR="${D}" -j1 install-lib - emake DESTDIR="${D}" install_spark2014_dev - local cmdPath=/usr/$(get_libdir)/why3/commands - dosym ../why3server ${cmdPath}/why3server - # Remove duplicated files - for filename in config ide realize server session; do - if [[ -e "${D}"${cmdPath}/why3${filename} ]]; then - rm "${D}"${cmdPath}/why3${filename} - dosym ../../../bin/why3${filename} ${cmdPath}/why3${filename} - fi - done - rm "${D}"/usr/$(get_libdir)/why3/why3cpulimit - dosym ../../bin/why3cpulimit /usr/$(get_libdir)/why3/why3cpulimit - - einstalldocs - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - if use doc; then - dodoc doc/manual.pdf - use html && dodoc -r doc/html - fi -} diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild deleted file mode 100644 index 66a760496a92..000000000000 --- a/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -MYP=why3-${PV}-20200429-199EF-src - -DESCRIPTION="Platform for deductive program verification" -HOMEPAGE="https://why3.lri.fr/" -SRC_URI="https://community.download.adacore.com/v1/8bb5801e17b8b23453262da69c981c091959eec7?filename=${MYP}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc emacs gtk html +ocamlopt zarith zip" -RESTRICT="strip" - -DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=] - >=dev-ml/ocamlbuild-0.14.0 - dev-ml/menhir:= - <dev-ml/num-1.4:= - dev-ml/yojson:= - doc? ( - dev-tex/rubber - dev-python/sphinx - media-gfx/graphviz - dev-python/sphinxcontrib-bibtex - ) - gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) - emacs? ( >=app-editors/emacs-23.1:* ) - html? ( dev-tex/hevea:= ) - zarith? ( dev-ml/zarith:= ) - zip? ( >=dev-ml/camlzip-1.07:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-flags.patch - "${FILESDIR}"/${P}-bibtex.patch -) - -QA_FLAGS_IGNORED=( - /usr/lib64/why3/commands/why3shell - /usr/lib64/why3/commands/why3extract - /usr/lib64/why3/commands/why3execute - /usr/lib64/why3/commands/why3prove - /usr/lib64/why3/commands/why3wc - /usr/lib64/why3/commands/why3doc - /usr/lib64/why3/commands/why3replay - /usr/lib64/why3/commands/why3webserver - /usr/lib64/why3/plugins/'.*'.cmxs - /usr/lib64/ocaml/why3/why3.cmxs - /usr/lib64/ocaml/why3/why3extract.cmxs - /usr/bin/why3 - /usr/bin/why3config - /usr/bin/why3session - /usr/bin/gnat_server - /usr/bin/gnatwhy3 - /usr/bin/why3realize -) - -REQUIRED_USE="html? ( doc )" - -src_prepare() { - find examples -name \*gz | xargs gunzip - default - eautoreconf -} - -src_configure() { - econf \ - --disable-pvs-libs \ - --disable-isabelle-libs \ - --enable-verbose-make \ - --disable-coq-libs \ - $(use_enable doc) \ - $(use_enable emacs emacs-compilation) \ - $(use_enable gtk ide) \ - $(use_enable html html-pdf) \ - $(use_enable ocamlopt native-code) \ - $(use_enable zarith) \ - $(use_enable zip) -} - -src_compile() { - emake -j1 - if use ocamlopt; then - emake byte - fi - use doc && emake doc -} - -src_install() { - emake DESTDIR="${D}" -j1 install - emake DESTDIR="${D}" -j1 install-lib - emake DESTDIR="${D}" install_spark2014_dev - local cmdPath=/usr/$(get_libdir)/why3/commands - dosym ../why3server ${cmdPath}/why3server - # Remove duplicated files - for filename in config ide realize server session; do - if [[ -e "${D}"${cmdPath}/why3${filename} ]]; then - rm "${D}"${cmdPath}/why3${filename} - dosym ../../../bin/why3${filename} ${cmdPath}/why3${filename} - fi - done - rm "${D}"/usr/$(get_libdir)/why3/why3cpulimit - dosym ../../bin/why3cpulimit /usr/$(get_libdir)/why3/why3cpulimit - - einstalldocs - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - if use doc; then - use html && dodoc -r doc/html - fi -} diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild index 0801160e66e9..4204da3000b6 100644 --- a/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild +++ b/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt sexp zarith zip" RESTRICT="strip" @@ -52,6 +52,7 @@ S="${WORKDIR}"/${MYP} PATCHES=( "${FILESDIR}"/${PN}-2020-gentoo.patch "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-make.patch #Bug #883167 "${FILESDIR}"/${PN}-2020-bibtex.patch ) diff --git a/sci-mathematics/why3/Manifest b/sci-mathematics/why3/Manifest index 4f6bc6bc9f21..b4c557cc84db 100644 --- a/sci-mathematics/why3/Manifest +++ b/sci-mathematics/why3/Manifest @@ -1,4 +1,3 @@ -DIST why3-1.4.0.tar.gz 6306524 BLAKE2B ade7803a608d090ea06d974ae47e920993de92a5849d60bd63dba68252919a8f4fd1f0f6a3c975fdb727c4ae3afe13921b5d31a14c005e0d08f518e64bcf05e5 SHA512 b492f08a3c7073782b143a4849c47766b12045ad53c56aa8d251fd5b6bc1863ddebe260c99b3ddb27c4e1e1e9ab986c8b02286ec24f4c30f99f81f5f13fdc90a DIST why3-1.4.1.tar.gz 6305011 BLAKE2B 2d916fbf333550f8021bff9e7ccf4ca5685763ca7f82ae133298feaf96f3e8b36290a103fd27224fb6fb2dc36c8d7ad5d93ffc92e8cf7fe1a61abb5a40aecb39 SHA512 7990519179c088be1bc9b5b6d469f6d6fbd683445e20cbf5edd5c97682f2931b2657a92b60e539d7647033bfdc5a63401f28af61fd9b14b41011144afa2016e0 -DIST why3-1.5.0.tar.gz 6723500 BLAKE2B e6ae5034cf0b3923dfaa760d604f754d4e385ea92ca1f70c7d4bd9985c75192ed381bb50d7211451f35d485e5c0969b3de4987603720b2fd6609cca5d074b85f SHA512 3ae443733321f2e487d6e503c4dbfe37d0e24c7dbe88eb94a3907775a1e6e30530b58ff835e3b2fff3fac5cd16622d758602e4f2b59aea567c7073199d67888c DIST why3-1.5.1.tar.gz 6727576 BLAKE2B db88dc011856bc779a917613adb20c14744f5491aba54e424909106a1133362ddf9eb22e4a05660cb3153bfddfa54c488e1f9df046e3c413732924e127975e82 SHA512 1452a21ea9191f57debcc082afe458aec503d6aa24f8bc83f734041cdd302c4f166c9c4fe5f9ec25369b6e83011bdd7b485d67b092efa71ff0c1b39447f4bdac +DIST why3-1.6.0.tar.gz 6850062 BLAKE2B 91db6f67a9d0fe24b7d7d18e6c5e9cd362563a55702bfb28c478754f53e831beb3033adde251214facd8d64ab923389b0b9fe7b240b6cd09f0b4b3e6f8eca143 SHA512 60d61b8337ab9f2fd2e6c7174eb0bab063f122417738cd75990c5c53120dd535bcedccb670567f5753853d6bc9f8efebb563d079e4d368372a7687193f1346b1 diff --git a/sci-mathematics/why3/why3-1.4.0-r3.ebuild b/sci-mathematics/why3/why3-1.4.0-r3.ebuild deleted file mode 100644 index 6d1e01d9863c..000000000000 --- a/sci-mathematics/why3/why3-1.4.0-r3.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools findlib - -DESCRIPTION="Platform for deductive program verification" -HOMEPAGE="https://why3.lri.fr/" -SRC_URI="https://why3.gitlabpages.inria.fr/releases/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="coq doc emacs gtk +ocamlopt re sexp +zarith zip" - -RDEPEND=" - !sci-mathematics/why3-for-spark - >=dev-lang/ocaml-4.05.0:=[ocamlopt?] - >=dev-ml/menhir-20170418:= - dev-ml/num:= - coq? ( >=sci-mathematics/coq-8.6 ) - emacs? ( app-editors/emacs:* ) - gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] ) - re? ( dev-ml/re:= ) - sexp? ( - dev-ml/ppx_deriving:=[ocamlopt?] - dev-ml/ppx_sexp_conv:=[ocamlopt?] - dev-ml/sexplib:=[ocamlopt?] - ) - zarith? ( dev-ml/zarith:= ) - zip? ( dev-ml/camlzip:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-bibtex - media-gfx/graphviz - dev-texlive/texlive-latex - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - ) -" - -DOCS=( CHANGES.md README.md ) - -src_prepare() { - mv configure.in configure.ac || die - sed -i 's/configure\.in/configure.ac/g' Makefile.in || die - sed -e '/^lib\/why3[a-z]*\$(EXE):/{n;s/-Wall/$(CFLAGS) $(LDFLAGS)/}' \ - -e '/^%.o: %.c/{n;s/\$(CC).*-o/$(CC) $(CFLAGS) -o/}' \ - -e '/\$(SPHINX)/s/ -d doc\/\.doctrees / /' \ - -i Makefile.in || die - - eautoreconf - default -} - -src_configure() { - local myconf=( - --disable-hypothesis-selection - --disable-pvs-libs - --disable-isabelle-libs - --disable-frama-c - --disable-infer - --disable-web-ide - $(use_enable coq coq-libs) - $(use_enable doc) - $(use_enable emacs emacs-compilation) - $(use_enable gtk ide) - $(use_enable ocamlopt native-code) - $(use_enable re) - $(use_enable sexp pp-sexp) - $(use_enable zarith) - $(use_enable zip) - ) - econf "${myconf[@]}" -} - -src_compile() { - emake - emake plugins - use doc && emake doc -} - -src_install(){ - findlib_src_preinst - emake install install-lib DESTDIR="${ED}" - - einstalldocs - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - if use doc; then - dodoc doc/latex/manual.pdf - dodoc -r doc/html - fi -} diff --git a/sci-mathematics/why3/why3-1.5.0-r1.ebuild b/sci-mathematics/why3/why3-1.6.0.ebuild index d592ff2803b1..1c3b6b458cc9 100644 --- a/sci-mathematics/why3/why3-1.5.0-r1.ebuild +++ b/sci-mathematics/why3/why3-1.6.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools findlib @@ -19,7 +19,7 @@ RDEPEND=" >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=dev-ml/menhir-20170418:= dev-ml/num:= - coq? ( >=sci-mathematics/coq-8.7 ) + coq? ( >=sci-mathematics/coq-8.7:= ) emacs? ( app-editors/emacs:* ) gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] ) re? ( dev-ml/re:= ) @@ -48,6 +48,7 @@ DOCS=( CHANGES.md README.md ) src_prepare() { mv configure.in configure.ac || die + sed -i 's/configure\.in/configure.ac/g' Makefile.in || die sed -e '/^lib\/why3[a-z]*\$(EXE):/{n;s/-Wall/$(CFLAGS) $(LDFLAGS)/}' \ -e '/^%.o: %.c/{n;s/\$(CC).*-o/$(CC) $(CFLAGS) -o/}' \ @@ -62,12 +63,12 @@ src_prepare() { } src_configure() { - local myconf=( - --disable-hypothesis-selection - --disable-pvs-libs - --disable-isabelle-libs + local -a myconf=( --disable-frama-c + --disable-hypothesis-selection --disable-infer + --disable-isabelle-libs + --disable-pvs-libs --disable-web-ide $(use_enable coq coq-libs) $(use_enable doc) @@ -86,6 +87,7 @@ src_configure() { src_compile() { emake emake plugins + use doc && emake doc } @@ -96,6 +98,7 @@ src_install(){ einstalldocs docompress -x /usr/share/doc/${PF}/examples dodoc -r examples + if use doc; then dodoc doc/latex/manual.pdf dodoc -r doc/html diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest index cfc7f09b5711..6d8f4b192994 100644 --- a/sci-mathematics/wxmaxima/Manifest +++ b/sci-mathematics/wxmaxima/Manifest @@ -1,4 +1,2 @@ -DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb -DIST wxmaxima-22.05.0.tar.gz 21493488 BLAKE2B 0b1f4bd65e88e4f39d5d54f164373ca67a76bd2a18a1556cd4b86cdb5a62ca3f0c783c6e1725ec1006f6174163f08b7b934dcfa3fd8a8a7aa34e61588e1b0cb1 SHA512 e78ce86d3265b8c5d1d9b110075bdc8e3ff180a0a017142f852b022a1984e7e9bf0a4b7d2fb829f8c87b09899ef57a6e8ee203ec7edac52e7d05f0a05d2c9fe8 -DIST wxmaxima-22.09.0.tar.gz 21883782 BLAKE2B 370ea04f5101516fda494c08e21c1550556ff69e61e0458814aeb0922c66ae1b4a1be1e0b4d386f631b0479300fec04481f7f9e4be4214689b9bc0b9bd41f0f1 SHA512 778d3f221315f40f09918baaf26a4213dae3154ea19479c5ebf9254ed6c8036ca68f61472fce1d63e72d6c23787a635237c5f85ebc2975254893e6bec112ac3b -DIST wxmaxima-22.12.0.tar.gz 23673254 BLAKE2B b00536c6b6243555f4c00016202d68f9764a2e1ec4c910ee52d7e0b498a5695c3f4746809e594179cda75ec40caeca1a01e21a11c211c329ec2685a8e6217e4e SHA512 842a4c891d757d17307a9bed17f5ffffde9f55e72b749e2356817a1598760b6a16fb9ce8e21f4706530bbe2360400de01b9269872d895944924d8e3eebfc31dc +DIST wxmaxima-23.04.1.tar.gz 22060726 BLAKE2B 77583c2461f7c32ac53ad2890d1e7d07a9fc2dd0caa07a1fcdd7c62d39ec63c50173542c74ce2d21093ce724d1777b76e7789f8a5363ff20406d52177c86a016 SHA512 9846c11cbeec8411170e0d55916187cc77274e2758726784bcb5540d55f712b5a557562de0c37dac0c7ef119d43570bd33efc33252fc5359627e527d668580a4 +DIST wxmaxima-23.05.1.tar.gz 16220058 BLAKE2B a680a562c92ac400c2e3e377e9f6aa387a259b3bfc9d533bba2f2fcc4c5abfca78c578935273932cbb4be6aa04c29c0316582472f212b0868cba2bfb0081234f SHA512 a36cf3207058065dbe68b8a75b7a97ab0ab827c9097f90a67af1c436703a22bff6978fbf173e0806e40d01270d97def1137de9af7d2501e96faca475d474c5af diff --git a/sci-mathematics/wxmaxima/metadata.xml b/sci-mathematics/wxmaxima/metadata.xml index d47fcd302bb2..3fdc2bb5429d 100644 --- a/sci-mathematics/wxmaxima/metadata.xml +++ b/sci-mathematics/wxmaxima/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>grozin@gentoo.org</email> + <name>Andrey Grozin</name> + </maintainer> <maintainer type="project"> <email>sci-mathematics@gentoo.org</email> <name>Gentoo Mathematics Project</name> diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild deleted file mode 100644 index de3f6d214477..000000000000 --- a/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0-gtk3" -PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" -inherit cmake plocale wxwidgets xdg - -DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" -HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/" -SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" -S="${WORKDIR}"/${PN}-Version-${PV} - -DEPEND=" - dev-libs/libxml2:2 - x11-libs/wxGTK:${WX_GTK_VER}" -RDEPEND="${DEPEND} - media-fonts/jsmath - sci-visualization/gnuplot[wxwidgets] - sci-mathematics/maxima" - -src_prepare() { - setup-wxwidgets - cmake_src_prepare - - sed -e "s|GPL.txt ||g" -e "s|share/doc/${PN}|share/doc/${PF}|g" -i CMakeLists.txt \ - || die "sed CMakeLists.txt failed" - sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i info/CMakeLists.txt \ - || die "sed info/CMakeLists.txt failed" - - # locales - rm_po() { - rm locales/wxMaxima/${1}.po || die "rm ${1}.po failed" - rm -f locales/manual/${1}.po - rm -f info/${PN}.${1}.md - rm -f info/${PN}.${1}.html - sed -e "\\|/${1}/wxmaxima.1|d" -i data/CMakeLists.txt - } - plocale_find_changes locales/wxMaxima '' '.po' - plocale_for_each_disabled_locale rm_po -} - -src_install() { - docompress -x /usr/share/doc/${PF} - cmake_src_install -} diff --git a/sci-mathematics/wxmaxima/wxmaxima-22.05.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-22.05.0.ebuild deleted file mode 100644 index 010023dd6e2b..000000000000 --- a/sci-mathematics/wxmaxima/wxmaxima-22.05.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" -PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" -inherit cmake plocale wxwidgets xdg - -DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" -HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/" -SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-Version-${PV} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libxml2:2 - x11-libs/wxGTK:${WX_GTK_VER}" -RDEPEND="${DEPEND} - media-fonts/jsmath - sci-visualization/gnuplot[wxwidgets] - sci-mathematics/maxima" - -src_prepare() { - setup-wxwidgets - cmake_src_prepare - - sed -e "s|GPL.txt ||g" -e "s|share/doc/${PN}|share/doc/${PF}|g" -i CMakeLists.txt \ - || die "sed CMakeLists.txt failed" - sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i info/CMakeLists.txt \ - || die "sed info/CMakeLists.txt failed" - - # locales - rm_po() { - rm locales/wxMaxima/${1}.po || die "rm ${1}.po failed" - rm -f locales/manual/${1}.po - rm -f info/${PN}.${1}.md - rm -f info/${PN}.${1}.html - sed -e "\\|/${1}/wxmaxima.1|d" -i data/CMakeLists.txt - } - plocale_find_changes locales/wxMaxima '' '.po' - plocale_for_each_disabled_locale rm_po -} - -src_configure() { - local mycmakeargs=( - -DWXM_UNIT_TESTS=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - # Just run the unit tests manually for now as tests fail in a non-descriptive - # way even with virtualx - # bug #736695 - cd "${BUILD_DIR}/test/unit_tests" || die - - local tests=( - AFontSize - CellPtr - ImgCell - ) - - local test - for test in "${tests[@]}" ; do - ./test_${test} || die "Unit test ${test} failed!" - done -} - -src_install() { - docompress -x /usr/share/doc/${PF} - cmake_src_install -} diff --git a/sci-mathematics/wxmaxima/wxmaxima-22.09.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild index 16bca7a15010..d12d936a2b8a 100644 --- a/sci-mathematics/wxmaxima/wxmaxima-22.09.0.ebuild +++ b/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WX_GTK_VER="3.0-gtk3" PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" @@ -14,7 +14,7 @@ S="${WORKDIR}"/${PN}-Version-${PV} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sci-mathematics/wxmaxima/wxmaxima-22.12.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-23.05.1.ebuild index 552ce4da0c45..eb18fbdaf093 100644 --- a/sci-mathematics/wxmaxima/wxmaxima-22.12.0.ebuild +++ b/sci-mathematics/wxmaxima/wxmaxima-23.05.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -WX_GTK_VER="3.0-gtk3" +WX_GTK_VER="3.2-gtk3" PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" inherit cmake plocale wxwidgets xdg diff --git a/sci-mathematics/yacas/yacas-1.9.1.ebuild b/sci-mathematics/yacas/yacas-1.9.1.ebuild index df6256bf81c2..ae07a43527f5 100644 --- a/sci-mathematics/yacas/yacas-1.9.1.ebuild +++ b/sci-mathematics/yacas/yacas-1.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ EAPI=8 # DOCS_BUILDER="sphinx" # DOCS_DEPEND=" # dev-python/sphinxcontrib-bibtex -# dev-python/sphinx_rtd_theme +# dev-python/sphinx-rtd-theme # " inherit cmake xdg # python-any-r1 docs diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest index 6c6b8418d1c9..1a076bbe3a11 100644 --- a/sci-mathematics/z3/Manifest +++ b/sci-mathematics/z3/Manifest @@ -1,3 +1 @@ -DIST z3-4.11.2.tar.gz 5428273 BLAKE2B 85fe5b94c5bfaeaca5b1dfe42fe9763a278c414955a9aed45abbb3e60c366a86bcdcd7c3bdcf27cc67bc10c76700069d548cb1e27ccf3286c8c6eccfa9d492d1 SHA512 be2573d38c0e50b46fcb025d50335e016769fdeab3c26f5dc2a13102fae889d23039258ea8d38de3f53daa4cf073704d8639ac291e781a74633194adedaae21a -DIST z3-4.12.0.tar.gz 5468532 BLAKE2B 229e8fb19cfb377f3ec9a728254c913a582ee16cfafaa8eb66683df01fc8320b527e493fe692fa85029360f6065d5a068ccbf337cdaf4b8f492ac8a2c3674063 SHA512 53a51c8304fa4356d13293f68b14d9d9eef57a0771c6698d38aea5fac62c4e52c41ff003cb6d771a32645d2aa4ef59be5f792f2efbee927d06ac8280094976e5 DIST z3-4.12.1.tar.gz 5470095 BLAKE2B 8840b2c3bea5ae409f52bd2db931f7c0d88f86e154c2bf7d1bed34a0c7b72a5596a20467259f37ad9cae3c7e24d2e04ddebe8dd539a2e1a1ed6445d59b6cef28 SHA512 031fba9cc000a8da0025f95fa3f1c7519071d1b7775b377ff3192c505bb4c7e3d267da246c9ae68c940224e055a3c30571d2c0d7fbb042ec9a3d5849543a385c diff --git a/sci-mathematics/z3/z3-4.11.2.ebuild b/sci-mathematics/z3/z3-4.11.2.ebuild deleted file mode 100644 index 2144f15912a8..000000000000 --- a/sci-mathematics/z3/z3-4.11.2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake-multilib java-pkg-opt-2 python-single-r1 - -DESCRIPTION="An efficient theorem prover" -HOMEPAGE="https://github.com/Z3Prover/z3/" -SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz" -S=${WORKDIR}/z3-${P} - -SLOT="0/$(ver_cut 1-2)" -LICENSE="MIT" -KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86" -IUSE="doc examples gmp isabelle java python" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - java? ( >=virtual/jdk-1.8 ) -" -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) -" - -CMAKE_BUILD_TYPE=RelWithDebInfo - -src_prepare() { - cmake_src_prepare - java-pkg-opt-2_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DZ3_USE_LIB_GMP=$(usex gmp) - -DZ3_ENABLE_EXAMPLE_TARGETS=OFF - -DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc) - -DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python) - -DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java) - -DZ3_INCLUDE_GIT_DESCRIBE=OFF - -DZ3_INCLUDE_GIT_HASH=OFF - ) - - multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" ) - - cmake_src_configure -} - -multilib_src_test() { - cmake_build test-z3 - set -- "${BUILD_DIR}"/test-z3 /a - echo "${@}" >&2 - "${@}" || die -} - -multilib_src_install_all() { - dodoc README.md - use examples && dodoc -r examples - use python && python_optimize - - if use isabelle; then - insinto /usr/share/Isabelle/contrib/${P}/etc - newins - settings <<-EOF - Z3_COMPONENT="\$COMPONENT" - Z3_HOME="${EPREFIX}/usr/bin" - Z3_SOLVER="${EPREFIX}/usr/bin/z3" - Z3_REMOTE_SOLVER="z3" - Z3_VERSION="${PV}" - Z3_INSTALLED="yes" - Z3_NON_COMMERCIAL="yes" - EOF - fi -} - -pkg_postinst() { - if use isabelle; then - if [[ -f ${ROOT}/etc/isabelle/components ]]; then - sed -e "/contrib\/${PN}-[0-9.]*/d" \ - -i "${ROOT}/etc/isabelle/components" || die - cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die - contrib/${P} - EOF - fi - fi -} - -pkg_postrm() { - if use isabelle; then - if [[ ! ${REPLACING_VERSIONS} ]]; then - if [[ -f "${ROOT}/etc/isabelle/components" ]]; then - # Note: this sed should only match the version of this ebuild - # Which is what we want as we do not want to remove the line - # of a new Isabelle component being installed during an upgrade. - sed -e "/contrib\/${P}/d" \ - -i "${ROOT}/etc/isabelle/components" || die - fi - fi - fi -} diff --git a/sci-mathematics/z3/z3-4.12.0.ebuild b/sci-mathematics/z3/z3-4.12.0.ebuild deleted file mode 100644 index 56bcff6924d7..000000000000 --- a/sci-mathematics/z3/z3-4.12.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake-multilib java-pkg-opt-2 python-single-r1 - -DESCRIPTION="An efficient theorem prover" -HOMEPAGE="https://github.com/Z3Prover/z3/" -SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz" -S=${WORKDIR}/z3-${P} - -SLOT="0/$(ver_cut 1-2)" -LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="doc examples gmp isabelle java python" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - java? ( >=virtual/jdk-1.8 ) -" -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) -" - -CMAKE_BUILD_TYPE=RelWithDebInfo - -src_prepare() { - cmake_src_prepare - java-pkg-opt-2_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DZ3_USE_LIB_GMP=$(usex gmp) - -DZ3_ENABLE_EXAMPLE_TARGETS=OFF - -DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc) - -DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python) - -DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java) - -DZ3_INCLUDE_GIT_DESCRIBE=OFF - -DZ3_INCLUDE_GIT_HASH=OFF - ) - - multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" ) - - cmake_src_configure -} - -multilib_src_test() { - cmake_build test-z3 - set -- "${BUILD_DIR}"/test-z3 /a - echo "${@}" >&2 - "${@}" || die -} - -multilib_src_install_all() { - dodoc README.md - use examples && dodoc -r examples - use python && python_optimize - - if use isabelle; then - insinto /usr/share/Isabelle/contrib/${P}/etc - newins - settings <<-EOF - Z3_COMPONENT="\$COMPONENT" - Z3_HOME="${EPREFIX}/usr/bin" - Z3_SOLVER="${EPREFIX}/usr/bin/z3" - Z3_REMOTE_SOLVER="z3" - Z3_VERSION="${PV}" - Z3_INSTALLED="yes" - Z3_NON_COMMERCIAL="yes" - EOF - fi -} - -pkg_postinst() { - if use isabelle; then - if [[ -f ${ROOT}/etc/isabelle/components ]]; then - sed -e "/contrib\/${PN}-[0-9.]*/d" \ - -i "${ROOT}/etc/isabelle/components" || die - cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die - contrib/${P} - EOF - fi - fi -} - -pkg_postrm() { - if use isabelle; then - if [[ ! ${REPLACING_VERSIONS} ]]; then - if [[ -f "${ROOT}/etc/isabelle/components" ]]; then - # Note: this sed should only match the version of this ebuild - # Which is what we want as we do not want to remove the line - # of a new Isabelle component being installed during an upgrade. - sed -e "/contrib\/${P}/d" \ - -i "${ROOT}/etc/isabelle/components" || die - fi - fi - fi -} diff --git a/sci-mathematics/z3/z3-4.12.1.ebuild b/sci-mathematics/z3/z3-4.12.1.ebuild index 56bcff6924d7..2144f15912a8 100644 --- a/sci-mathematics/z3/z3-4.12.1.ebuild +++ b/sci-mathematics/z3/z3-4.12.1.ebuild @@ -14,7 +14,7 @@ S=${WORKDIR}/z3-${P} SLOT="0/$(ver_cut 1-2)" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86" IUSE="doc examples gmp isabelle java python" REQUIRED_USE="${PYTHON_REQUIRED_USE}" |