gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /sci-mathematics
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
92 files changed, 1385 insertions, 482 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 18f9a6178073..d202799f5804 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alectryon/Manifest b/sci-mathematics/alectryon/Manifest
new file mode 100644
index 000000000000..f90615f901e1
--- /dev/null
+++ b/sci-mathematics/alectryon/Manifest
@@ -0,0 +1,4 @@
+AUX 50alectryon-gentoo.el 155 BLAKE2B 6a83a0b6e7116a85d00b20799004eaec08033845661a23368b3340320184f2ea65c6b23db61664dadf2f829cabeabd8933f7f9e31d0971fcf2a0181c6d8ae956 SHA512 65fb668f29ba4737fc374302536c3223a02d45816a79256e425e255f30c134b19c8e88ccd19c13954a562182ad072cd10de08cd5047ae17b1b72efcfdc78f00f
+DIST alectryon-1.4.0.tar.gz 312436 BLAKE2B 7f1e58670fbba0b31a4e4bc6502dffa72931ae3495c38b53987406a05aac9d3d1a34d75c89b7b85a6122ee6a7ce30970f8cf3190a5916e416e56854313077d4c SHA512 1310a04c8584147b38af8edb19cc95bd71043f5d00f55cbf4d5649dad9eede5bd01dba6fb23b85acf7cb9e9619fd01e5f83d8d37064f0b43f706589b9ec8aeef
+EBUILD alectryon-1.4.0.ebuild 1729 BLAKE2B 3209721c93c4552278ad968e7a43fcbc0f34025a6ae83ae9cdb24e48303caee56217c76d0e59a383ec06527833979eead8783d1911fed9c45db0fac69bda7e90 SHA512 f3184ed6ccd684f04e2e6cb6b70f2275c139ab29e3f016784f0492e966ac8c16de64c8a8d9059b6f723ab76c506d10d5707cd568c3c58dd10927584210044043
+MISC metadata.xml 977 BLAKE2B 929c655f60171ee97c50a711e5ddaa4f5b6e5c7a2ffa2a2e3ff69665fa46a894af8a353e73efa8e43ed18fa87440e77d6a0d2abe7ecf740dcffe315d9bcddffa SHA512 a88e5341ebe5a4f239e73dbe0d843c46bdcc0f24dfa99e554b57ec715455d2a0526b4a157d2a2a2854b6d7e500b921f81cc29b6ab3c54db8ed228d94807d33fd
diff --git a/sci-mathematics/alectryon/alectryon-1.4.0.ebuild b/sci-mathematics/alectryon/alectryon-1.4.0.ebuild
new file mode 100644
index 000000000000..bdbf53a0c35b
--- /dev/null
+++ b/sci-mathematics/alectryon/alectryon-1.4.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit elisp-common distutils-r1
+
+DESCRIPTION="Toolkit for literate programming in Coq"
+HOMEPAGE="https://github.com/cpitclaudel/alectryon/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cpitclaudel/${PN}.git"
+else
+	SRC_URI="https://github.com/cpitclaudel/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc emacs"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/dominate[${PYTHON_USEDEP}]
+	dev-python/myst_parser[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	sci-mathematics/coq-serapi
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/flycheck
+		app-emacs/proofgeneral
+	)
+"
+
+DOCS=( CHANGES.rst CITATION.bib README.rst )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	python_foreach_impl distutils-r1_python_compile
+
+	use doc && emake -C ./recipes/sphinx latexpdf
+	use emacs && elisp-compile ./etc/elisp/alectryon.el
+}
+
+src_install() {
+	python_foreach_impl distutils-r1_python_install
+	einstalldocs
+
+	if use doc ; then
+		docinto html
+		dodoc ./recipes/sphinx/_build/html/*
+		docinto pdf
+		dodoc ./recipes/sphinx/_build/latex/alectryon-demo.pdf
+		docinto latex
+		dodoc ./recipes/sphinx/_build/latex/alectryon-demo.tex
+	fi
+	if use emacs ; then
+		elisp-install ${PN} ./etc/elisp/${PN}.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/alectryon/files/50alectryon-gentoo.el b/sci-mathematics/alectryon/files/50alectryon-gentoo.el
new file mode 100644
index 000000000000..2d6ca63cdd6d
--- /dev/null
+++ b/sci-mathematics/alectryon/files/50alectryon-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'alectryon-mode "alectryon" "Mode for Literate Coq files." t)
+(add-hook 'coq-mode-hook #'alectryon-mode t)
diff --git a/sci-mathematics/alectryon/metadata.xml b/sci-mathematics/alectryon/metadata.xml
new file mode 100644
index 000000000000..67c427e81f35
--- /dev/null
+++ b/sci-mathematics/alectryon/metadata.xml
@@ -0,0 +1,23 @@
+<?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>
+    A library to process Coq and Lean snippets embedded in text documents,
+    showing goals and messages for each input sentence. Also a literate
+    programming toolkit. The goal of Alectryon is to make it easy to write
+    textbooks, blog posts, and other documents that mix interactive proofs and
+    prose.
+    Alectryon originally supported Coq only. Support for Lean is preliminary
+    and restricted to Lean 3.
+  </longdescription>
+  <upstream>
+    <changelog>https://github.com/cpitclaudel/alectryon/releases/</changelog>
+    <bugs-to>https://github.com/cpitclaudel/alectryon/issues/</bugs-to>
+    <remote-id type="github">cpitclaudel/alectryon</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index b99ff2cb935d..4dbe9e2ac57e 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,5 +1,5 @@
 DIST alt-ergo-2.3.0.tar.gz 455577 BLAKE2B 1836782be452df5147fc3041517fd267f3ce7facd15ad460c3e1dfba2b6ea455fee79ad8264ccb12cf21622c21a54c186c9943e7bffb392daab15d046ff93863 SHA512 a2f209b62b8494bfefe84328cdc786185e0534c5e224e212b83045b078352a51d2ab02622f72c22c74c7de95c7a554cbdae2a9a8a0c41f3f26c841f8c72f6b21
 DIST alt-ergo-2.4.1.tar.gz 2883046 BLAKE2B 6930080f7735f043e33d02b7fa0990c53992848796c0a5cf6ea4d7122eb6b9e5d6ac7ce420a4a19da35fa0ce5ff431bc228f2314a6f709f27a16bc7481bbacd5 SHA512 c3eee41d3c588ca89c2a1eebe9f10914ef647743b58fb562b682172cf6b6bdeb0920ebbba8a850820c0cb53bad0260f11b82fe71f00830ea9b33f5bb5d4fd048
 EBUILD alt-ergo-2.3.0.ebuild 1207 BLAKE2B 395779b3fa2c360a9162ee18b5a8266f978ac96ac09e4da308efbb3f3eabc1cff770c2404dd1e2c0531d8b74b40b82e11331b5a5a69ef92bfe589ddcd7fbfa05 SHA512 d4611afe608836003b93f7e6942da711799116cffaed63ccbbbd1b36a8d8de638a5fee103d3cc751df8cb332e54e28bcaff72142b1be2a3fa1ba4bea1349b257
-EBUILD alt-ergo-2.4.1-r1.ebuild 997 BLAKE2B 87c4ced0832718030a39a953531b3742baddc9b15070ba1be5dfb7ddda3a1373ebe2a24071ef399960374ca98ca74505564f6aa8a111fcce2b9270cb08e6db67 SHA512 10b356e99545e1f4f4ad29c6d1e0d86ee5eeb576c2139cf268ee5d13559eb9fe39e24be281ca100365584c4aecf15df04b07793615e6531a5031a0cd163a4b43
+EBUILD alt-ergo-2.4.1-r1.ebuild 996 BLAKE2B 028f9d965c0a4f2ca4618ffb5a5d0b70a93a8a47bda0e2a2c1228118019f4a6a7badc73929e9af6ccd0ed3c49498728fb1c2b2e4f6f33572bd3891502072120c SHA512 4f626f7b727d1766458d9f999fff8982712a784c4911844bcae5a20c5354cee8fd16302048b1cb2a1b2e83ed12209ae7fd8a5f838c2f2e8c6c5fc18b6213d8df
 MISC metadata.xml 957 BLAKE2B 2ac1b5428ee88fa81b3898a351b770b9a3b4e91ad049e7ab2b5b62e3ddcef635e2f19f801ef1c067b51c2f30f513b40a82e968a314be10e7a5ff795df24dd6d5 SHA512 bcbe312badeb5f3d6c243d620ec5744ac6bf3c23e6bc7b6327c7a1a72b42f2cc68cd4326b065a3fca3c2a9c7c1670e2a84ca1ca2e7bf423a274025010a6735f4
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.4.1-r1.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.4.1-r1.ebuild
index 52d3124f6809..b1fc33bf89fa 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.4.1-r1.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CeCILL-C"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples +ocamlopt"
 
 RDEPEND="
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index a5b7f8cbdffb..38ad5fcc2819 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -3,6 +3,8 @@ AUX arb-2.21.0-gamma_fmpq-testfix.patch 2291 BLAKE2B 019af88d2e8c56cd9fcab960fd8
 AUX arb-2.21.0-qa-warning-fix.patch 541 BLAKE2B 22d701fc07e2c3b8ad3fa0603204d7d35a9c9182b6ba9ced2d786866f8a15a4dd07c97a2702d723de98f5e264a5ca107ad24dc99095e46485fb75696114c6909 SHA512 5addd977a49fa5e9ec9847b07a3043d78ce7d7df5d6947ae895dd345424fa1941335e7a3691cee1497036e33b47fe1858e42b07277629956fe0299c4034b2d79
 DIST arb-2.19.0.tar.gz 1606463 BLAKE2B 85d832113ae42737a460198cbf485f825a9435963a888c0d0ab87b7ed7277d158480b573fd8ace42484dd4767bf4f1a372f637cfff01f18c105fd2b62d0d019e SHA512 199d1a26edd01e3b30f7aef69a9ae29456e3db384037744a1e073007ddb93a248873dfe83f3e48f9de58a9d17ebd7dc9a22a058f4adf766599d01d7eb17db204
 DIST arb-2.21.0.tar.gz 1842021 BLAKE2B 1ab3c4d18eb1918eaee9ea9aff68d82fc33a136ff5612e5173bf0cc29e5753f2c002256d68ae7983b5677d5082ab6849c68755e7544cee24144ca4e84e4d8411 SHA512 e441f8325d3095f1d568ebf9018520aedb25b6a066678e870942efcc8ac005dbf10cdffe42bc4fdbce3ba3ac397241c1d92fb54556e444243bd56dd3d5d72664
+DIST arb-2.22.1.tar.gz 1906319 BLAKE2B a302fe35ce5820f8cd7f98831906e9a114e120e6cfd24f42c9d76c9cb67cb232bf9b6b369801d201536552daa8cb7310bbabb7f8924a67d416ada4d37d1fcee1 SHA512 e5092b1b3f828d21a5e18722004aac5af4268b4bdce1d2a7e858485ca59ed77b32661678e229e7a44ebd29678aebe9e6b591f0dd3e1a9751460fc5d72980d0c4
 EBUILD arb-2.19.0.ebuild 749 BLAKE2B 05815e6f1635924824d5173ad0558627b5c98923b384d4f0dd2d369b7158acb0923f2f82d7d9ec29cb3f48cb30a402afe3adb3850d60ea60af5d95e4d1633dca SHA512 d7d9d2e1dd92cdc541de0212722b12c2db5eca27b00684f24af34d0829e1de91ecdafb731880d2eda177d363929e3bee3aa68f8a41f277f88b17a1554de01974
 EBUILD arb-2.21.0.ebuild 792 BLAKE2B 1275d14673cb09b748d2dd206f030e2fee431798adf27e629008a73301498d901e8815d5f5908e2b06d878f1ee17082e8138f8070e93d2e275d8c6a1440515d8 SHA512 105fec72bda06488fef22c77988aae8bbdc519256a703694fd2d4939bad4c000766a5c10b25e7739952e4fa927fee7ee4a1f7d4fb8c948ee243892763c6c60f3
+EBUILD arb-2.22.1.ebuild 695 BLAKE2B 09c5a3ff1b4f7a8c431fb275d6b2d709553f2008f2c6cbfe95f85d3ca330c668f245eea49592bef746700cf28d37eaa0854599f58b5f1d971a40816d507682d7 SHA512 bdcf866da232e6faca68816826a7f4f517cddb903d958426cdf3c6f131975fd27677b769538aa7ded7b2cdaa614de51525ae24172baf0fd722262476420e2bf6
 MISC metadata.xml 1108 BLAKE2B a2e3c1cf3f6c710c9b3e6fbf629101c3dccc9ae60c80da0d08853669019d7a2a03bb276dbe078cb6cb5ce6060ef7139a3658481d61a6d5e6d25f0cc1593be344 SHA512 2865a818ec7ffb77afc1c849fc960c2c39ec3bf6586b5f67e5c5037c6b6836fff0390224f27b1251a613d07107cf164ca11e05ec2f6988b629bd7e3a476e4854
diff --git a/sci-mathematics/arb/arb-2.22.1.ebuild b/sci-mathematics/arb/arb-2.22.1.ebuild
new file mode 100644
index 000000000000..0c54365c8935
--- /dev/null
+++ b/sci-mathematics/arb/arb-2.22.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake
+
+DESCRIPTION="C library for arbitrary-precision interval arithmetic"
+HOMEPAGE="https://fredrikj.net/arb/"
+SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-2+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	sci-mathematics/flint:="
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
new file mode 100644
index 000000000000..56df61f7e5f7
--- /dev/null
+++ b/sci-mathematics/cadabra/Manifest
@@ -0,0 +1,4 @@
+AUX cadabra2-CMake.patch 3184 BLAKE2B afa702834d5eb82a8056307b419fc20bbc2d45b0474994328b70fee383dff415ea37ef2e70c83e9cb7776e06f9295cf5cb9afddddaf857227f7a72f362b61726 SHA512 ddd6b451f81e465d4fef9401340808922bcb1074895173d83d699614e0c967024863848fabdd207f7124ff6396e8c2c75d2ed1425ba73d7bb6d5ac6fe56a87f1
+DIST cadabra-2.3.8.tar.gz 24647809 BLAKE2B 70858dab32c31b75b32b9eceaa60166accb0167cd8873c0058e6ef8ccfd3e3643da20b96fce3dde8be0e3fc5fdd42e1e6dac8e394643786163095a72239701d5 SHA512 06ebb148d911094dbdcc76747404cf7eb8f31e3bc458a81a37d4ed3bee3df97fedb9f11ed2251c133914aa6482db5b01d8848ef356ea1a0c83f59e686eebcfa5
+EBUILD cadabra-2.3.8.ebuild 2307 BLAKE2B 892a782c64c84f19b059818079c97a6ded3e008f8840df92c96fd93af647f8728b4e67e9115302159f1228df54f32c3ffa4f382bb4a5826a0bd347574d9db1c5 SHA512 c881a9cd78a1954335e07b1d760ef346bad90183a6d1aae33afd4627b36430df2e435e6ae383719ba7d1c70c9617dd58a33d7a5656c25d50cea15e11c061f792
+MISC metadata.xml 1342 BLAKE2B 2f34aae73fc01d4b8fd4326505b7b0785663c62593641d1d0a01f64adc12cbc8676271612ce91258927ac22957a8d5aba53dd2627130582c744bc32c28e0e207 SHA512 41dffbcfae16f8f0702df5a1837b225100761d48817a2d70fa03aca6246b9d3184d60989cf265282286b02a77a126ac82695c2d74c6de91da45e8f64fcb91811
diff --git a/sci-mathematics/cadabra/cadabra-2.3.8.ebuild b/sci-mathematics/cadabra/cadabra-2.3.8.ebuild
new file mode 100644
index 000000000000..7748e23c0ce0
--- /dev/null
+++ b/sci-mathematics/cadabra/cadabra-2.3.8.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2022 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_{8..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
+}
+
+pkg_postinst() {
+	xdg_update
+}
+
+pkg_postrm() {
+	xdg_update
+}
diff --git a/sci-mathematics/cadabra/files/cadabra2-CMake.patch b/sci-mathematics/cadabra/files/cadabra2-CMake.patch
new file mode 100644
index 000000000000..9000cd321db9
--- /dev/null
+++ b/sci-mathematics/cadabra/files/cadabra2-CMake.patch
@@ -0,0 +1,69 @@
+index 0f2ba31..7e6ace8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -166,7 +166,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+ 			message(FATAL_ERROR "GCC version must be at least 4.9 for regex support! See http://askubuntu.com/questions/428198/getting-installing-gcc-g-4-9-on-ubuntu and then set the environment variables CXX to g++-4.9 and CC to gcc-4.9. You may have to erase the build directory before re-running cmake.")
+ 		endif()
+ 	endif()
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -fvisibility=hidden -Wno-unused-but-set-variable")
+ endif()
+ 
+ # Clang
+@@ -175,7 +174,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ 	if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
+ 		message(FATAL_ERROR "Clang version must be at least 3.5 to avoid known bugs.")
+ 	endif()
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -fvisibility=hidden -Wall -Wextra -Wunused")
+ endif()
+ 
+ # Visual Studio
+index d21069e..69f4f52 100644
+--- a/c++lib/CMakeLists.txt
++++ b/c++lib/CMakeLists.txt
+@@ -48,14 +48,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   add_definitions("-Wall -g -Wno-unused-but-set-variable")
+ endif()
+ 
+-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+-endif()
+-
+-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+-endif()
+-
+ if(MSVC)
+ 	set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ 	set(MSVC_FLAGS
+index b7869a9..91567ec 100644
+--- a/frontend/gtkmm/CMakeLists.txt
++++ b/frontend/gtkmm/CMakeLists.txt
+@@ -160,9 +160,6 @@ if (NOT INSTALL_TARGETS_ONLY)
+ 	install(FILES    ${CADABRA_IMAGES_DIR}/256x256/cadabra2-gtk.png   DESTINATION ${ICON_PREFIX}/share/icons/hicolor/256x256/apps)
+ 	install(FILES    ${CADABRA_IMAGES_DIR}/cadabra2-gtk.svg           DESTINATION ${ICON_PREFIX}/share/icons/hicolor/scalable/apps)
+ 	install(FILES    ${CADABRA_ROOT_DIR}/config/cadabra2-gtk.desktop  DESTINATION ${ICON_PREFIX}/share/applications)
+-	install(CODE     "execute_process(COMMAND touch ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)")
+-	install(CODE     "execute_process(COMMAND gtk-update-icon-cache-3.0 {ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor)")
+-	install(CODE     "execute_process(COMMAND chmod go+r ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)")
+ 
+ 	# Install shared libraries on Windows. 
+ 	# https://stackoverflow.com/questions/32662215/how-do-you-install-gtk-3-0-on-windows
+index 071bf11..bdfde1c 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -404,15 +404,6 @@ add_subdirectory(packages)
+ # 
+ # https://stackoverflow.com/questions/21198030/installfiles-cmake-cfg-intdir-abc-win-dll-destination-bin
+ 
+-if(NOT WIN32)
+-   # Remove any old cadabra2.so files in the global site-wide path which may have been
+-   # left there from a previous install.
+-   remove_file("${OLD_PYTHON_SITE_PATH}/cadabra2.${PYTHON_MOD_EXT}")
+-   remove_file("${OLD_PYTHON_SITE_PATH}/cadabra2_defaults.py")
+-   remove_file("${OLDER_PYTHON_SITE_PATH}/cadabra2.${PYTHON_MOD_EXT}")
+-   remove_file("${OLDER_PYTHON_SITE_PATH}/cadabra2_defaults.py")
+-endif()
+-
+ install_directory_permissions(${PYTHON_SITE_PATH})
+ 
+ if (MSVC)
diff --git a/sci-mathematics/cadabra/metadata.xml b/sci-mathematics/cadabra/metadata.xml
new file mode 100644
index 000000000000..372b6a2d1f8a
--- /dev/null
+++ b/sci-mathematics/cadabra/metadata.xml
@@ -0,0 +1,29 @@
+<?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>
+    Cadabra is a symbolic computer algebra system (CAS) designed specifically
+    for the solution of problems encountered in field theory. It has extensive
+    functionality for tensor computer algebra, tensor polynomial simplification
+    including multi-term symmetries, fermions and anti-commuting variables,
+    Clifford algebras and Fierz transformations, component computations,
+    implicit coordinate dependence, multiple index types and many more.
+    The input format is a subset of TeX.
+    Both a command-line and a graphical notebook interface are available, and
+    you can also use Cadabra from Jupyter by using the Cadabra Jupyter kernel.
+  </longdescription>
+  <upstream>
+    <changelog>https://github.com/kpeeters/cadabra2/releases/</changelog>
+    <bugs-to>https://github.com/kpeeters/cadabra2/issues/</bugs-to>
+    <remote-id type="github">kpeeters/cadabra2</remote-id>
+    <doc lang="en">https://cadabra.science/man.html</doc>
+  </upstream>
+  <use>
+    <flag name="jupyter">Build the Cadabra Jupyter kernel</flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index fcb3dab92ac4..e18c8dcad9b5 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -4,5 +4,5 @@ AUX calc-2.13.0.1-respect-LDFLAGS.patch 9767 BLAKE2B a8a8852fd806e17c0eeec5e82ce
 DIST calc-2.12.5.4.tar.bz2 956258 BLAKE2B 47c2ab46c47baf0d1f1d202a36e0d42cf0b25f7eecf61815814081b2f76aa65dc8cc4e970078a5176266ce1332751169424d1c6d2c16ff148a1b014986b56d47 SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f
 DIST calc-2.13.0.1.tar.bz2 987542 BLAKE2B bbd93aa296211dde8f7d00a86e222bf4ccc0065da021c1666c333610c6837a1984995c74995571af025e68ec64519ed2d158731448037ee0a4f2eafccfc1a625 SHA512 7d7e07072779c97aaeb966f9282a6e4127c839ecadd0b7269d37d587949c47075d301c3420735f903ba179ae2bbbd309fd29e459fbf12b450e528aadc66537c4
 EBUILD calc-2.12.5.4.ebuild 1310 BLAKE2B 2e98a4bc4665ecd786f5db43576177d3761e26f1b9dc74daf4ce52d45305c53e160c849348b8a93513618930f87934fa552da799d9eb0b95e6d50be72232953d SHA512 5d39ec954eb6f18d6fd00be72df0ce15696ca795ee1fbde5460e3fe8c4609446d2557051bf8bf283a52c19d8ff6bfd5caaad29c2d9d2f954634647b4e212583b
-EBUILD calc-2.13.0.1.ebuild 1404 BLAKE2B d3991c2e4edd8f745d52f2cb08bc8dc7afc0c3ee2fa007264178c1cf285b5a5216b3887135c2e1fe2c6b50c46c8d8e0fece0bf41223342ed34b3cc0082668a15 SHA512 4f5d567b9494dc52ec28fd0588a585314adb6dfc3f59921a69ee92d807f92fdb89b325b81cee88d0b4fdb4a099434928254e7ecf9e9452f0577ed4c21fdec2d6
+EBUILD calc-2.13.0.1.ebuild 1411 BLAKE2B 74b2af0ec7c97d29e78c59f40a049ee6b780b21b047bab3875e3f27ce012e0dd0990b653ba8fc657493ab1f7ccf2bd9d430a5308514918ca360d88d2a7ae103c SHA512 9482843cd228e1934fa245bf227c85f592dd2f54042290706f61f1e5979c10127bcff51f5d0bba2df67dc7843a110ce1ccd4a85f9716d7f39f48261560f807ea
 MISC metadata.xml 712 BLAKE2B e8c7c0ef864549f54fa59e97a9e166770b28e68ee05f19f759e91c88de315a7d35f3db7aa59cf857a872dcf6dea099534ef5524864d594806d5ee29680e248ef SHA512 7c6b6aa1ce1fa19227e9176f6881b9e0d96b84985844c18ce7555a89eeca7b1b4a16f471cb05132f63a97447d27cd0f351e0bdaf59b82d1dada8bdf410a56697
diff --git a/sci-mathematics/calc/calc-2.13.0.1.ebuild b/sci-mathematics/calc/calc-2.13.0.1.ebuild
index 38f0159d1f8e..2c8f50d33e36 100644
--- a/sci-mathematics/calc/calc-2.13.0.1.ebuild
+++ b/sci-mathematics/calc/calc-2.13.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sys-libs/ncurses:0=
diff --git a/sci-mathematics/coq-mathcomp/Manifest b/sci-mathematics/coq-mathcomp/Manifest
new file mode 100644
index 000000000000..4637b00c1a30
--- /dev/null
+++ b/sci-mathematics/coq-mathcomp/Manifest
@@ -0,0 +1,3 @@
+DIST coq-mathcomp-1.14.0.tar.gz 1352989 BLAKE2B 475ca9725a7868d592fc289223f468c6703cca1574d878568d7faaa2725fc204155320c915c75861d5f122acc0cf6aaad9f324656f9a7dae030d37fee93bec27 SHA512 49821492016e75fe32d22557b6b2de4bc0a3d924e2a38a13f2759aeb87095417a27e274737d0dcc01448899c3ebb50c284e9eb96fd1d4c22fb5d101dc6d290bf
+EBUILD coq-mathcomp-1.14.0.ebuild 604 BLAKE2B c40cb3f909d150fa3166e57d2f8a894086f6f17f0409b4626d223624cd53a77047e62c803067dd2dd245722f2d04d69f458e3a6037ebebaf5e7453e9bd6a0960 SHA512 c44bc20bcb101a506d1aedc264429b624f0e67e9a6908ad6ee7ad2eaa17f84406186dea2518675f68cbeff1cd5504421606c460872a4410c15aa3d66b4bc7bbf
+MISC metadata.xml 511 BLAKE2B 3936f96cbf938fb9de97b080566d7fdde222d7dd303ccf842c76e7bd113b31c05136aea043c354bbd2ac6d4f61e2cba4e738f9f325059d36b7bae4feaed1ae89 SHA512 af2a4cfded0990d95e0a4b77ba69aebea09dee075f9eb4023b14c4788cd4118a78b3b5a4349fed11fff347061ab4bf59a4c63c8f43b22f8513054f1b3817af2f
diff --git a/sci-mathematics/coq-mathcomp/coq-mathcomp-1.14.0.ebuild b/sci-mathematics/coq-mathcomp/coq-mathcomp-1.14.0.ebuild
new file mode 100644
index 000000000000..2197f1aa5dd9
--- /dev/null
+++ b/sci-mathematics/coq-mathcomp/coq-mathcomp-1.14.0.ebuild
@@ -0,0 +1,26 @@
+# 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:="
+DEPEND="${RDEPEND}"
+
+# > make jobserver unavailable
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}"
+}
diff --git a/sci-mathematics/coq-mathcomp/metadata.xml b/sci-mathematics/coq-mathcomp/metadata.xml
new file mode 100644
index 000000000000..b379637e4ab6
--- /dev/null
+++ b/sci-mathematics/coq-mathcomp/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+  <upstream>
+    <changelog>https://github.com/math-comp/math-comp/releases/</changelog>
+    <bugs-to>https://github.com/math-comp/math-comp/issues/</bugs-to>
+    <remote-id type="github">math-comp/math-comp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-mathematics/coq-serapi/Manifest b/sci-mathematics/coq-serapi/Manifest
new file mode 100644
index 000000000000..79adbadee5cb
--- /dev/null
+++ b/sci-mathematics/coq-serapi/Manifest
@@ -0,0 +1,5 @@
+AUX 50sertop-gentoo.el 85 BLAKE2B d06e7c0823a3bedbf5f9c91ea8ea26bc9ed9d2ea44030316a1f3d65c19e51d874f03c845af5ae8237a9562cff7c81e24196c5ae29e54d79d1ba322f51904ba5d SHA512 42e61d798800d2e4c7e0702bdff53401a06ff6def54a1c7c0a8a6fd3e6a2f502c48bc84a04356818aa2ec5241bdd63b407837df123bfad76fafb78cf8a5a6cca
+AUX coq-serapi-sertop.el-path.patch 319 BLAKE2B 272eca8af934e10e978d149f90ee702fba443db7506468dda344242c5fe8a336f3ba3836c536bfac9ec6e540e1ee2f4c1a031d69e42901fbea92441b64e4c2a5 SHA512 5d228659e7c07e8fae69ffbff9d6a9de3113aa444c467194ce9e238a0db86c59c2be45b3e14683e47c2453c701b869e53647c9b051652af5ced8f4b3b5a15e73
+DIST coq-serapi-0.15.0.tar.gz 268083 BLAKE2B aeea2cb8ed0f648f307715c464f2da90585718aa8afedf69b4e1c282265a12a3937044397787404e43286cebaaf1f48efde93d845cd71c1c97cc1b2e9a2a8835 SHA512 3ba1b63002d36a4c0e64f86170d31c4131dc02e8cb8573b39f03ed44d1e5f29c064c472bebad367b875b02e36ced6bfe8c5fb2023bd798b3b79f74a5a2f54189
+EBUILD coq-serapi-0.15.0.ebuild 1364 BLAKE2B ac46f536fb9a0ac3a4c050732545409fa7f2a0ce888895e2b0ead2332317d1b51b3a964b91ba5baa9f86b050a2eb319889bedf20a7b6a1071ac5eb4c43e827e1 SHA512 bc8af4879ac61917ccda943a804f3daea2fe05bf63ccf17fdd4ef130c968702e8179c227e1c176efa2a59620910b366fcc8f4fa65d0398f806ec59931bbec6b9
+MISC metadata.xml 935 BLAKE2B e1444df414ce499df466597f5e0949e8ebf2d6da23d77028546324109659f58c5f0284a315ea062410a2f2e4631aac8d3564664719e89d76ad6ded9bb8ba7a5f SHA512 172fedbb2aa42e2be9aff426d64fcd69d2dfa206bb0e6072c6ecdc14a1923a2f0676303d8d8aebfe9a3e96e0a1e89185d2d4952bdb9ba1fff44b3891f26d6bf7
diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.15.0.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.15.0.ebuild
new file mode 100644
index 000000000000..2733c490f747
--- /dev/null
+++ b/sci-mathematics/coq-serapi/coq-serapi-0.15.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COQV=8.15.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}
+
+LICENSE="GPL-3+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sci-mathematics/coq-${COQV}:=
+	dev-ml/cmdliner:=
+	dev-ml/ppx_deriving:=
+	dev-ml/ppx_deriving_yojson:=
+	dev-ml/ppx_import:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/sexplib:=
+	dev-ml/yojson:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	test? ( sci-mathematics/coq-mathcomp )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-sertop.el-path.patch )
+SITEFILE="50sertop-gentoo.el"
+
+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 sertop 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-serapi/files/50sertop-gentoo.el b/sci-mathematics/coq-serapi/files/50sertop-gentoo.el
new file mode 100644
index 000000000000..b630f718aa19
--- /dev/null
+++ b/sci-mathematics/coq-serapi/files/50sertop-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'sertop "sertop" "Launch sertop." t)
diff --git a/sci-mathematics/coq-serapi/files/coq-serapi-sertop.el-path.patch b/sci-mathematics/coq-serapi/files/coq-serapi-sertop.el-path.patch
new file mode 100644
index 000000000000..628ed22a64ff
--- /dev/null
+++ b/sci-mathematics/coq-serapi/files/coq-serapi-sertop.el-path.patch
@@ -0,0 +1,12 @@
+index 300a22f..63f7dcc 100644
+--- a/sertop.el
++++ b/sertop.el
+@@ -37,7 +37,7 @@
+                            (buffer-file-name))))
+ 
+ (defvar sertop-executable-path
+-  (or (expand-file-name "sertop.native" sertop--root)
++  (or (executable-find "sertop.native")
+       (executable-find "sertop"))
+   "Path to sertop.")
+ 
diff --git a/sci-mathematics/coq-serapi/metadata.xml b/sci-mathematics/coq-serapi/metadata.xml
new file mode 100644
index 000000000000..fd440ed6e397
--- /dev/null
+++ b/sci-mathematics/coq-serapi/metadata.xml
@@ -0,0 +1,21 @@
+<?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>
+    SerAPI is a library for machine-to-machine interaction with the Coq proof
+    assistant, with particular emphasis on applications in IDEs, code analysis
+    tools, and machine learning. SerAPI provides automatic serialization of
+    Coq's internal OCaml datatypes from/to JSON or S-expressions (sexps).
+    SerAPI is a proof-of-concept and should be considered alpha-quality.
+  </longdescription>
+  <upstream>
+    <changelog>https://github.com/ejgallego/coq-serapi/releases/</changelog>
+    <bugs-to>https://github.com/ejgallego/coq-serapi/issues/</bugs-to>
+    <remote-id type="github">ejgallego/coq-serapi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 848d8d08a6eb..029952d813a5 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -5,5 +5,5 @@ DIST coq-8.15.0.tar.gz 7215106 BLAKE2B 512fde593f6e7fb8b410b5debf5a78bc5d0d181ed
 EBUILD coq-8.11.2-r1.ebuild 1845 BLAKE2B 2d6bbe0787ce45b4e5130d3e9d3ec61f527fc72f2f9dfef15180ca3dbc1f46f34e7cd847c580df16a8affa97e9430e1fd045a14c4dd3bd02bc52c67d1211c55f SHA512 b39833afcbb6e33a7917f949258e91a1a11229ed68427644f80ce84a00b7254a17d8e6e41c6d778184e54c6d8928ff62cc840eee77239feea5cbc12dd3731972
 EBUILD coq-8.12.0-r2.ebuild 1847 BLAKE2B 57496afca08cfde63635e873dc6d59d32356daa211d8a140820e07398f54bb38c114ac5ae5ad7ad101a6514117dc469783d3964aae18b27a54b18330087e5f49 SHA512 84fee1004970f88cfccc28717d75fad765dbe8b27ac7dae964e5729e47727f846ac69417bb5c585a68668396896c52a5f8421dbf77e73065d8ac7b9793f4900f
 EBUILD coq-8.13.0-r1.ebuild 1821 BLAKE2B 785a17783ee06916fa171449aebc1e54437f878656862e3cec93f1499097e80b57994e37dc597ff571dbe5d45fc19b984e1d10baf8b0b61e2a7c8cfd6b851d35 SHA512 e35a981b036d089afe934a9bcfc96da2d965fa17b8c90e38b8fe2194f9aaf1b693ceead2b26e77c1e4ee4ae23124bcba9aafdb6f17c5fa5ba0fa955b16c1fda5
-EBUILD coq-8.15.0.ebuild 2371 BLAKE2B be3296b09cdb60c1408d3562ce96c810b43193c386bea72b50fa604fd93d08b9267074c082b40f7d20649122968b9775a5d0477509c504cb76d91a24c5dbac4d SHA512 63666fd745f6f39c97e3f69b250a8cd7528ba3d78a303652f358e238317087c3cf4851a574cbd477193c097a5da6da85965832e8c19897c4e94d1fc4660f3578
-MISC metadata.xml 939 BLAKE2B e8da08122c0821621a51c3d0fee7d62302a7e0f2f5c37d5787ce2ee613df299a1256f78bbb1d1c6d045076055aad6a25849a02000b97be619b9e984694315ac3 SHA512 98ae3bfb70f27c4b5e5cb18ebe0b9b93ddbb855e426eb54d019957253b3077fc32f0810aae4049f1fcd53209da863addb4b1e88b21ea7422515ce387bfdbdf43
+EBUILD coq-8.15.0-r2.ebuild 2396 BLAKE2B 5648c9ffb0d8986ef485feef651526473552d38101cfc9692cf05dac8d5721af92d5ffacb19e29ec741b2b2804c9f49b8b08b64e605a7b03b51abc51593bad23 SHA512 ec43c43e0d0569c47bb938a4468b4a248c5243ddfcfbc04bac8301ae37fdcef51e48799c8437b3301daebcd074743f7289f1ea54eae6cf44446eb164d6abda5a
+MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.15.0.ebuild b/sci-mathematics/coq/coq-8.15.0-r2.ebuild
index b02fe03c702c..fc4bad973709 100644
--- a/sci-mathematics/coq/coq-8.15.0.ebuild
+++ b/sci-mathematics/coq/coq-8.15.0-r2.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-inherit desktop dune
-
 MY_PV=${PV/_p/pl}
 MY_P=${PN}-${MY_PV}
 
+inherit desktop dune
+
 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"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk debug +ocamlopt"  # doc add when antlr & antlr-python are ready
+IUSE="doc gtk debug +ocamlopt"
 RESTRICT="test"  # fails
 
 RDEPEND="
@@ -31,15 +31,21 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
-# to build docs we needantlr >=4.7, not yet in the tree
-# BDEPEND="doc? (
-#	>=dev-java/antlr-4.7:4
-#	dev-python/antlr-python:4
-#	dev-python/beautifulsoup4
-#	dev-python/pexpect
-#	dev-python/sphinx_rtd_theme
-#	dev-python/sphinxcontrib-bibtex
-# )"
+BDEPEND="
+	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/sphinxcontrib-bibtex
+		dev-tex/latexmk
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+		media-fonts/freefont
+	)
+"
 
 DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )
 
@@ -51,8 +57,7 @@ src_configure() {
 		-docdir /usr/share/doc/${PF}
 		-datadir /usr/share/coq
 		-configdir /etc/xdg/${PN}
-		# -with-doc $(usex doc)
-		-with-doc no
+		-with-doc $(usex doc)
 	)
 
 	use debug && myconf+=( -debug )
@@ -95,7 +100,7 @@ src_install() {
 		syms+=( coqide )
 	fi
 
-	# use doc && emake DESTDIR="${D}" install-doc-all
+	use doc && emake DESTDIR="${D}" install-doc-all
 	einstalldocs
 
 	# Dune installs into /usr/<libdir>/ocaml/<coq> but
diff --git a/sci-mathematics/coq/metadata.xml b/sci-mathematics/coq/metadata.xml
index 3a90dda7ec2e..bb29aa903edb 100644
--- a/sci-mathematics/coq/metadata.xml
+++ b/sci-mathematics/coq/metadata.xml
@@ -5,7 +5,7 @@
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>
-	<longdescription lang="en">
+	<longdescription>
 	Developed in the LogiCal project, the Coq tool is a formal proof
 	management system: a proof done with Coq is mechanically checked
 	by the machine.
@@ -21,6 +21,8 @@
 	theories.
 	</longdescription>
 	<upstream>
+		<changelog>https://github.com/coq/coq/releases/</changelog>
+		<bugs-to>https://github.com/coq/coq/issues/</bugs-to>
 		<remote-id type="github">coq/coq</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index dbbd394428e4..3ea7c27764bb 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,7 +1,7 @@
 AUX cvc4-1.7-gentoo.patch 1665 BLAKE2B db98e67fb3b152e0c78019b21b32c99d06377f1b1c1cc6a3ac2edea5e27d6f8ba082fc209c3694e1144a94d9d3b1897418af250252ff40a26e521bbf72d7da0f SHA512 b6b7af8c48c0398375343c8fa72f3e15d8f9031848cf94e6e2880f04b5e8d695691dcf67b84daa1706464289f7db0300046af4c93adcf278f7951eccc734af89
-AUX cvc4-1.8-gentoo.patch 1655 BLAKE2B 019d1cd6cc1b95042f4a04470c659a0e6b14e6e4d45eee16187feed1ee7664564e29a230b6d859ad70a3f2e442a44cb1ae296617e29cd894106a10e290490ee3 SHA512 1cf38e1d817f9347308dd982c6ff1f6344d654fda69fc6a2313cf6c9fbeb331cc168e002a1f9731c5481ed063aa5feb360014d60fd0e1cc55a6aeeea44ac13c0
+AUX cvc4-1.8-gentoo.patch 1983 BLAKE2B bd9e7f8b442e151fdc27b45866ed4374ffcbeb5d37edd192cda13ddb3ca547b6e29cfea7641973636a184c14a649bb2131beb4e9c9b90f329dfd0cec8aab0bf0 SHA512 3793c9e318ffb266e505627ac7ea3cbf6a7ba3837a419967b873b72b71bc2bb1a45ae9fd61abaa95af02802267823d8affc1faf077f8ee16eef00ed7715c2187
 DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
 DIST cvc4-1.8.tar.gz 7554297 BLAKE2B f4d2b223ba2c01ef745520d8874381a1873358fbc7eca12559656512ffeefccec4eca3d73a26debf34110ca14a3bccf35ca87e2a49575b8b67484bed79df081c SHA512 d6b0153b0f5c4e615c995a8eecfbfd783cfc1004c5134c6880230044081c71d638fee39cceb987eb8d72e91b2b6596b184dc0daacec8880cfc176c6dee8aa445
-EBUILD cvc4-1.7-r1.ebuild 1379 BLAKE2B c806041f0941649a8108f6148ad2226647721a9396e5d8d889649e3185ba229aaa405ab1a22409aa4d1b7a21142213646df734e24bcec26b5899bbd114d92aff SHA512 d4ad9b8b61f48feb744d3ea5f6964112e63e9beba1f156b997bcde57a2aed295a54e3e93444d9570d997979a81b3fd74cae5f4fd335df201b504ba2ab9b67469
-EBUILD cvc4-1.8.ebuild 1294 BLAKE2B b582be8424ee773310d4decdf2a03f7144037a80e117584dd9961b4a4548119cd553ddc30ea7ab5beaae3e6ec37b062993931a2d7c48c15b230c9b9efd0fda97 SHA512 0192be6902b0482a229581f8a7fb33ffe884ef101021959cf4f2cc98acec1bb344a21f18f57d43150681b058c0a83c0c7252e5a238c51315c3617a3194cc8ddf
+EBUILD cvc4-1.7-r1.ebuild 1379 BLAKE2B 7c19d2a0bda3de27f1fe34619bb380b9e1fd019b8ecd00d211bd8c377d8455a06f283b1494f2361cd765426366def94371192f4ae265c60df211c46b82387646 SHA512 072f641ba31457f411cf01959017ae743eb47a44a79007b9505c44361221369c1f9a651c23397ce13e7f32c01755b160410ab0b1e1b2a54cf7436c3089925e1d
+EBUILD cvc4-1.8-r1.ebuild 1344 BLAKE2B fb5fa0f1176a038b7c6b9a00d0116abd2ae6f831d672de66beba2e5b83bb7713bdb0c94124e1d44cf2ecad41fb9055c1a10cf6f98c253380d4ead1173bd64e96 SHA512 38b6e0a1ee2d3b7c7d828dac4d7a3f6436881e27daf897fbbb715fbcc7de50e96d3b5585829aa3088aaac8464cd4e13b6afec8a4b37e56772f734e58d1a647be
 MISC metadata.xml 802 BLAKE2B 97e1799f8a4e57d40e191c1ba30a762458a5bdf5e372fd406aa8b207f8ea8a39c178a2963d748d0cfd3123fcd18d3894f5ae5913edf67bb3cbb1c2b25528e5c1 SHA512 1373b776ce6f7689dc6c744c2b1e573bbd932c33b5517e54813caa4edde8f68d5670af316b5908dbf69c775c94fb932a12eb8c5ac39310a10c0e2aefbbda6f42
diff --git a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
index 36e9f4689a67..a2f98aac04cc 100644
--- a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake python-any-r1
 
 DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems"
diff --git a/sci-mathematics/cvc4/cvc4-1.8.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r1.ebuild
index 347dbda0a248..ed74ecc20fba 100644
--- a/sci-mathematics/cvc4/cvc4-1.8.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.8-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-any-r1
 
 DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/CVC4/CVC4-archived/archive/refs/tags/${PV}.tar.gz ->
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cln proofs readline replay +statistics"
+IUSE="+cln proofs readline +statistics"
 
 RDEPEND="dev-libs/antlr-c
 	dev-java/antlr:3
@@ -23,22 +23,27 @@ RDEPEND="dev-libs/antlr-c
 	cln? ( sci-libs/cln )
 	!cln? ( dev-libs/gmp:= )"
 DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="$(python_gen_any_dep '
+		dev-python/toml[${PYTHON_USEDEP}]
+	')
+"
 
 S="${WORKDIR}"/${PN^^}-archived-${PV}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
+python_check_deps() {
+	has_version "dev-python/toml[${PYTHON_USEDEP}]"
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DANTLR_BINARY=/usr/bin/antlr3
 		-DENABLE_GPL=ON
-		-DENABLE_OPTIMIZED=ON
 		-DUSE_CLN="$(usex cln ON OFF)"
 		-DUSE_READLINE="$(usex readline ON OFF)"
 		-DENABLE_STATISTICS="$(usex statistics ON OFF)"
 		-DENABLE_PROOFS="$(usex proofs ON OFF)"
-		-DENABLE_REPLAY="$(usex replay ON OFF)"
 	)
 	cmake_src_configure
 }
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
index 372bea03fb72..64cf5bd771b2 100644
--- a/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
@@ -1,5 +1,14 @@
 --- a/CMakeLists.txt	2019-07-09 14:47:12.552425226 +0200
 +++ b/CMakeLists.txt	2019-07-09 14:50:02.595001358 +0200
+@@ -83,7 +83,7 @@
+ #-----------------------------------------------------------------------------#
+ 
+ set(INCLUDE_INSTALL_DIR include)
+-set(LIBRARY_INSTALL_DIR lib)
++set(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
+ set(RUNTIME_INSTALL_DIR bin)
+ 
+ #-----------------------------------------------------------------------------#
 @@ -143,7 +143,7 @@
  
  # Note: Module CodeCoverage requires the name of the debug build to conform
diff --git a/sci-mathematics/easycrypt/Manifest b/sci-mathematics/easycrypt/Manifest
index 83a04e2b33be..5236f5665c12 100644
--- a/sci-mathematics/easycrypt/Manifest
+++ b/sci-mathematics/easycrypt/Manifest
@@ -1,3 +1,5 @@
 DIST easycrypt-1.0_pre20211210.tar.gz 1185137 BLAKE2B 3557a8b0423109a3b3e6e02f6d1ad88f07847d105015546c90b5a46cf514f1311390d3a6f6476c042420b91a62ad095919f7ab616adee2778165d9d081070730 SHA512 0043eac02e916dc46ed1cb4f278f148f915d09f336e904b1a711c18d62cda177e434fc13682ec095a085e458ba90ca8dd02968206af60f0b80a378f16b205553
+DIST easycrypt-1.0_pre20220303.tar.gz 1193244 BLAKE2B f4d4b0661b7c58d9dd2c344efac45aa4257b46122cef81f98ced05792c1e4dd49d332421f09d0b11a28893096042a98a7415d06e1624aaa59cea0c71f17f4bb8 SHA512 bd9f1638631c9539aea3ee369705fbaafa06d575db395b3d170642af2450b7df735a18fe8f6aa6e8904eae62bdcd30743ab734f7c17c583ece7c146fee1bcf77
 EBUILD easycrypt-1.0_pre20211210-r2.ebuild 997 BLAKE2B 478ad9edc20d1da5f92c52fecf0d642591d926accc3040eb0eec9406fe99db24455b525d4334d5859bcc20e0cc472cb49ff005dc042151ba403cc0fc765f94a9 SHA512 ab80d2e314d2bde1877967bbec78c9226750fa5d8b80bddd5cdb2beeea26b478f5b4274ac10e4d3fba3d3c5e49a7762b061e1b4f433d51008dd4a60aa6a3f468
+EBUILD easycrypt-1.0_pre20220303.ebuild 997 BLAKE2B 323b45bd51376db37ac84b6205fc5d82647019a2a8473c34fe2d3fe53fe72b4d2e5a01aa13f862088b240328ae13d5aeb8d75b194cd84a73dd13ab76c2803e37 SHA512 ad99ec439aa7e855fb602d6ddcfde4a7bd829b28950c7489b9a50166fa862db1784d592e6bcdc6b863243a528de179a07ef65a3c3a2990d9eaf9a9e27770751b
 MISC metadata.xml 799 BLAKE2B 967a758171a2fe87b648a29bf2663beaae7834119e55a7619c98518c96cfe459e59fe5dc72a9faea071c0b488dc8144f1c0e43677ac63646f1ba12cf831f4a88 SHA512 411ff1acad400c3e70e546fd59b20db13b0f1db121aca9f1af23da708cd82340114bc966f64cfb5a35e84967c1131c660ab260f867639932c67edf47c859c4ca
diff --git a/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303.ebuild b/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303.ebuild
new file mode 100644
index 000000000000..84353ee281ec
--- /dev/null
+++ b/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=c98b014c131b6c0b147b852902953dd6c5771603
+
+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/${H}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${H}"
+fi
+
+LICENSE="CeCILL-B CeCILL-C"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
+	>=sci-mathematics/why3-1.4:=
+	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/fann/Manifest b/sci-mathematics/fann/Manifest
index 2afa9308734b..d0ffbf1dbe1d 100644
--- a/sci-mathematics/fann/Manifest
+++ b/sci-mathematics/fann/Manifest
@@ -1,5 +1,5 @@
 AUX fann-2.2.0-examples.patch 941 BLAKE2B 82b5480468179cad681e2c1359a84fe550ed4f23b42441d8b943a79c86d51d7b491e879cb597ee0c097acb26210196a7755345e4ece02692a93c3f6ea18b07ee SHA512 617c43352912b965d0c7ef445aecdb15a5148260e3f41c1b0e8cdd5abb0246e6ad0338c74b75c690fbc63175692578dcc596612108c3b9804694cecace046b34
 DIST FANN-2.2.0-Source.zip 2285087 BLAKE2B aacb49c20c4ea0d86f4eeb3144462051b43480ed613228f3a590ea258878cd2d0528cd301cb993a96ed0bec0d69d5b7c4288f25046d5272c1c8295167862a349 SHA512 c486694aac53cf91a83f8b68d9020fc74ca2bea9416c9d06b6dc8f53d30a2261bd00212e3d439adef9fbdd82532056f7c1afed793f5574c2d6191d84d26fb5c2
-EBUILD fann-2.2.0-r1.ebuild 751 BLAKE2B 3fbc6f46fd9d4ebc6618cb8d3afa6504716c9d57cc71833537093789508365c3969b54a6e29eb8a306a704152b2b8e205d799e037c47e618849c2b0ba63f70ab SHA512 1939eb9a8d8b8d1dc67fadfd5c6cf7c13ccfb201add8ea362cd7f27a5bd7903180267b367064086db6a2e3e99257d7705c4902eb41ed92ccce3803ce6b17552d
-EBUILD fann-9999.ebuild 655 BLAKE2B b78e772cf400c622470219f1e3bc1a01d8283bf79e70c8b45477b903b4f0dba461618aab58935bd7f947d37d897e62cf4c2759ccfc3424c3860cfbf2722a6d84 SHA512 0c712886a687853533ca63b60f1f468ba9a2bc2cba6606653e8734e11a5573d1a8302d0b226a2f6481d24f20689adfb5d90edd6e4f226c85de27576dc3f5576a
+EBUILD fann-2.2.0-r1.ebuild 766 BLAKE2B 9ace8333b26d7287ad594ea55fa1d4c970f1e1a7a2cb64e6aef3f3fad59f9c65e5feca79d5fdf724bcbf02929bbe0a65adfa48a3f0ee75420bafa24fc5f3a2f8 SHA512 8bbb76c16428d38e41a1b5c2c5e4c03b5d33823d32b694061acceee6eb91d34103cf51fac919f80d519e6f12dcdf9a58b025a40e5c54fb3b14aef080e9d38f64
+EBUILD fann-9999.ebuild 670 BLAKE2B ae5e9c5a3c60e245fd7b2eeae8b2cb195f20f46dae9e59bbfa3f8d79fcdcd81b5e4dd679ec07896ccbcb201a4f68b812332a7a02946287d2551f031bbef5e8ff SHA512 5bb1e786158d97a8cbc371a223a17a0683575ce3f33342acb18bc8bfd66375f45252ea3742e00eb9d24b44aeb5e1105d2e6c54e31083f2338e54a992287dfe8f
 MISC metadata.xml 842 BLAKE2B d973f556251c9d1d88a64e1de34982022efceeffc93b4f7b845adabe02c8bd52bba6a0ad1f6193b817aaacd954900d5e6496d78a87c6a5dcac3b6240d5878917 SHA512 9a2801d94baaabe8d7520b5d7322ae6c9a6adc2dc13092b9b9bf8ac013284428cc32a836d1af7a443ab1b46ff1c40578e9d861f0f0e047d9070c7fbb6d4f3a5e
diff --git a/sci-mathematics/fann/fann-2.2.0-r1.ebuild b/sci-mathematics/fann/fann-2.2.0-r1.ebuild
index 044956a1bb4e..bc008ff94ab2 100644
--- a/sci-mathematics/fann/fann-2.2.0-r1.ebuild
+++ b/sci-mathematics/fann/fann-2.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ src_test() {
 src_install() {
 	cmake_src_install
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/sci-mathematics/fann/fann-9999.ebuild b/sci-mathematics/fann/fann-9999.ebuild
index b9c40c483009..e41c4a9c2643 100644
--- a/sci-mathematics/fann/fann-9999.ebuild
+++ b/sci-mathematics/fann/fann-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ src_test() {
 src_install() {
 	cmake_src_install
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index 3aa90b149f78..934278d0509f 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -2,7 +2,7 @@ AUX giac-1.6.0-pari-2.11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b
 AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88ecbc71dc450ef714f6da323128d9c945ada9d658c73647987f84638498aa4d3bbef49062424ab63b53c76defc127902 SHA512 14bfcb04e5a23933cfa4635789bf02f6d6e6a528c167504678b3d2ecb38f135d0c05583712005fe53afd7696cc9ebee5dc3ab90cac056d75bd43be786075b011
 AUX giac-1.7.0.13-xcas-desktop.patch 890 BLAKE2B 31e33a52fdcb70c610edf21f046d112df3702e1d4f635cd4956bbe17d928839c9a0a87cb5ba5d6aeff94213b482ce22bd497d1d258aaa8abd6d8fc0116031f15 SHA512 269c733edc899051fc3de23021c322a3099499dfeb559ab1cada0964258a91a9735e620b480560226e5a3b492f2f5654062ee9c2c5479ae9789b012e7a5055ca
 DIST giac_1.7.0-13.tar.gz 86447065 BLAKE2B 4d91e83608f7ec376d133c2784ffce99447a9dd78b5c8582b81a0aae0b8ac59eec4db3ee4a8bcb39202c777c300178a181f2dc2ac74ab445ddba2f3efa0ecb1b SHA512 99fff7ce5117fd8c106601ead03679805d529fe12d5372cdd4ae54824aa6fdcbdaaa1a62ea1153391a1a65af8970e38fca7d95ca9983755ff06053f1d8b6d65a
-DIST giac_1.7.0-45.tar.gz 96780194 BLAKE2B c43b0f89ad664b419db5d98541f23d3259a32b462d71f3a4fe06ea2ac3de0dd71d903308cd8e241758d809d0755a2f070bae03434a75abc94f17b1d8cbda03a2 SHA512 47fa019fee526d584f5dbc67adb4326e2680649ad942a2140d033ecd66957ba7a21441f02a3ba55d009bbd6756da239fcee99cab2a361993aae4df6e9f79a1a7
+DIST giac_1.7.0-47.tar.gz 96787570 BLAKE2B b05b3f44f10695a5d085df0a0db9aba761ac011964caeb247bd6034ca2a41505e5eb30df0de494826270703d9b62fbb3b9d4869f4cdd32d1d88636f374fbae16 SHA512 60a8550f7da2a163365759266660421c936797a9d52c3ba3802b5e00610fc460b49ccef44df809331abb1cbb65432e283fb4484b1efffb577c4802ab44fecff7
 EBUILD giac-1.7.0.13-r1.ebuild 4257 BLAKE2B af1277a69e3a27cf215e870fe6dab127d4ac7edc0fd1e8905498e5b745bc92133d7f4f725fc096c4a83bd649fd5ba3731d16c86688f3bee1a9f8e4b7b1bd2aaf SHA512 351d891b219e15c24cae84e5ef1e1063a702c36d0fc6a6f9955f0eb3b1d16cb179e0fdbfd39bd6f820929fbe9d259a3ab91e71976cdb1a270cedbb66ec6fff83
-EBUILD giac-1.7.0.45.ebuild 4209 BLAKE2B a5229d4b3c5e1bf9c04b99e555c70ee57eef601d2ccca939a148435c4780be251c0e8e7dd5abf83127f5371e20efbd14e10ace4b3e0e47d9dec38d317f51d28b SHA512 be2c595f3ca7ffb7904d20029848a1654179f5a1da4662e51be848f151871c71c9e7e153f9d7e9e19bff037697e7d6c522f4eae6b8bc5fa34d8616e000672890
+EBUILD giac-1.7.0.47.ebuild 4247 BLAKE2B b28c9cfc47b8eed41a1add40aa2d66858cb1f065aa020b0c5a3d667ef57509f732dabeb27d6dea2a699c36b8cad483e4f939f8569bda37a7ca7e6f94bcf949bb SHA512 24b2907aaa1a68b5ca0afe5965d68b8004fa991abaf9dbd0cd1b01b138ce5ac810da244374edc85a0b794e4856b7959dc2bcc53e2551092f298b5d6e8bc277ac
 MISC metadata.xml 1315 BLAKE2B a461d359b33617422f5863466bdbec9ddf56db03467b992c887bce9967d434913489602fd684edc893303078f89cf94d01b44cfdc0ccff33db9b42c5e686cfa8 SHA512 eaeb480010c9dbdfd75516e45e97e3226d2b2812c44e217b318c5a1d86dc40820bac0de69686d7b502775b14a6f1ed3bc11d2372b891c46a37080b4e84da9a1c
diff --git a/sci-mathematics/giac/giac-1.7.0.45.ebuild b/sci-mathematics/giac/giac-1.7.0.47.ebuild
index 70e638c38502..bf7ed2bdb24c 100644
--- a/sci-mathematics/giac/giac-1.7.0.45.ebuild
+++ b/sci-mathematics/giac/giac-1.7.0.47.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools flag-o-matic xdg-utils
 
@@ -82,11 +82,12 @@ src_configure() {
 	# is hard-coded throughout the source code, so passing anything else to
 	# ./configure --docdir just causes problems. Later, we'll put things right.
 	#
-	# micropython is for specific use in an upstream project
+	# micropython is for specific use in an upstream project, so is quickjs.
 	econf \
 		--enable-gmpxx \
 		--disable-samplerate \
 		--disable-micropy \
+		--disable-quickjs \
 		--docdir="${EPREFIX}"/usr/share/giac/doc \
 		$(use_enable static-libs static) \
 		$(use_enable gui)  \
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index a3c626827c16..be44defa4cde 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -11,5 +11,5 @@ DIST p95v305b2.linux32.tar.gz 5695951 BLAKE2B d97f5b553e0a0563d51a08049c08fe3123
 DIST p95v305b2.linux64.tar.gz 7165963 BLAKE2B 3ae20e8e29273650e94ff8774f973240c6b57d7a54e1674e7f741a9d366d3fdad98bb91b8e2abfcf7e1df6319476aa116e921171f2b585a568ee7d5038635531 SHA512 5fe250f7dcc35767fd5f4529219351095d1076f631528d80fa09498e27fa211abc621ef070548c398402143bec5e1d6e6e974155f50eb9f42af0ca179e4e03a8
 EBUILD gimps-30.3.6.ebuild 1808 BLAKE2B 3483a73734d0b0008c992a946d36558f1e8ac93872a46bf80d79bb21ae65720c5614df1e1380fb15c2db2537559bc1969fc90dba0614afef1c2f8a6419ea996d SHA512 0dd32cf22373ec922a2716afc7f60ed5af2b0f76ba8f91b94eef891b1137b1dc597f0aca3609f76cb56b3f90b973953decd946d37e02cb6a1db1df1fd81c55a4
 EBUILD gimps-30.5.2.ebuild 1884 BLAKE2B ab8a5f9fec9a8cef6bdd4284364201fd29bb7a25070170f4de072e18be7749a7e0406a37f8a5321cbeb5709f1cfb2f1d4d655914d0032d9ee2ec67c59d720b62 SHA512 d2f7e56482733997dc72872e83e0b64a47d15ff1985b61bde6be2aec8c3543a97638d625125e4b30ec4a057e748f3fb422fc06c0c8d25c22a74a221bb675fcc9
-EBUILD gimps-30.7.9.ebuild 1930 BLAKE2B ce358754fafc0ff4b7b327424d9ea54d0b7e9ddbf9a3eb63d94d6e823a63850e1ef40284724d2de3b5fd079a51a851a0488212892f63231b2b08eb72c00461fa SHA512 c69e5bbba032b53e2a9c239ebf38021d9f12c7509fa0fb9378f5637b45ebe79f5b526dd8a694893742d87e9ad00049bf178616ea8652d63581923d961b0eaa72
+EBUILD gimps-30.7.9.ebuild 1928 BLAKE2B 8dabf8f54eb82e875380668b6ebe6f971db1cd3443d80ed9bd668204b5a19c91e997b68cfcc86ab6e9339bc24a696b6015a21bcdb83c7bea09893902596b31d5 SHA512 f22996f1a27b8941881a0fcbb2b09219f73967bf80708e6c9a55a1407ed57a180b26a53878989ec70ee05d604d29980616988e0ff1aab4323444d62b638f8e65
 MISC metadata.xml 560 BLAKE2B 01b265f54acd4ad1c9e1d23043d4ce2020fd41843a0efb09003046ea835989393df9935edcc3320eff43d552e47c2bb5afc688ddb96e9e6088c1e1c3a38fca64 SHA512 ba744b0b86d81acf54ed31c70e19be7ee315b6976b29cf0a40e79a7a227b8f68f4262ac2eecd696ddf051dd13de2019dae5df43706ca629bceca738e0e501175
diff --git a/sci-mathematics/gimps/gimps-30.7.9.ebuild b/sci-mathematics/gimps/gimps-30.7.9.ebuild
index 33b432fb3b2f..028722863590 100644
--- a/sci-mathematics/gimps/gimps-30.7.9.ebuild
+++ b/sci-mathematics/gimps/gimps-30.7.9.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 SLOT="0"
 LICENSE="GIMPS"
 RESTRICT="mirror bindist"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 # Since there are no statically linked binaries for this version of mprime,
 # and no static binaries for amd64 in general, we use the dynamically linked
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index f2f3a843c2ff..e2291573007b 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,6 +1,9 @@
 AUX ginac-1.5.1-pkgconfig.patch 340 BLAKE2B 4e45d5af711f0a6bb833bd805340527be8972b8587f47ffe34b9e473b2783f6cb98af2b2397b199bfca1c7522250c68249112ac67a750ec59f31e26628978bd0 SHA512 b88c7ef69686733a3e817d9d4961246eb64aebf753b51bf8f6ea5c6fdfef41e52b6a20656e074f0bcc42dfe7965a440642d9036628a139f2c87bbde5f59d76d1
+AUX ginac-1.8.2-pkgconfig.patch 340 BLAKE2B 1f405dea9cc0a68fec86a65765247e93959a4b7ab4b962855259dd4205d139deb11e52366760a3ade6200ef53938d56dc08e5eb132724dc840291d4be37d74f0 SHA512 6629df1b961d8697e6ec1080ba13caa81eaf7596f103862e35f80fa13ad552e0cfe6d53733dd2ea8b4ac83075cd60d9e3f93b5f01886933bcfe97e919b6caef9
 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
 EBUILD ginac-1.7.11.ebuild 1474 BLAKE2B 80960c7c7d3b8aa3196c3bb606abca7d174e02ab3e7048ce267ac74b37ad4dde177581274c081e81237f9fc366eb3c64a29239a3f13ca352dad5db1e87ade20a SHA512 2ace30976f57eb93dca8b6a4dbf851b9ac5bcdfdc09ad6dc0838358a55784e04168266e5281eab8d4096c699bc8c02b44f600a1c80d7d11be3d590c8b7d19f0c
 EBUILD ginac-1.8.0.ebuild 1476 BLAKE2B 704301ca488a748b37464da91ae3cf8a8d477f037dd9146f8acf8f7214ffefcf6a26d722c3a3f6bb749ab6b7a51c341e96bfa61dfc58b8621847f228b47b979b SHA512 4c6f9049db3ccc23838c7ad3d390fb238b3012595259ee3cf1b55aa68aadb769bc4d6ff15b7b9e6f2771b41f9ecc0e5c00a28534050a87639877871a7ce1b903
+EBUILD ginac-1.8.2.ebuild 1510 BLAKE2B af4995c494ecbf1c58e04dc30bd37fd7b4ff100aaf5333b7e175db34bc0490d57a9186910277892421a8c9897862e3ece3c882311ec4d346d77b20b20cde5609 SHA512 9bb693918483556504570f7b75b14d3801373c4ca37851fd30d6cb1471f9526807e6af190a115e9ae14af0724b77c65d563b70ec111456fe901fe2ea4c3f25cc
 MISC metadata.xml 686 BLAKE2B ff4b88d20512b55b99aba22f7f87da2dbde32d4348bce69ffc1ee4488e41c0ec8cb062fedd72794d12671111be8a9df4e8be3dacf3d3379de7c82d18df3a97e8 SHA512 bae9dd2c19bd5e5bc84a3640d9548066cf95053c599a57259633b4a6960b2ea4039ebab692086b94553cffc1478de100754bc82a7157fc78871b9084ee9391e8
diff --git a/sci-mathematics/ginac/files/ginac-1.8.2-pkgconfig.patch b/sci-mathematics/ginac/files/ginac-1.8.2-pkgconfig.patch
new file mode 100644
index 000000000000..6f81f1e22043
--- /dev/null
+++ b/sci-mathematics/ginac/files/ginac-1.8.2-pkgconfig.patch
@@ -0,0 +1,9 @@
+--- 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.2.2
+-Libs: -L${libdir} -lginac @GINACLIB_RPATH@
++Libs: -L${libdir} -lginac
+ Cflags: -I${includedir}
diff --git a/sci-mathematics/ginac/ginac-1.8.2.ebuild b/sci-mathematics/ginac/ginac-1.8.2.ebuild
new file mode 100644
index 000000000000..9d6757bca841
--- /dev/null
+++ b/sci-mathematics/ginac/ginac-1.8.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+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
+		dev-texlive/texlive-latexextra
+		virtual/texi2dvi
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.2-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/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index 85101b306008..26914dc74675 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1,9 +1,13 @@
 AUX gsl-shell-2.2.0-pkg-config.patch 873 BLAKE2B 8c4dd1c126938d478965ce896209d2d1ea44a3b7a88b13ea0b080e0aa49d74fa21ef8421c8c18b6ff050e09dee65a1f0ffdc1af82e3adb17636859d49970a696 SHA512 949adbea8ed65a1b6e40cea7f9074135e30fb8b7bd2207e2bbd94f51cb30aadcdbad2a780dff0d271ab97ecc30a01bed6f7fc02c9079ad4f65a1200176e99715
 AUX gsl-shell-2.3.0-gdt-cflags.patch 551 BLAKE2B da5a266ed248ce50ded647dbf5eba443d72977522d768bb912e27530f87e71056abe30ba4613c14cc414214fafbb9c821419530695a9418008d843a6540980c1 SHA512 00260e88352c2502aaf8a05243b9dbcf204c639c8fa14777ffd05d69e185409ccae80d86cd592b85fa2815e20ee97bfd711e02302b6bc0e5ee28265d8ddab7c6
+AUX gsl-shell-2.3.2-no-compile-in-install.patch 920 BLAKE2B e47e66c14d67cbbc8267ea690565d642f8e38177913730aee21e64f9bee9edb8700dfa8a673d2da7deaeb2d21fe72cdf4a5dfbe489ab57f9821b8da200ceb2a8 SHA512 7e9c46719d29202a0cf9fb48b025c8a108e73e4694a07511e711ab083e8db1a67469161261741666cdb9d78897d2bbaf73b63440128554b1298816366701befc
+AUX gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch 571 BLAKE2B efb254f4c6ab8ecea7adf4405cd7ddad22a7d7641eb108af11897987757bc313ab128127f1bf793dc7849758f5397888555bbbf6646e43990f059ad1bfacb896 SHA512 0247eafc4450951a914240bc5180cb5ac2620b24e5fbc70c67f297910eb6a35a040c15cb9d8bbdd794dffa77f90a791921ce7f150f86228b6e0d7d8b162b1821
 AUX gsl-shell-font.patch 643 BLAKE2B a3dd51932ed9c5b6d4457764cf5b7838ab5af704740419a1aba89ce58ca892ca51601521af182c292cc3823be3dca8573a7539f7668c87fb9ad7687b96390417 SHA512 feeb151ff96c02b523f284acbaf214480b92cac42af497f6210726ff2a3b837c6792733ad5c2ac4be58fea68c18c5d10bf7db711336e32c9998c1456bfa3cbff
 AUX gsl-shell-nogui.patch 809 BLAKE2B 47f242696886a87179c91efd17b783dd81a74fbfbcc35a96cc5a72da453bef71dad7b2710b5248a221e53af5e956eaa842b4e9edf0da7e0afba94ad656cf5fd9 SHA512 b43d8009fef20ef847e098d4279b415ab26643970157b4fd49be1e255e1e8f59862159c2cb6054726d988c2d8b3bd6935673a509c803f486388a333040cde409
 AUX gsl-shell-strip.patch 361 BLAKE2B 7152b2fde2ac264cc9a78eb9f5b3a440e84a907e666b27361ad4a94d9e380bc9d3873066da959af8f1e67b5e165c90fb74e33425e8a83e2501cc3b07a8464330 SHA512 ecb78c52f34d678ecec5ca5f6ee9c85cf954866347501aaf2fd31133357d8085bbbaf3d6118ae2cd20e8375927ae9c1958732bfab09bf308bde7fc3255fa35bf
 AUX gsl-shell-usr.patch 250 BLAKE2B 6678c7fdd9f656be498025fc3d00b4d757c29e6aa451a95d71b78d81db9426ecd4fcc83ccd36352283a5c62c8084dae56d53feb85c144b7b725b5604141b4bc5 SHA512 e10df17a16969ad700e7f16c8fcf694e9c5f2d346e6db7ad5d616122c5160d9ea3d894354aef4214e48233a17e101b20b51c939fdbcb29b25169a4c6c07bc0c3
 DIST gsl-shell-2.3.0-beta1.tar.gz 3380519 BLAKE2B 3f63c74d48f01d1cd181a275facd979d31a06089004ac0db3b060d77cdcf4fb195ad064a76c64a7a13a6641102864cb79845b8f15573bc1481365952835f1fd7 SHA512 627c0b6bb35bc1a33bab16d0bb2b193b5a005a1d97a96e6a9038fbe7144936427131197983a2ef347ed91c655a82a4d477430a610d9e36453a2669ef0baae231
+DIST gsl-shell-2.3.2.tar.gz 3400376 BLAKE2B 8218b4d3232048fe7575631c7acc66d313520ee4d41a1dd2c267f021c8271a427673a575cc00f8f55a4868b8ec5e9626c0cbaa6ea9fa76662a726e436a527cf3 SHA512 6379380ab15a7ec477d67d36305ce76c551d32e88d8611447eeb6deaf9877c362392bce45599a2b2988331064c22626260c41f8548624c23e2c4e3c59c87c291
 EBUILD gsl-shell-2.3.0_beta1-r1.ebuild 1582 BLAKE2B 2bb262fde5efa8729670639cc627cc6f7062f83d7705dd2dfa30e47af8b75dff252d8744c515d0e2b55dda4555a7d4d35393799fb311f53fc770c7bf0401bad2 SHA512 607243850f9a6071047ef192235b898816b25e42a48d97ac52335bc71e055c862d5419042d608359c71ed367c039e410cbd554af5a4b60b2913d95659a3dd6b3
+EBUILD gsl-shell-2.3.2.ebuild 1622 BLAKE2B 0c21d7db438eec818b6f0b5888feb702e0f9b1d588041ca4d8a31f0d3c628659a88085ac3137b39e00e572d2c743e5160f8f2d3160f9c862586a24eb0a366457 SHA512 91901288b855e06f537ddb45dc09dab1c5b56c410265f66329412f2eba987c782b3a080b67321071640f9fc8509b525f7c15cec3cfed747906053dd973a4a2f4
 MISC metadata.xml 850 BLAKE2B 3280ed5969c25784f14e90febf9ba123aeca053dbcb9545e75163ce2c796dc3f3e8bae24b4479e5c2005b5462195a1e3dc4de37d04a1facffd62d40c9de6b30b SHA512 ac591d09c7263a391987c96fb60b7a7147110d1087945fdf7375aa7d8af4d2c8c29bcb06746d855a5b510fb6937fba0ae8f4d3820470cbf45ae0fc145ed2ee7c
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-no-compile-in-install.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-no-compile-in-install.patch
new file mode 100644
index 000000000000..d8cdaa02a2c5
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-no-compile-in-install.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile b/Makefile
+index 39b4872..4c04865 100644
+--- a/Makefile
++++ b/Makefile
+@@ -154,8 +154,8 @@ mkdir -p $1$(PREFIX)/bin
+ mkdir -p $1$(PREFIX)/share/applications
+ mkdir -p $1$(PREFIX)/share/icons/hicolor/128x128/apps
+ mkdir -p $1$(PREFIX)/share/$(PACKAGE_NAME)/$(PACKAGE_VERSION)
+-cp $(GSL_SHELL_GUI) $(GSL_SHELL) $1$(PREFIX)/bin
+-strip $1$(PREFIX)/bin/$(GSL_SHELL) $1$(PREFIX)/bin/$(GSL_SHELL_GUI)
++test -f $(GSL_SHELL_GUI) && cp $(GSL_SHELL_GUI) $1$(PREFIX)/bin  || :
++test -f $(GSL_SHELL) && cp $(GSL_SHELL) $1$(PREFIX)/bin  || :
+ test -f $(LUAJIT_SO) && \
+   mkdir -p $1$(PREFIX)/lib && \
+   cp $(LUAJIT_SO) $1$(PREFIX)/lib && \
+@@ -168,7 +168,7 @@ $(CP_REL) $(LUA_BASE_FILES) $1$(PREFIX)/share/$(PACKAGE_NAME)/$(PACKAGE_VERSION)
+ $(CP_REL) $(EXAMPLES_FILES) $1$(PREFIX)/bin
+ endef
+ 
+-install: $(GSL_SHELL) $(GSL_SHELL_GUI)
++install:
+ 	$(call install-to-dir,$(DESTDIR))
+ 
+ debian: $(DEBIAN_PACKAGE)
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch
new file mode 100644
index 000000000000..29ddaf2fd710
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/user-manual/conf.py b/doc/user-manual/conf.py
+index 899f5d6..9475d85 100644
+--- a/doc/user-manual/conf.py
++++ b/doc/user-manual/conf.py
+@@ -25,7 +25,7 @@ import sys, os
+ 
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.pngmath']
++extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.imgmath']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.3.2.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.3.2.ebuild
new file mode 100644
index 000000000000..14ec634d1a7c
--- /dev/null
+++ b/sci-mathematics/gsl-shell/gsl-shell-2.3.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/user-manual"
+DOCS_AUTODOC=0
+inherit toolchain-funcs 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"
+IUSE="fox"
+
+RDEPEND="
+	>=sci-libs/gsl-1.14:=
+	virtual/blas
+	>=x11-libs/agg-2.5
+	>=media-libs/freetype-2.4.10
+	sys-libs/readline:0=
+	|| ( media-fonts/ubuntu-font-family media-fonts/freefont media-fonts/dejavu )
+	fox? ( x11-libs/fox:1.6 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/luajit
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-compile-in-install.patch"
+	"${FILESDIR}/${P}-sphinx-extmath-to-imgmath.patch"
+)
+
+src_prepare() {
+	tc-export PKG_CONFIG
+	default
+}
+
+src_compile() {
+	local BLAS=$($(tc-getPKG_CONFIG) --libs blas)
+	local GSL=$($(tc-getPKG_CONFIG) --libs gsl)
+	emake -j1 gsl-shell CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" \
+		GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}"
+	if use fox; then
+		local FOX_INCLUDES="$(WANT_FOX=1.6 fox-config --cflags)"
+		local FOX_LIBS="$(WANT_FOX=1.6 fox-config --libs)"
+		emake -j1 gsl-shell-gui CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+			CFLAGS="${CFLAGS}" FOX_INCLUDES="${FOX_INCLUDES}" FOX_LIBS="${FOX_LIBS}"  \
+			GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}"
+	fi
+	docs_compile
+}
diff --git a/sci-mathematics/lcalc/Manifest b/sci-mathematics/lcalc/Manifest
index d0e09fef0731..1eb4c5ec373f 100644
--- a/sci-mathematics/lcalc/Manifest
+++ b/sci-mathematics/lcalc/Manifest
@@ -1,3 +1,3 @@
 DIST lcalc-2.0.5.tar.xz 830360 BLAKE2B 4a282de8548bc0b3d95fe079362ea98dd1397a1f0f7c4c61c6d2df8c5f95b9638aa628a25b138e6037520c69e56bfab635872115139caf3270d473e01276b980 SHA512 d3b7fa25dd3c2a8f88671076dfb5ab5e933be7feff24bbd160c92a476953f5553f9fb58f72c36b9c668929385084918fc3396e1a0bcc55de12ea8cb647c53929
-EBUILD lcalc-2.0.5.ebuild 924 BLAKE2B 0334372571316c0f12943119d55f90f944712f369563db99942fd2dea5b5a3372d100507c305a3d53460ecb27e3082f7664aba05b8592a88df30d326d4ff13fa SHA512 6d364b8467ea4acf84e59cfec7c47e6094419a05f33812dc574fb4955aa55bc65e1d9f8e7e7503f0b93f0e4b5c9c02cca82b9beb0411f9d97dfd981513db6fbc
+EBUILD lcalc-2.0.5-r1.ebuild 925 BLAKE2B 98e8909c3bf87fe2446ced959d9a9f57d7ada72e81d40393d4b0e0488a5cf0ef6cbc0ae215ca61c0b5293bb309257cb7af682fe2013b99b17fa732bec5e6ae0e SHA512 10df01062ba4b5e27be0e69603350bc7361ca17f9a2468f3da8a550b81f8637afec065d2a9e42dc147afb562053c8b0c1eab57e269b6c88ebf928b8b9f5f7821
 MISC metadata.xml 1165 BLAKE2B 77544a05687fad32c18cb8d840d8de4291cae4135976bd741bbfd57a015956d5104026b99b1aec934d6a260501d89cd947e052a2ac85e35d2c93f7fc08224ac1 SHA512 cce822c8b50d97a7f8405634f565c3fbe147732db57bd66cccbaad2c2eda23076b76d0dfa442d462d55625a5dff06dde9bdf5e6ab4a9c9417d2f69972cc87add
diff --git a/sci-mathematics/lcalc/lcalc-2.0.5.ebuild b/sci-mathematics/lcalc/lcalc-2.0.5-r1.ebuild
index 31542c170399..7e0b02e50370 100644
--- a/sci-mathematics/lcalc/lcalc-2.0.5.ebuild
+++ b/sci-mathematics/lcalc/lcalc-2.0.5-r1.ebuild
@@ -23,7 +23,7 @@ BDEPEND="dev-util/gengetopt"
 DEPEND="double-double? ( sci-libs/qd:= )
 	quad-double? ( sci-libs/qd:= )
 	pari? ( sci-mathematics/pari:= )"
-REPEND="${DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf $(use_with pari) \
diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest
index c22074c5a4c7..18b25a5655e3 100644
--- a/sci-mathematics/lean/Manifest
+++ b/sci-mathematics/lean/Manifest
@@ -1,9 +1,11 @@
 AUX lean-CMakeLists-fix_flags.patch 1285 BLAKE2B 0507e553c1acf2a53c5267932127117d5ae5ba9015a08c88748b3d82c041f8d904d15cd033dd7934ac55c474fa75a5d4a46f680cc887fee37c05c3f5f3832839 SHA512 11a5918847e45aac7bf79e48d8f881ef5cd3e6b09dbb0979f3f0b88fd36458be21ebeb530158da801399a0cdc8fe382444ff338cd793cd9f1bfced90c5d5a71b
-DIST lean-3.35.1.tar.gz 1872461 BLAKE2B 44635b05a7e8ea89522dfb44b8f097ec530419ab79a5413648292ca34019ca744ae3e327cf3a7c627cb7a7a682cfcb2ffc5e6802f2c5ad67e0a7abc303624a3c SHA512 24238cd9e920042f5bf7ba0a121da860e7e9c804d169c888bfabbc5e79e55f556a8920fab0c1a7e72b13501798c5f3fcb068f1705a0cf230f2b89abe1b3045ab
-DIST lean-3.37.0.tar.gz 1875569 BLAKE2B 26d2513da35f0fa7efa6a9bb7706884b95666079e1c0d4349f2745a5908417c0b3d01027901425bf6bc4affdb314a79235c52bac9395bd9e54d53930e6b0dbe0 SHA512 c28139cfff7b40785ab51a9591964adc473f28d7a9877d891a132737c165ce6649924e6c75905442632452b9447c095aae830df347492bae058215d3392a7c09
-DIST lean-3.38.0.tar.gz 1877265 BLAKE2B 30d4364ee9d788ed128b63c42b5f7d55b91721ca74a6bc847e33f0d7be800cd2d3d90b4964e398f9116375afe6447a3f10f25ab716445aa9b7a5458d534bbf09 SHA512 441889f561a1fd369d2a4bc305e936834bb6c11ef85cfb4b69a5649226b405340fa787eb2ff73e44d2da6bb25a7819af70cf465abdf323777601c9f619c58508
-EBUILD lean-3.35.1-r2.ebuild 1773 BLAKE2B 15392079ec1e4d9eec5dfd9ee13fee05eca98fb2d7fe204a05b793b06588848c339dbb3b01c8c84f30fc45acc2ce8bb74be5841b9aa216a3d5f2d42d3158b7a6 SHA512 89f983bdb770e0fdbbcbd4db2a1bc8de25df33050ed936748788695e4926588471e8963289ef5bd397748abc41aae656f5614f3317b05b70f54dcd43189464d1
-EBUILD lean-3.37.0.ebuild 1773 BLAKE2B 6a332c70ff4fe6731391d180909c732976385466dc28add08014be98e84dd0c7a36a56349516099f6b16966bf70e03d3bf1b19633d9e54c054d2adbb4b9d12e8 SHA512 7601871b46ee585037c8c7600ebf3f4166004314cae3062b3a70838920f0199f5ba4570daa8f1b051a1aa7390e9a9986a0e553088e0a39b1ac45e884bc1ed18a
-EBUILD lean-3.38.0.ebuild 1773 BLAKE2B 6a332c70ff4fe6731391d180909c732976385466dc28add08014be98e84dd0c7a36a56349516099f6b16966bf70e03d3bf1b19633d9e54c054d2adbb4b9d12e8 SHA512 7601871b46ee585037c8c7600ebf3f4166004314cae3062b3a70838920f0199f5ba4570daa8f1b051a1aa7390e9a9986a0e553088e0a39b1ac45e884bc1ed18a
-EBUILD lean-3.9999.ebuild 1773 BLAKE2B 15392079ec1e4d9eec5dfd9ee13fee05eca98fb2d7fe204a05b793b06588848c339dbb3b01c8c84f30fc45acc2ce8bb74be5841b9aa216a3d5f2d42d3158b7a6 SHA512 89f983bdb770e0fdbbcbd4db2a1bc8de25df33050ed936748788695e4926588471e8963289ef5bd397748abc41aae656f5614f3317b05b70f54dcd43189464d1
-MISC metadata.xml 673 BLAKE2B a0450429934f5c161e73df65461ef4142663b704766424aa13abd06a83bf27744a1505d06b615bde4fa0b4fe65500d7d4ac904753a107bf830722af92a3ab1ef SHA512 bad144f7071ec66f4eb0b167c83c3a32614d6d57a03cab3d981a42d174a853a118f3f9a938c41de21db9933b0bdf2290f52c33795be9df12c195572ab1b4d8b9
+DIST lean-3.39.1.tar.gz 1878481 BLAKE2B b3d1760594751418d6ebb7754d733e8fdebc5e0eba25e8d4993280325ec9d40e9083af155d388d52b5edfff2e9dffbeff91caa68ccb76500dcd88ebac2af4444 SHA512 5839eb7b5f7cd2d93ab603f1a5121e0a6b55850686677f103c16ec2157dc19479f1909ea056b54e41331c28fd59a4a825741384fa431473924381b72640a04dd
+DIST lean-3.40.0.tar.gz 1878547 BLAKE2B 762c12b9fee9ac405730fb4a748326e7c9603c50f44512166f94df51e8cde0096803f11d0201980e1a1c0121a2b278075bf238452254d83e2d8b7b5566355416 SHA512 4daa32b60195a9776019c3c13c3765a1f5a817d78f189c3f92859298118815af4cb47359816ebbb977f35453be358956f3680b06b5930d5cf3a4245599602873
+DIST lean-3.41.0.tar.gz 1905966 BLAKE2B 1921ba4a975ed8fc6001695151bb366341e0895989a570bb7fbef1e719685945d0b7c51ed0716ff29daaf81af24ce2e289cab41b251c686a286cd94a0cf708f8 SHA512 855a56812ba5dc7cf431490957570d0fcbc4760faa1602095e708ddcc4e5a3c6aeac42133c210375d4538d97c8ae90df3ab3c7e7840e8896b8d0db439e925fbf
+DIST lean-3.42.0.tar.gz 1908134 BLAKE2B 7b6403786cc1a3a2b974f8df4c2bf2921e4e374ead4290a0e263c8464a9c009fd2f62e7cf5bdbc5087d0c9bb4c57f798b9d1a4b8ee2d66152714ec2af649e196 SHA512 2f1fc1bf3aff7fa806e1cd4647380d6896d98a9191f2035d5a37cc35938de42b243188984aa2fced37bdbee3b2c3c6ef25d27bf2428bf9a0307cc3237c80560f
+EBUILD lean-3.39.1.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+EBUILD lean-3.40.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+EBUILD lean-3.41.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+EBUILD lean-3.42.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+EBUILD lean-3.9999.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+MISC metadata.xml 606 BLAKE2B 6478d84a762a59082fdea0a11a95b27c093782228c48dba58dc490ea9ac2cecef54cc3101dc98e385f3a29f85d84af21b7d2ae1a9f089ee0313158ecb44eb0e7 SHA512 02d2ac07b155c7a04c857d397d476a39864d02b10dd81c5830db5e21eb86c6dcff26da552a04717f5f587b326ddf8e2e8d27f1a138f88b391f0199d8004d8cb7
diff --git a/sci-mathematics/lean/lean-3.38.0.ebuild b/sci-mathematics/lean/lean-3.39.1.ebuild
index e47a48054580..5d8ee8eecd4b 100644
--- a/sci-mathematics/lean/lean-3.38.0.ebuild
+++ b/sci-mathematics/lean/lean-3.39.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MAJOR=$(ver_cut 1)
 CMAKE_IN_SOURCE_BUILD="ON"
 
-inherit cmake optfeature readme.gentoo-r1
+inherit cmake readme.gentoo-r1
 
 DESCRIPTION="The Lean Theorem Prover"
 HOMEPAGE="https://leanprover-community.github.io/"
@@ -22,7 +22,7 @@ S="${WORKDIR}/lean-${PV}/src"
 
 LICENSE="Apache-2.0"
 SLOT="0/${MAJOR}"
-IUSE="debug +json +threads"
+IUSE="debug +threads"
 
 RDEPEND="dev-libs/gmp:="
 DEPEND="${RDEPEND}"
@@ -40,7 +40,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
-		-DJSON=$(usex json)
+		-DJSON=ON  # bug 833900
 		-DLEAN_EXTRA_CXX_FLAGS="${CXXFLAGS}"
 		-DMULTI_THREAD=$(usex threads)
 		-DUSE_GITHASH=OFF
diff --git a/sci-mathematics/lean/lean-3.37.0.ebuild b/sci-mathematics/lean/lean-3.40.0.ebuild
index e47a48054580..5d8ee8eecd4b 100644
--- a/sci-mathematics/lean/lean-3.37.0.ebuild
+++ b/sci-mathematics/lean/lean-3.40.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MAJOR=$(ver_cut 1)
 CMAKE_IN_SOURCE_BUILD="ON"
 
-inherit cmake optfeature readme.gentoo-r1
+inherit cmake readme.gentoo-r1
 
 DESCRIPTION="The Lean Theorem Prover"
 HOMEPAGE="https://leanprover-community.github.io/"
@@ -22,7 +22,7 @@ S="${WORKDIR}/lean-${PV}/src"
 
 LICENSE="Apache-2.0"
 SLOT="0/${MAJOR}"
-IUSE="debug +json +threads"
+IUSE="debug +threads"
 
 RDEPEND="dev-libs/gmp:="
 DEPEND="${RDEPEND}"
@@ -40,7 +40,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
-		-DJSON=$(usex json)
+		-DJSON=ON  # bug 833900
 		-DLEAN_EXTRA_CXX_FLAGS="${CXXFLAGS}"
 		-DMULTI_THREAD=$(usex threads)
 		-DUSE_GITHASH=OFF
diff --git a/sci-mathematics/lean/lean-3.35.1-r2.ebuild b/sci-mathematics/lean/lean-3.41.0.ebuild
index a15591b790f5..5d8ee8eecd4b 100644
--- a/sci-mathematics/lean/lean-3.35.1-r2.ebuild
+++ b/sci-mathematics/lean/lean-3.41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 MAJOR=$(ver_cut 1)
 CMAKE_IN_SOURCE_BUILD="ON"
 
-inherit cmake optfeature readme.gentoo-r1
+inherit cmake readme.gentoo-r1
 
 DESCRIPTION="The Lean Theorem Prover"
 HOMEPAGE="https://leanprover-community.github.io/"
@@ -22,7 +22,7 @@ S="${WORKDIR}/lean-${PV}/src"
 
 LICENSE="Apache-2.0"
 SLOT="0/${MAJOR}"
-IUSE="debug +json +threads"
+IUSE="debug +threads"
 
 RDEPEND="dev-libs/gmp:="
 DEPEND="${RDEPEND}"
@@ -40,7 +40,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
-		-DJSON=$(usex json)
+		-DJSON=ON  # bug 833900
 		-DLEAN_EXTRA_CXX_FLAGS="${CXXFLAGS}"
 		-DMULTI_THREAD=$(usex threads)
 		-DUSE_GITHASH=OFF
diff --git a/sci-mathematics/lean/lean-3.42.0.ebuild b/sci-mathematics/lean/lean-3.42.0.ebuild
new file mode 100644
index 000000000000..5d8ee8eecd4b
--- /dev/null
+++ b/sci-mathematics/lean/lean-3.42.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MAJOR=$(ver_cut 1)
+CMAKE_IN_SOURCE_BUILD="ON"
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="The Lean Theorem Prover"
+HOMEPAGE="https://leanprover-community.github.io/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	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"
+fi
+S="${WORKDIR}/lean-${PV}/src"
+
+LICENSE="Apache-2.0"
+SLOT="0/${MAJOR}"
+IUSE="debug +threads"
+
+RDEPEND="dev-libs/gmp:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-CMakeLists-fix_flags.patch" )
+
+src_configure() {
+	local CMAKE_BUILD_TYPE
+	if use debug; then
+		CMAKE_BUILD_TYPE="Debug"
+	else
+		CMAKE_BUILD_TYPE="Release"
+	fi
+
+	local mycmakeargs=(
+		-DALPHA=ON
+		-DAUTO_THREAD_FINALIZATION=ON
+		-DJSON=ON  # bug 833900
+		-DLEAN_EXTRA_CXX_FLAGS="${CXXFLAGS}"
+		-DMULTI_THREAD=$(usex threads)
+		-DUSE_GITHASH=OFF
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Disable problematic "style_check" cpplint test,
+		# this also removes the python test dependency
+		--exclude-regex style_check
+	)
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS="You probably want to use lean with mathlib, you can either:
+	- Do not install mathlib globally and use local versions
+	- Use leanproject from sci-mathematics/mathlib-tools
+		$ leanproject global-install
+	- Use leanpkg and compile mathlib (which will take some time)
+		$ leanpkg install https://github.com/leanprover-community/mathlib"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sci-mathematics/lean/lean-3.9999.ebuild b/sci-mathematics/lean/lean-3.9999.ebuild
index a15591b790f5..5d8ee8eecd4b 100644
--- a/sci-mathematics/lean/lean-3.9999.ebuild
+++ b/sci-mathematics/lean/lean-3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 MAJOR=$(ver_cut 1)
 CMAKE_IN_SOURCE_BUILD="ON"
 
-inherit cmake optfeature readme.gentoo-r1
+inherit cmake readme.gentoo-r1
 
 DESCRIPTION="The Lean Theorem Prover"
 HOMEPAGE="https://leanprover-community.github.io/"
@@ -22,7 +22,7 @@ S="${WORKDIR}/lean-${PV}/src"
 
 LICENSE="Apache-2.0"
 SLOT="0/${MAJOR}"
-IUSE="debug +json +threads"
+IUSE="debug +threads"
 
 RDEPEND="dev-libs/gmp:="
 DEPEND="${RDEPEND}"
@@ -40,7 +40,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
-		-DJSON=$(usex json)
+		-DJSON=ON  # bug 833900
 		-DLEAN_EXTRA_CXX_FLAGS="${CXXFLAGS}"
 		-DMULTI_THREAD=$(usex threads)
 		-DUSE_GITHASH=OFF
diff --git a/sci-mathematics/lean/metadata.xml b/sci-mathematics/lean/metadata.xml
index f06c80c2d7be..ddb0be8a571c 100644
--- a/sci-mathematics/lean/metadata.xml
+++ b/sci-mathematics/lean/metadata.xml
@@ -14,7 +14,4 @@
     <bugs-to>https://github.com/leanprover-community/lean/issues</bugs-to>
     <remote-id type="github">leanprover-community/lean</remote-id>
   </upstream>
-  <use>
-    <flag name="json"> Enable JSON support</flag>
-  </use>
 </pkgmetadata>
diff --git a/sci-mathematics/lrcalc/Manifest b/sci-mathematics/lrcalc/Manifest
index a3e7fe761d1c..80971f7a33e7 100644
--- a/sci-mathematics/lrcalc/Manifest
+++ b/sci-mathematics/lrcalc/Manifest
@@ -2,5 +2,5 @@ AUX lrcalc-1.2-includes.patch 1939 BLAKE2B 37dc25d9219899cf9cd6268038715b927af29
 DIST lrcalc-1.2.tar.gz 363120 BLAKE2B d3f652abfe38e81331dcbac7068d087b198445bf02dc5ccb5bcbd76b9bbc329687209e6ccf40ecd09f166e7d2da054edd0e5c2b18503d8e4d961ae4ad91b5152 SHA512 699f4c2ddabe5879542d5c11f3df3979a4e009ad37741711a70fb48b4a0d4a7969e5bb110adb63d4473f3c2b61d1efdb7228a6b74c5dd7e1b5aea8cf1d170fab
 DIST lrcalc-2.1.tar.gz 425484 BLAKE2B 3c9d33942f44f8f6cf29e1da36ad5072b49ea3dd949f8c3e96a2fd55deec566828736ccc1da0ef32e528b8f4967bedbd46ca84f144e022a6916451c02befccc3 SHA512 76db29af51fb97e582d37b92a426cacf85fd61b8e7c2a70dc99dec23b396d62d996f0c66b5bbbd8b6928b46fa1186c9bb3c28aa91646cdccd38bd9b783af44d7
 EBUILD lrcalc-1.2.ebuild 592 BLAKE2B faf95fcf9ad635380d47df7f691346cf7507fa858b4ed608071b9e50007bf271905e2fd7bbbf8dc73e203f0bcb8f0474ad8836268e7fb3f8bd80d7cbb02669dc SHA512 256609e7771b5fa1125d464de13631b6b0244ad1f6a55614f9a436dfe35dfd8344160202db02b4ebb99b299ad4773d8b7c5147097f981cf6728b431cd7d721e8
-EBUILD lrcalc-2.1.ebuild 542 BLAKE2B 6d0391e8749c80a7de030593ebc68241114b03258f3175ffcae437167b8ba009c7141d69595b73b1126ef94a8b9acc3a6589b9f582d98496ed971b6fe7837915 SHA512 a079da9b2c0ac7d184cb34f7370a32dd5bdc62e1ca6a9f20c955baf0d6a1b21185bf2afa9c5d1e2ff40f03fd8dd513f8f00923a25394c0b23c668f6982139c7a
+EBUILD lrcalc-2.1.ebuild 540 BLAKE2B ef0db280a52c2e4888286691bdc99d1d7fda09e5405e3fe9af1cd4cbf0ecbf7b5586662701b56501f6baa64681574036dce65064824d0fe98060574e082b1257 SHA512 5979723e4d8ba6359356e6c94a5d314cdb323cbef684fc59657ab54d9c909261abe35b4cb1f721070ee92081db8340c3c1a95477085148751d3d8a1443522ec5
 MISC metadata.xml 865 BLAKE2B 59342f149f6ceb01b00073fa2714c268337bffe50d01b81ea8cf10b865d8c51112714932c92ed18373efc18d81ebf4d75446a0ec26b8cf5c6188eeffcdd79aab SHA512 3198cfa61428c86100f0e646f21460600afef73f83343799a903d6d43d1084eae08b135d74c302daf6d37eabb686d2413016c11b0b7c1e15a3907dd2b58f5146
diff --git a/sci-mathematics/lrcalc/lrcalc-2.1.ebuild b/sci-mathematics/lrcalc/lrcalc-2.1.ebuild
index 194251793e74..bbafc77ebb66 100644
--- a/sci-mathematics/lrcalc/lrcalc-2.1.ebuild
+++ b/sci-mathematics/lrcalc/lrcalc-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://sites.math.rutgers.edu/~asbuch/lrcalc/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/mathlib-tools/Manifest b/sci-mathematics/mathlib-tools/Manifest
index ae38fe3ae8d7..49b13fc3a289 100644
--- a/sci-mathematics/mathlib-tools/Manifest
+++ b/sci-mathematics/mathlib-tools/Manifest
@@ -1,3 +1,5 @@
 DIST mathlib-tools-1.1.0.tar.gz 32374 BLAKE2B f470927cae1dc66478efd44de6a5fd7c8df9656351ee342d14a1e75e8774383616cedf01b21ef1b92220fb03b1f1ccb326e3363dd0fec4fb5876f43c5ddb4010 SHA512 bc59d2e41c42ecc22c5768ac3adb209f0b170e2e97fe68483d8518b78a6b4fa163c1d46e4e3996c6f3e0aaa329c642fd111b3e16d850f40b6edc81c81215d03f
-EBUILD mathlib-tools-1.1.0.ebuild 1244 BLAKE2B 41ecfb20940515bc5aa8815b85be3f80f3660875fd6b5def8308d10a7859eec07735ca3438129d1787b114e6b308596481dd7621fdbea9072ed64f5b0e266280 SHA512 9223836891bd6d4fb94778e5e449c96c536799cbcdb8889aa3c803e569d1bcd6c528b72f5d3bf7d18413b20d4e1bd7c22cc6077b4a302f041c531c1a1a847702
-MISC metadata.xml 739 BLAKE2B 9761a9dfaccb53c0efffe372f23ab8ab06c72de96e511d4aa4cc0b4adba6635ab115253459d0339e38e4098dbfa76227676dbb2ad3e1d57572bd84d1a70bb108 SHA512 cc21a9daf83f052f665f6a2fe2d3074e1ddbbb560fdcc84a8bf0664c5bedea1ea7d2d435c9902e941c7aece0410edf7d319e482cc18919ec2703ea6330d3555b
+DIST mathlib-tools-1.1.1.tar.gz 32456 BLAKE2B 2cb81a6072aecc8a9c298c8bd0ac2edc7f44fecd290add5254a0c35b5e16fca4cfef32727acff883366d99101f7e62ad12709e59b317e34547fa49c404600366 SHA512 17e6105d48071ab41aaa436d3fd35774227b242e6026b30ac82fd0b4f7ea8310a9bc0abe6abe5eca3e77ec62d6a48e7584222381dc7071803215cc3189ce973b
+EBUILD mathlib-tools-1.1.0-r1.ebuild 1245 BLAKE2B 543109635a01058d7b49271efcc17288d9502d77cafd2e3bda97f23b710fdd3adce018988e757ff63168df5fe6b11a062f7ffbb12ed6fec29f7f295b5b589717 SHA512 9cf8558b5c565dcc93c535ce91047eeafcb6a4ff24a1fda339721c7bb3afcf57b33a57dc27906afec12bab3af553d4fe73572c150e54d4f0b5332cd71a3a1c5f
+EBUILD mathlib-tools-1.1.1.ebuild 1245 BLAKE2B 543109635a01058d7b49271efcc17288d9502d77cafd2e3bda97f23b710fdd3adce018988e757ff63168df5fe6b11a062f7ffbb12ed6fec29f7f295b5b589717 SHA512 9cf8558b5c565dcc93c535ce91047eeafcb6a4ff24a1fda339721c7bb3afcf57b33a57dc27906afec12bab3af553d4fe73572c150e54d4f0b5332cd71a3a1c5f
+MISC metadata.xml 845 BLAKE2B 8d01442128f49f1c8c0c29cf4469d775936149cdde77d7e96a6825bc631119a4e83932bc67f9e60781128f0c179ef7e622edcc9836d7fb3f4240b356e92caf8b SHA512 8add0a2a70e219d5581ef7fdcd0125ab1375c65d631093df02559e462974b07cef0bf1fe75919707be026b91e77131b24d3b197a5c332961c6a573ddf899c939
diff --git a/sci-mathematics/mathlib-tools/mathlib-tools-1.1.0.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.1.0-r1.ebuild
index 76f08c06d208..9ecb36eac185 100644
--- a/sci-mathematics/mathlib-tools/mathlib-tools-1.1.0.ebuild
+++ b/sci-mathematics/mathlib-tools/mathlib-tools-1.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/sci-mathematics/mathlib-tools/mathlib-tools-1.1.1.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.1.1.ebuild
new file mode 100644
index 000000000000..9ecb36eac185
--- /dev/null
+++ b/sci-mathematics/mathlib-tools/mathlib-tools-1.1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Development tools for Lean's mathlib"
+HOMEPAGE="https://github.com/leanprover-community/mathlib-tools"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/leanprover-community/${PN}.git"
+else
+	SRC_URI="https://github.com/leanprover-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	>=dev-python/GitPython-2.1.11[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.10.0[${PYTHON_USEDEP}]
+	dev-python/PyGithub[${PYTHON_USEDEP}]
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pydot[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	sci-mathematics/lean:0/3
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Remove problematic tests (mainly issues with network)
+	rm ./tests/test_functional.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/sci-mathematics/mathlib-tools/metadata.xml b/sci-mathematics/mathlib-tools/metadata.xml
index d2b17cbe5953..c2598dacd8a7 100644
--- a/sci-mathematics/mathlib-tools/metadata.xml
+++ b/sci-mathematics/mathlib-tools/metadata.xml
@@ -13,6 +13,7 @@
     - https://leanprover-community.github.io/leanproject.html
   </longdescription>
   <upstream>
+    <changelog>https://github.com/leanprover-community/mathlib-tools/blob/master/CHANGELOG.md</changelog>
     <bugs-to>https://github.com/leanprover-community/mathlib-tools/issues</bugs-to>
     <remote-id type="github">leanprover-community/mathlib-tools</remote-id>
   </upstream>
diff --git a/sci-mathematics/metamath-databases/Manifest b/sci-mathematics/metamath-databases/Manifest
new file mode 100644
index 000000000000..c43e2ca2ac6b
--- /dev/null
+++ b/sci-mathematics/metamath-databases/Manifest
@@ -0,0 +1,3 @@
+DIST metamath-databases-20220303.tar.gz 20538855 BLAKE2B 8aa3c505a16d1fac08de5d447eb55e4bc64f5fa53905c1147a17b6e65c87403f2baea9d30699da71f16cc34373f2d9c56c02f3b85327aa9db42af7c5c63db8df SHA512 5f2ca7e299ec3e8dda7739de057c69dcbdd4e23d5853826ac9d6ccabcaa0abf292990eb1925762ff2a5611b32628ed508b6fa4949121e090feaa0c986f3f67ac
+EBUILD metamath-databases-20220303.ebuild 853 BLAKE2B 522b476a701ab12125346e94246f25dc99fc5e22e10b9b33753def65e99af65d34b5112ca40d7d5078fc9550f83f6c6b5a597abe37a208d1e6af6d67b767a539 SHA512 d1eb8440eceb7b099ee40ac4cd8e414714088ddcc65b4a94f75535f6242e34dbab803947a7606b826d3bfb9d04ebd0a36ed8e8dccccd31c84c89783b34582e75
+MISC metadata.xml 633 BLAKE2B ab8c86cc84be54a40ef6210855d1d77abd58f4fc9a8433fb8005a1916ec720201feca35fcd7f9587b720612df8f0d278445661e93632a80194038fd32d85c128 SHA512 b7bdc15f1089359deaf7f323ba21330680977b7a314c796d632fec744bcef5981746a55a5e8663dd7a6b09ba726b4291e1f80b10c03a2a60538ea1b04d229e1b
diff --git a/sci-mathematics/metamath-databases/metadata.xml b/sci-mathematics/metamath-databases/metadata.xml
new file mode 100644
index 000000000000..aeb2ac517a10
--- /dev/null
+++ b/sci-mathematics/metamath-databases/metadata.xml
@@ -0,0 +1,18 @@
+<?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>
+    This is a collection of rigorously verified Metamath databases that
+    specify mathematical axioms and formal proofs of theorems derived from
+    those axioms.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/metamath/set.mm/issues/</bugs-to>
+    <remote-id type="github">metamath/set.mm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild b/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild
new file mode 100644
index 000000000000..32304b03acd4
--- /dev/null
+++ b/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=99d707bc3c600a9d6052a46a7c85f05b74c589a2
+
+DESCRIPTION="Sample databases for Metamath"
+HOMEPAGE="http://us.metamath.org/mpeuni/mmset.html"
+
+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"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/set.mm-${H}
+fi
+
+LICENSE="CC0-1.0"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="sci-mathematics/metamath"
+
+DOCS=(
+	CONTRIBUTING.md README.md
+	discouraged iset-discouraged
+	mmnotes.txt
+	other-databases.md verifiers.md
+)
+
+src_install() {
+	insinto /usr/share/metamath
+	doins *.mm *.mmts
+
+	einstalldocs
+
+	if use doc ; then
+		docinto html
+		dodoc -r people
+		dodoc *.html *.svg
+	fi
+}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index b3cb166c15e3..e914e45678a0 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -2,8 +2,9 @@ AUX octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch 199 BLAKE2
 AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c52f54e105f209edf79c869e6ce253a9cec7a3373a8dd0c98196ba3271f9b2b066ad3de3784151072055f2319ebbb4d1b68a475 SHA512 d2d6fe57a11f0493f86378bc4e1fc71378ae6d1878d17a367b77aa16a29880e37134e61343ba081f7ab2c4d127d93611491bef1320d6cd202eff0d78681cd4cc
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
+AUX octave-6.4.0-slibtool.patch 1416 BLAKE2B e4b487481490b41a4da499bb5eceff0f6a25a7e25d4f6c76088c3703259ab4899a354b0cf67eecb989bf4c4c05836be09881cce72145b3badca1393bd386a85f SHA512 cac0d183b3c555a25db37df250b2517ae4b762b7bc0d65ba0cb1093133f6f7ada42f6745b060d17f59c2177976841dafabcda61cf03d9cd14028399472f28ed7
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
-EBUILD octave-6.4.0.ebuild 5510 BLAKE2B b957e17fc89dbebc34b5ee7458d9583547fd3a7254a298e7e0ef0c7de2600f5984245783b31a557c3568422fa64d1e89b5e779c0c1dffef88b9b475cd8f8fb56 SHA512 57b761608a70315e79c910e66e287eb6316e153ff29780013938d90e03b3ef779f04aa259047ceecc03addea970b45a9c3d3e26ce012db12b94511b6522f9edd
+EBUILD octave-6.4.0.ebuild 5552 BLAKE2B 812230e7263273c4db7e2e0c928323aab58a030ce8563d7c14aed90478d48203244999bb5d102c07ff24015af8e7d52657837f5295601771b33e36d83da06bd0 SHA512 694e05ed20b2f3ce7e3df25c668d84869f99f7a4e771a7b0d997da700f561aec593f3af63d604e0749c61b7ada6b0555788933217659ab696ad85abe9ee5c1ee
 MISC metadata.xml 1154 BLAKE2B 34f491369b5ef047f0540be74994b9d6507310db475dc25868e2320e5c4474ebeaba2f80ba90759df53c15294c71ad9631e5f98ad81d2098d3e86e308d5c9eaf SHA512 9f73af69e5318693db98720836f0df25518c4bc3ac9ff72071aa04aaca1147e2c21d14a299b199689e926bff059c33c20f39b9f85062d1e1227e466b2b8b3446
diff --git a/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch b/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
new file mode 100644
index 000000000000..1558b334d522
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
@@ -0,0 +1,37 @@
+
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1647451226 -3600
+# Node ID 2d394460429ff8313004ddaeea31437e90d16799
+# Parent  d3123b682f63723c111a50b77716fe9349d8fb7d
+build: Parse .la files in build tree when installing .oct files (bug #61905).
+
+* Makefile.am (install-oct): Parse .la files in build tree when installing .oct
+files. That should improve compatibility with tools like `slibtool` that don't
+install .la files.
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -460,17 +460,18 @@
+ 	if [ -n "`cat $(OCT_FILE_PKG_ADD_FILES)`" ]; then \
+ 	  $(INSTALL_DATA) oct-file-pkg-add $(DESTDIR)$(octfiledir)/PKG_ADD; \
+ 	fi
++	top_build_dir=`pwd` && \
+ 	cd $(DESTDIR)$(octlibdir) && \
+ 	for ltlib in $(OCT_FILE_LIBS); do \
+ 	  f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
+-	  dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
++	  dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$top_build_dir/$$ltlib`; \
+ 	  if [ -n "$$dl" ]; then \
+ 	    $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
+ 	  else \
+ 	    echo "error: dlname is empty in $$ltlib!"; \
+ 	    exit 1; \
+ 	  fi; \
+-	  lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$f`; \
++	  lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$top_build_dir/$$ltlib`; \
+ 	  if [ -n "$$lnames" ]; then \
+ 	    rm -f $$f $$lnames $$dl; \
+ 	  fi \
+
diff --git a/sci-mathematics/octave/octave-6.4.0.ebuild b/sci-mathematics/octave/octave-6.4.0.ebuild
index 4b0b6832a769..bc0547dacdd3 100644
--- a/sci-mathematics/octave/octave-6.4.0.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0.ebuild
@@ -97,6 +97,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
 	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+	"${FILESDIR}/${PN}-6.4.0-slibtool.patch"
 )
 
 src_prepare() {
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 275716c3b4aa..95b4bb856f36 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,3 +1,3 @@
 DIST polymake-4.6-minimal.tar.bz2 5634651 BLAKE2B 6ee24fa6e70fdf746ea298d78e21e17fe38c5837ae2d3153e53656b4b003555b06897f463220b59474eed1111135dfa61c080d08d6363391afca51011f331122 SHA512 90f04c67bf297fb1b9f5a51d1654ff12385860b1fc80278a8b47f65970f11a1e0f33ede8a839b54a12422e772c8b76302ff78cc467712a2486f6e76ce0d5ab20
-EBUILD polymake-4.6.ebuild 4029 BLAKE2B f9f126259255ec1cf740822f73b2b1e6330f736cd237f0f6f709e8d8d7afaeb7d47766ce7968bfdfcaf7fd7e547d53f80a4619854b7c4b9be8a90a5001a41ae3 SHA512 ecf42b8137ce148d601217797b707c40d4bd04420732da444ded2dc0608cf07abda988004c375a34a1bbd21786d7b22db6ee6f98aa4549e0e80f223b329c7c0b
+EBUILD polymake-4.6.ebuild 4028 BLAKE2B d3f194adf0566143a32e3914e5bfdeccee3e41e8d59236d3bfc22ee061cfa39039f46339b5a2a5e0e05ea6a8761387dfa506658d392cd7874c2d96f8745d9671 SHA512 9e8b93bc2b86c9ec895b44f5988d70e583f3b414c82d4993e3c0df2fcefd650f809a549325bdbdcb2ae4a6d7199cbd1d295775ab8f63b7883e655725ac64bda5
 MISC metadata.xml 1762 BLAKE2B 249af503c9e7e99118c87e4cd71c151cc962502972e80c4ba4f66ae3805c9f6c47601ecadef5e6e1b5c67a7e7779155f2524bace8d6f2f4fb260f2f4dce1b257 SHA512 fc887d14710c9529a9738a14ae8f6a41adae80c273354aa5bcd0a14ad695de09ff562e775a5d40582b23e3b6b1fd4e34a277fa9a6ff7131f19ad4f5cc98d6374
diff --git a/sci-mathematics/polymake/polymake-4.6.ebuild b/sci-mathematics/polymake/polymake-4.6.ebuild
index e82e8fe3f95b..7c936b5eb6c6 100644
--- a/sci-mathematics/polymake/polymake-4.6.ebuild
+++ b/sci-mathematics/polymake/polymake-4.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://polymake.org/"
 # closer look at how (or even if) the corresponding code is being used.
 LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular"
 
 REQUIRED_USE="^^ ( bliss nauty )"
diff --git a/sci-mathematics/psmt2-frontend/Manifest b/sci-mathematics/psmt2-frontend/Manifest
index 64fee26bb05f..a26509e62f8c 100644
--- a/sci-mathematics/psmt2-frontend/Manifest
+++ b/sci-mathematics/psmt2-frontend/Manifest
@@ -2,5 +2,5 @@ AUX psmt2-frontend-0.2-gentoo.patch 607 BLAKE2B 4d3a967d9c694e74b1e33426d73f41e9
 DIST psmt2-frontend-0.2.tar.gz 26976 BLAKE2B 2b45ceb8d824f5b11455ad0026064b6329b6c6e6173c091b36dc42e8c1dd36924d12d9296db3dcfe748a84fdc37a1a530f3ef485bec904c19a0e6aa8034149f9 SHA512 c29802f4265a1cbdb05ee9154ce2c156136af258bc7283dd0fb1d1b2ce162b671553cab96484036d898e3ff7c26ab133f5c2e1ca88e9e48660b2faa139fd1f41
 DIST psmt2-frontend-0.4.0.tar.gz 70801 BLAKE2B 337b3a87e9bff1c48eec9be4b1b50539c0114cdcdba1ac9c64ee180f73451b6a500f4a970a4f557dc3b886c5932bb72bb0b1b5e130a833b05502954c5279e702 SHA512 68b883f4bc4e0e39162807ffae251782871f372850c469889ea5ba5cf59388e363b1de5bc8087ad8624a1466b52611d0e41d78c6c3e6ac8af7c6e6e5c35630c5
 EBUILD psmt2-frontend-0.2.ebuild 949 BLAKE2B c86ff25357b7d930a560559921f063bbd9fdfbe055eb2e06413e3619ec1834c24052718b30e022be46761846c57176e81fb5fa0374bb98b2c2be41b31c094a3f SHA512 db228543428bb17b0b7bb313deadebc6b01edf034bd48879aeed33fdb26a90f5cd51e3f95884dfff5bcce77a602ac64d95af7a4390350e96d7a77d6d89801feb
-EBUILD psmt2-frontend-0.4.0.ebuild 592 BLAKE2B b8a083d829869c62ee6daee94d53a73d04afe26549773497a66c2fddd80e028a65f54d89b111f86bf13c5fd6a674c2bf3f0cd7348407b26d7a1d81015aef43ca SHA512 bdef9291425a4b638035fb868e4d862ccea089fec4016524bd38df2f7e05ccad5e76df606947884f1622f0274fd6b6751083a5c63cc318c5311a9abbe5c8cd9e
+EBUILD psmt2-frontend-0.4.0.ebuild 591 BLAKE2B e6c8444f7401566e19ce5cfeddfbac2d7df46d78d7b6bd171df3cf547cdaddd245fde9e157b23707d29bf73fef6226f90f81e735a91d9baa10590d576d05acc1 SHA512 2f594d42be049cceb40fffe52b336790863abd16b1507c1edd8061c737c7f29125828b51d2eb99fd1f63a5bd05e0501ae9df39901ea48c9fc677ad113083058a
 MISC metadata.xml 731 BLAKE2B 14577e7299ccd12be2ce493d8544a43bf3cafc7ffe7dff3be057f1428b467a0f47195b937303c50b284e5df1896765436d0f122472fe2d9aab0ddcf45f7fe140 SHA512 6bf3fdf46245ea1c9ff4b032ebba4feb6b519ec16605b1f486a2daf28961a4fe7f58b419b31eacf077e2cb64ca3e846dc21d741c7a4be3b57003e55c572c985a
diff --git a/sci-mathematics/psmt2-frontend/psmt2-frontend-0.4.0.ebuild b/sci-mathematics/psmt2-frontend/psmt2-frontend-0.4.0.ebuild
index 4ff6c1c91532..804904c9a49b 100644
--- a/sci-mathematics/psmt2-frontend/psmt2-frontend-0.4.0.ebuild
+++ b/sci-mathematics/psmt2-frontend/psmt2-frontend-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OCamlPro-Coquera/${PN}/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 259d431ff9fa..6deb3b7a23dd 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -11,7 +11,6 @@ DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d
 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168
 EBUILD singular-4.2.0_p1.ebuild 2259 BLAKE2B 2237245fe2550f398a20a14ae599bcc668288aa6312925cee725e2571dc53f8f62f88bdff0cdf8cd303c72baaf2861a2c560ce54978da720e93cbe459769b7d1 SHA512 2a6b8e478f32ff9e3df96e0188cd137b16d9be1a8c18c9f5367a81b96dc8b0cc01d34771246001eee9e8ec9832f8832539e921879ec56fe8a51ebb42c0d29389
 EBUILD singular-4.2.0_p3-r1.ebuild 2428 BLAKE2B af72aae39de23df410fe1d6dfe475c3179f6355fffe1775d4d408bec6fe80aa37022e6a9838a45014488666b56cfaa627f1fc1d007d360fbbe6987f4b3ead197 SHA512 0921b4991019b449054fb7c7c60a9bd39ec6434a19321b79f63470f2e15889945f24bc15f48e12ba16a24ff23c368a73b0b062d0150104d39aa715511766bc55
-EBUILD singular-4.2.1-r1.ebuild 2679 BLAKE2B 8e24286895a237762fc61ed6cfa7ec723ba9d06f25eb6ef8d228747f7658c487c6c29dc9c6fe93c4864d3e9ceaf61d3edbc023c326f83556095f6e62082220ba SHA512 dcc37fe96e0c3a50661c81eeb9ff7fc31aa5dba023712c5c922cdf3529410b854039a9644ffa7bfe4b9d7951b797a60ce7faa9477bfb0e8743f8f8edaab2c448
 EBUILD singular-4.2.1.ebuild 2571 BLAKE2B 7ccf61735ce3bfd5472b646dceb77239430d44bff9816ea2c1a5cd1cd4807c0138ec2396a193c98b7c3b456a36ee72c6351ff95f949f3afa318b5955a14a014b SHA512 1aad8be5aee15235c8f4a865ec8e3e19c3cac61ae6c8db39e7a7f614119fa2dfc1869a7ce9cc6fb896a5ffb455c65e90b2fc91cf98d5b0a3e193941deadc807c
-EBUILD singular-4.2.1_p3.ebuild 2684 BLAKE2B 8d47db8a86f331a0fa6a907254338f05d807137a014b6be5578b9cf8152d51e1b1d2c9981b158e68d07b5ce8156dbfad2641dbd0fde237e78aaad4bd47ab7d4c SHA512 21d6e8c8c9a7467bbad0f6ea70696cc5b6c1eb25bd28a5362ade8e0e7926b13d02f4851e585fd98786066ba4dad475c688462e5607f8631b2fa7400a5ce121ec
-MISC metadata.xml 580 BLAKE2B 25a2f7adf99e9469811f49d1493b274298d2219874aca83e0569a8ca079514659338543a2dd002d5038b2c9b3cdae44772021e2bc1b0340c6237974744ade4a5 SHA512 385646f40f3a741faae6db06eacff9837608cd5860bbeadbbdfd7e0ff847f0a214a5b8373ea549f6463e0e29931b018af36c86394aa894dba10d1e691ada3902
+EBUILD singular-4.2.1_p3-r1.ebuild 2628 BLAKE2B 5ff968e3c06d722d2f1c0c872ea4c541e9e5e90bda4e8af8e54ba38aba21464ed8f7cfea727883de0ed34831f12c780ed45dd2a038856a19d142200d0073688e SHA512 8d0e74684f138c08288ac642ad0450a364c5b0deb6f805680289408d54fee563cadd32a81297a48e8148679b537903190e8abba069a60e38e06cb8bc10b6ee75
+MISC metadata.xml 510 BLAKE2B 54fa3549c356ab3cb45b859dda337a25959bee37acf1210704b79de849e5b9861b9f0d85639d11db461995074ca00c91fb0dce8459231ef42f76257c8f0a6e51 SHA512 d2f4ec93fe340097a9a09845fffcd4a385434fb267350bb8dce9eae9248487b87cb3b68e0e1e05a1c78ad956a48548f47663a2f4db84af0d68ade02327df1268
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index 5d46057110ae..0477525e4c04 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -6,7 +6,6 @@
     <name>Gentoo Mathematics Project</name>
   </maintainer>
   <use>
-    <flag name="julia">Enables interface for Singular to julia</flag>
     <flag name="polymake">Enable the interface to TOPCOM</flag>
   </use>
   <upstream>
diff --git a/sci-mathematics/singular/singular-4.2.1-r1.ebuild b/sci-mathematics/singular/singular-4.2.1-r1.ebuild
deleted file mode 100644
index 96abef3a90a3..000000000000
--- a/sci-mathematics/singular/singular-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic
-
-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="ftp://jim.mathematik.uni-kl.de/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 ~x86 ~x86-linux"
-IUSE="emacs examples julia polymake +readline static-libs"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/gmp:0
-	dev-libs/ntl:=
-	sci-libs/cddlib
-	sci-mathematics/flint
-	emacs? ( >=app-editors/emacs-23.1:* )
-	julia? ( dev-lang/julia )
-	polymake? ( sci-mathematics/polymake )
-	readline? ( sys-libs/readline )
-"
-DEPEND="${RDEPEND}"
-
-SITEFILE=60${PN}-gentoo.el
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-doc_install-v2.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Needed to avoid segfaults in the test suite until
-	#
-	#   https://github.com/Singular/Singular/issues/1105
-	#
-	# makes its way into a release.
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	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 julia)
-		$(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/singular/singular-4.2.1_p3.ebuild b/sci-mathematics/singular/singular-4.2.1_p3-r1.ebuild
index d08d33360a78..640dfeb3b453 100644
--- a/sci-mathematics/singular/singular-4.2.1_p3.ebuild
+++ b/sci-mathematics/singular/singular-4.2.1_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,8 +18,8 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
-IUSE="emacs examples julia polymake +readline static-libs"
+KEYWORDS="amd64 ~ppc ~riscv ~x86 ~x86-linux"
+IUSE="emacs examples polymake +readline static-libs"
 
 RDEPEND="
 	dev-lang/perl
@@ -28,7 +28,6 @@ RDEPEND="
 	sci-libs/cddlib
 	sci-mathematics/flint
 	emacs? ( >=app-editors/emacs-23.1:* )
-	julia? ( dev-lang/julia )
 	polymake? ( sci-mathematics/polymake )
 	readline? ( sys-libs/readline )
 "
@@ -72,7 +71,6 @@ src_configure() {
 		--without-python
 		--without-pythonmodule
 		$(use_enable emacs)
-		$(use_enable julia)
 		$(use_enable polymake polymake-module)
 		$(use_enable static-libs static)
 		$(use_with readline)
diff --git a/sci-mathematics/verit/Manifest b/sci-mathematics/verit/Manifest
index cd39e9999082..a996cb23f1ea 100644
--- a/sci-mathematics/verit/Manifest
+++ b/sci-mathematics/verit/Manifest
@@ -1,3 +1,3 @@
 DIST verit-2021.06.2-rmx.tar.gz 683775 BLAKE2B e7488ef11f37c4312dc3bb7809c8f4a134c70e0cb893a9127235e5bd660e3cf88648d5af598f650d25aed02eb864c171479a570b4e47b96ab2bb5f6aba3e6926 SHA512 4dfdbcf12fefaba13f5540a08a520e15666ca3bb923483b86eac708cf23bd5d8441d9a687487ae38f9bbdbc023beedf3e503800e99622cb71fb086329c047a4d
-EBUILD verit-2021.06.2.ebuild 508 BLAKE2B 6ac727f550f8fa0c81b70e509e2381e26eee8745b3c16f7626b0f02408bac78b0b2cd88b11c99f815f9439e0454d714254c0b3fa56ec0a063369e74048ba422a SHA512 60e00146bf88f2d93b9a5ec476568700154df6a70b67b85fe3c37bee495546cddc6942b3d5a1659c4252e1a22073d5c776452548cf1bc6d2812834d92faae80f
+EBUILD verit-2021.06.2.ebuild 489 BLAKE2B 49417dbb1155bb98b19f4369229b4b6d0728f9a937f8bad489737211d370f8210d8ca53b02923b3bbaa34d4c7cc27957e0c505f4ef4a9421c5d9d4edfd9316ca SHA512 b411237818f1c8ef6abb00cf77c024120f882bf0260db4c55d1a60eeb98345dd1849c91fc29906af5efa2a5168baed7f35d537945a1d1dc3aadd824f6f07626d
 MISC metadata.xml 655 BLAKE2B 901ce12d712051cde3d4cd1c936f5de3b1e52eb9a238c6ba14de2a8ba78bc6f793dedc25ff3f44903f31a70b90bc18fd2e6829e8be88fa431db172c964c32e76 SHA512 1bd1dbbf7d701fde4db5b5b7bf7525baf6d7cda1a959f4a6a10653ddd95be0225a792c10c5adfa78330ceefd37e72fe59436cc3616719fd5e683643e1e123fa8
diff --git a/sci-mathematics/verit/verit-2021.06.2.ebuild b/sci-mathematics/verit/verit-2021.06.2.ebuild
index bd4092215917..d76cb2be23a3 100644
--- a/sci-mathematics/verit/verit-2021.06.2.ebuild
+++ b/sci-mathematics/verit/verit-2021.06.2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
-
 DESCRIPTION="An open, trustable and efficient SMT-prover"
 HOMEPAGE="https://verit.loria.fr/"
 SRC_URI="https://verit.loria.fr/download/${PV}/${P}-rmx.tar.gz"
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index 8a8e0fbf76d6..4619b2aa4078 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -1,4 +1,3 @@
-AUX why3-for-spark-2018-gentoo.patch 1015 BLAKE2B 201846ae0ef17bc6d777b7c1a8baddd1f684e82b811b16d2cce447423189a899f3e599cbf5cbd01630e2b246f8257ba5a890b20aaf62b0c1bc24e46642a37600 SHA512 871534c90f4f7c680f07dcd0bcacc4ce75c43b3132e8570b73e66316fe4333c244b9c443998916af7ff8fd297c20f7079ec5e8bf4c97207d0b7537722cd010a6
 AUX why3-for-spark-2019-flags.patch 920 BLAKE2B ee9cf3e956a82f79e647a71c0959259353cb02fb23caf8c7e0b53b64231fbf5d0915833489944e178768dbd3ead5e642277bfd3cf8a7dcd715cd60d6b1e97f19 SHA512 e6c6f36f562693b50853923dc65e380db2da31c3520c860e203fa615a22a5b521fec45c0ba3d15d817bc420894fa9e3ac15f68b00c7dde0a968da173409e1eab
 AUX why3-for-spark-2019-gentoo.patch 764 BLAKE2B ba9fd2c8ff6dfba4783c527cb02a5d40d0bc8d25e9039af20c1ae4498dfe7c275f5d3cf85a5bea63f86703dca8e931a4ce837c3fe4a2337918d87ec563d69de5 SHA512 61c2b1e8da73617211f9142738836be7787a9d2c2396fad73b6ed7f4d5bbe87336e38540549d8458d7ec2bd290cfdee811c4a6f19444b4e7b7de21396bcacef1
 AUX why3-for-spark-2020-bibtex.patch 288 BLAKE2B 50459e0dfe6ef3d5b455993e9e7fbc3c8093d40a83dc2c0b8660c1d69d7d45cfc3fc657cb06dd3794741e7c3d923b46c0a0b7330c656be908aac72f921e7885d SHA512 0ce636357b9c3c31762bdfcb7487f812a6cfcb49c4c412236b7a6b1ec69f4c74f1b29ac80f4e441d872fe251ab050bc1b186acf514473c52e3680f2d274f4f9b
@@ -8,9 +7,7 @@ AUX why3-for-spark-2021-flags.patch 1234 BLAKE2B 617040fbf9204382adda8161a07ab52
 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
-DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
-EBUILD why3-for-spark-2018.ebuild 1710 BLAKE2B 636d340d29663d376ebde33b519ed8b88a2a862f64d21fc6dc03ec7b21a5c3c63c9c6e4316d740b1d76b2fd322a5e360deb93bc33bb0d0b0e847b960cf77b7ef SHA512 fcfb3ae98e1f58444cc4d44d74e61bcea1d991729dc36bc15f7b3b9232c9010dc2a7825e277745b80160cb122407350fa1b73661c40ce23a53fa91c9a8ad4367
-EBUILD why3-for-spark-2019-r2.ebuild 3000 BLAKE2B c6f405a6e36086f7763e1717f610d2c3139e48ef259652b5489be6d0ac536efe17cada609b693e7d0d848d1c5a4d6b321015e03d7ee2f2ebff71a9ef23b08620 SHA512 27a484e227f693ad50b026e658bbe0fbdc230f7a96ee30115e8fe38149ebc9e574c638fa9e0012b6099aa5a03df3ac83ae5800b611ef6ad2406b18571831109a
-EBUILD why3-for-spark-2020.ebuild 2929 BLAKE2B 9a6dd9ee12f38a9c90899759318b7b4934bcdeb109320900c43b8b07f945f28988b8745771d88a3e284df2318280d08ea23cd72f4fd6fd98e23d3e7882990bb9 SHA512 eec3c1e053b2baaa97ef2808a4ccbff43358af9469e18cb14e30ceca043da68c3ec2ed848feff1cd1aeb0f31ef89f40cf192a9d47f9f8af11e0a487da8fba5ac
-EBUILD why3-for-spark-2021.ebuild 3001 BLAKE2B a1132a71dd334a1fceea28792ecb932262ffc9d38b865ca719c1b7c65d44f37ec41fcc91539e7b1a1ef61b044d8e24e01dbd83578ea07edd1e9985ce1909d52a SHA512 c7153c57f285da11e34ee1b1b6996ce7766fc64e6a972e016ae46933265ba2569dbbf7eeb8e33afa864b2e12266be3a1438d836f832f7e1d892def4e6e2ceb78
-MISC metadata.xml 1364 BLAKE2B 75976f7e828003f2a86f7668a6ca8d3ed2d5e4a351839570f5e506f771c09e497e816d57b9a56a1e54d2f7d3ddd68d77501abcb754e4fe59a20eaadabef130d3 SHA512 56b0eabb052544f2942c663273b30b4f0d8d2c54c059f2102d587771aecad86017f8cdb6458f90096221f2cecdfb445556bf330d3e3339252a96c17db9d747b3
+EBUILD why3-for-spark-2019-r2.ebuild 3010 BLAKE2B d843d70e1b9145175b11edd461a6237af4215b6c7a31235fbab73e75c79668dd570857dc62db737e2e262fd59a10158c7857c0e1d47a2d36fac45a9f3cecb9ce SHA512 ea7791bf0ae35b66a13c4d8ee606fccc05e919beb892ddc2b6a53cef29df400b2e0b53b1e9b7c6a6f4144fb98bf44f467878f9e2bb94352734ad11595748b3be
+EBUILD why3-for-spark-2020.ebuild 2929 BLAKE2B 08af878a591cd6445a5f7dba13d9162a2f8ed192fa335a10391124207b354493fa3366618e3590b6cc8425b931610f779db66eb3c95965eb134864a62bac8bf7 SHA512 e08745656eff3612e5510c378efd4ef9630e753f366d03e89a9035cacbb0e24abe3d7f6618b08d641e1139d4612b71267cc2a73b10d738f58a78aa9fdc0d9215
+EBUILD why3-for-spark-2021-r1.ebuild 3357 BLAKE2B c4dceedd311dfeb272c3367ee4ab734a12657d87212d923d65bc06958b828350d6a54fef0f4035bbc4ed6a254ca0328b157192348fe6ed47d686060bb84df05e SHA512 500901a1715f64469776c953792f6b32ba3fdfe4edb20e1d5aa9fc41ba79e736eba3652ed6b2f47884ed29fb9eff42694778ff7da0c3ba89bb411bc5a6194795
+MISC metadata.xml 1486 BLAKE2B 3f8757b80b9b1b031fdfee11a4d1fb8aa6bf52b496e7fe2f26b3159313aa6df3998717b9b7d69a3e8c1206425986d3f8faa4d73b7ca1e216b90521c6bbe10c68 SHA512 60dd1f95702d163ad46f636d4af302437cab29d29fb1466352ff2889841d378bb2c6d4670cd626dcf612f2a1196627f09282f29e63815a929411d5bbdc68593e
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch
deleted file mode 100644
index 9d7165cbed78..000000000000
--- a/sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- why3-for-spark-gpl-2017-src/src/gnat/gnat_config.ml.old	2017-10-18 09:07:03.118919785 +0200
-+++ why3-for-spark-gpl-2017-src/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
---- why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4.old	2017-10-26 22:25:55.289094778 +0200
-+++ why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4	2017-10-26 22:26:10.719807270 +0200
-@@ -1352,7 +1352,7 @@
-     let limit =
-     { Call_provers.empty_limit with Call_provers.limit_time = timelimit } in
-     let call = Driver.prove_task ~command ~limit drv !task in
--    wait_on_call call
-+    wait_on_call (ServerCall call)
-   with
-     | NotFO ->
-         if debug then Printexc.print_backtrace stderr; flush stderr;
diff --git a/sci-mathematics/why3-for-spark/metadata.xml b/sci-mathematics/why3-for-spark/metadata.xml
index 6581985ad1d8..9b2196685bde 100644
--- a/sci-mathematics/why3-for-spark/metadata.xml
+++ b/sci-mathematics/why3-for-spark/metadata.xml
@@ -21,8 +21,8 @@
 		<flag name="coq">Add <pkg>sci-mathematics/coq</pkg> support</flag>
 		<flag name="html">Build HTML documentation</flag>
 		<flag name="hypothesis-selection">Enable hypothesis selection</flag>
-		<flag name="profiling">Enable profiling</flag>
-		<flag name="zarith">Use <pkg>dev-ml/zarith</pkg></flag>
+		<flag name="sexp">Add support for outputting S-expressions with <pkg>dev-ml/ppx_sexp_conv</pkg></flag>
+		<flag name="zarith">Use Zarith (<pkg>dev-ml/zarith</pkg>) instead of Nums (<pkg>dev-ml/num</pkg>) for computations</flag>
 		<flag name="zip">Enable compression of session files</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
deleted file mode 100644
index 48d190220579..000000000000
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Platform for deductive program verification"
-HOMEPAGE="http://why3.lri.fr/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a43
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
-RESTRICT="strip"
-
-DEPEND=">=dev-lang/ocaml-4.02.3:=[ocamlopt=]
-	dev-ml/menhir:=
-	coq? ( sci-mathematics/coq )
-	doc? ( dev-tex/rubber )
-	gtk? ( dev-ml/lablgtk:2=[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 )
-
-REQUIRED_USE="html? ( doc )"
-
-src_configure() {
-	econf \
-		--disable-pvs-libs \
-		--disable-isabelle-libs \
-		$(use_enable coq coq-libs) \
-		$(use_enable coq coq-tactic) \
-		$(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 profiling) \
-		$(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
-	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-2019-r2.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
index 9fa713b6baaa..f0597604b01e 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,13 +12,13 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="coq 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:=
+	<=dev-ml/menhir-20190924:=
 	dev-ml/num:=
 	coq? ( >=sci-mathematics/coq-8.9.1 )
 	doc? ( dev-tex/rubber )
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild
index 8fd579c6c8d4..7988788f83af 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2021.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild
index b851107a4c41..986e7bf497fd 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2021.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools findlib
 
 ADAMIRROR=https://community.download.adacore.com/v1
 ID=dd74ae7ecfd7d56aff7b17cee7a35559384a600f
@@ -16,29 +16,36 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt zarith zip"
+IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt sexp zarith zip"
 RESTRICT="strip"
 
-DEPEND="dev-lang/ocaml:0/4.11[ocamlopt?]
+RDEPEND="
+	>=dev-lang/ocaml-4.11:=[ocamlopt?]
 	dev-ml/menhir:=
 	dev-ml/num:=
 	dev-ml/yojson:=
-	coq? (
-		sci-mathematics/coq
+	coq? ( sci-mathematics/coq )
+	emacs? ( app-editors/emacs:* )
+	gtk? ( dev-ml/lablgtk:=[sourceview] )
+	html? ( dev-tex/hevea:= )
+	hypothesis-selection? ( dev-ml/ocamlgraph:= )
+	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-tex/rubber
 		dev-python/sphinx
-		media-gfx/graphviz
 		dev-python/sphinxcontrib-bibtex
+		dev-tex/rubber
+		media-gfx/graphviz
 	)
-	gtk? ( dev-ml/lablgtk:=[sourceview] )
-	emacs? ( app-editors/emacs:* )
-	html? ( dev-tex/hevea:= )
-	hypothesis-selection? ( dev-ml/ocamlgraph:= )
-	zarith? ( dev-ml/zarith:= )
-	zip? ( dev-ml/camlzip:= )"
-RDEPEND="${DEPEND}"
+"
 
 S="${WORKDIR}"/${MYP}
 
@@ -49,47 +56,53 @@ PATCHES=(
 )
 
 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/commands/why3shell.cmxs
+	/usr/lib64/why3/commands/why3extract.cmxs
+	/usr/lib64/why3/commands/why3execute.cmxs
+	/usr/lib64/why3/commands/why3prove.cmxs
+	/usr/lib64/why3/commands/why3wc.cmxs
+	/usr/lib64/why3/commands/why3doc.cmxs
+	/usr/lib64/why3/commands/why3replay.cmxs
+	/usr/lib64/why3/commands/why3webserver.cmxs
+	/usr/lib64/why3/commands/why3pp.cmxs
+	/usr/lib64/why3/commands/why3show.cmxs
 	/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/why3config.cmxs
+	/usr/bin/why3session.cmxs
 	/usr/bin/gnat_server
 	/usr/bin/gnatwhy3
-	/usr/bin/why3realize
+	/usr/bin/why3realize.cmxs
+	/usr/bin/why3ide.cmxs
 )
 
 REQUIRED_USE="html? ( doc )"
 
 src_prepare() {
 	find examples -name \*gz | xargs gunzip
-	default
 	eautoreconf
+	default
 }
 
 src_configure() {
-	econf \
-		--disable-pvs-libs \
-		--disable-isabelle-libs \
-		--enable-verbose-make \
-		$(use_enable coq coq-libs) \
-		$(use_enable doc) \
-		$(use_enable emacs emacs-compilation) \
-		$(use_enable gtk ide) \
-		$(use_enable html html-pdf) \
-		$(use_enable hypothesis-selection) \
-		$(use_enable ocamlopt native-code) \
-		$(use_enable zarith) \
+	local myconf=(
+		--disable-pvs-libs
+		--disable-isabelle-libs
+		--enable-verbose-make
+		$(use_enable coq coq-libs)
+		$(use_enable doc)
+		$(use_enable emacs emacs-compilation)
+		$(use_enable gtk ide)
+		$(use_enable html html-pdf)
+		$(use_enable hypothesis-selection)
+		$(use_enable ocamlopt native-code)
+		$(use_enable sexp pp-sexp)
+		$(use_enable zarith)
 		$(use_enable zip)
+	)
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -107,7 +120,7 @@ src_install() {
 	local cmdPath=/usr/$(get_libdir)/why3/commands
 	dosym ../why3server ${cmdPath}/why3server
 	# Remove duplicated files
-	for filename in config ide realize server session; do
+	for filename in config.cmxs ide.cmxs realize.cmxs server session.cmxs; do
 		if [[ -e "${D}"${cmdPath}/why3${filename} ]]; then
 			rm "${D}"${cmdPath}/why3${filename}
 			dosym ../../../bin/why3${filename} ${cmdPath}/why3${filename}
diff --git a/sci-mathematics/why3/Manifest b/sci-mathematics/why3/Manifest
index 5575e8ac9d5c..e33b6464dad5 100644
--- a/sci-mathematics/why3/Manifest
+++ b/sci-mathematics/why3/Manifest
@@ -1,3 +1,5 @@
 DIST why3-1.4.0.tar.gz 6306524 BLAKE2B ade7803a608d090ea06d974ae47e920993de92a5849d60bd63dba68252919a8f4fd1f0f6a3c975fdb727c4ae3afe13921b5d31a14c005e0d08f518e64bcf05e5 SHA512 b492f08a3c7073782b143a4849c47766b12045ad53c56aa8d251fd5b6bc1863ddebe260c99b3ddb27c4e1e1e9ab986c8b02286ec24f4c30f99f81f5f13fdc90a
+DIST why3-1.4.1.tar.gz 6305011 BLAKE2B 2d916fbf333550f8021bff9e7ccf4ca5685763ca7f82ae133298feaf96f3e8b36290a103fd27224fb6fb2dc36c8d7ad5d93ffc92e8cf7fe1a61abb5a40aecb39 SHA512 7990519179c088be1bc9b5b6d469f6d6fbd683445e20cbf5edd5c97682f2931b2657a92b60e539d7647033bfdc5a63401f28af61fd9b14b41011144afa2016e0
 EBUILD why3-1.4.0-r2.ebuild 2170 BLAKE2B 4a69d3d119d8ac3dd1d33a820717b1f59d88eb888f168ab5c019e23457de62d81ee07bf7d64ad48a63ab90fe864084588a54d4e7b8163e86cff5f2dbd8185a4e SHA512 99073cf81b27903bd21c0c7d7ce898a449191aeb6e23e3ac81e58cebf6704a2a829d03c847c810093f8ee835f677bae1f64c8b20ffc9f37f74e04ee11e771a5e
+EBUILD why3-1.4.1.ebuild 2170 BLAKE2B c306a13b879781df2fc69417d2eac73309bd4d9998350f6921c33a735936d47e093fa4d8996a043e1535bbfb3e83d460097111f220c7f8ef55655678047eb60e SHA512 247e47ab5f787b34a1a7dd0624bfeedb3a496aec835f985058f577d4a871c239e1b908018639f1c1e27526e37cbc6e8f8e139d079b66b31e8ceca8e8feb7b58d
 MISC metadata.xml 1817 BLAKE2B 671ffd58aff152784984d09096259164d691bebbdb057822a8f26c43613b1a057dceb1f6f3ecb7ed4db314630cee206a80c6c819711f6177c343f74c8f9c1267 SHA512 d2c22dec72fadca68284bd2c44b4c39b3a3d41476ab311be7abc50ca9e10d99840eb28aac504a627828fb2a98141acaacbf09d437bc6d8b90f4cb668b6565202
diff --git a/sci-mathematics/why3/why3-1.4.1.ebuild b/sci-mathematics/why3/why3-1.4.1.ebuild
new file mode 100644
index 000000000000..a9a9ef515374
--- /dev/null
+++ b/sci-mathematics/why3/why3-1.4.1.ebuild
@@ -0,0 +1,98 @@
+# 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="http://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-20151112:=
+	dev-ml/num:=
+	coq? ( >=sci-mathematics/coq-8.6 )
+	emacs? ( app-editors/emacs:* )
+	gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] )
+	re? ( dev-ml/re:= dev-ml/seq:= )
+	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/yacas/Manifest b/sci-mathematics/yacas/Manifest
index a5d0a791e614..b7b47954d31a 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -2,6 +2,8 @@ AUX yacas-1.7.0-desktop.patch 716 BLAKE2B da20f28d890f0b436ca796779bd78baf1e4bfc
 AUX yacas-1.7.0-gnuinstalldirs.patch 13706 BLAKE2B 67c024ecb5111ae0188140143c7d5a82119aac1aa653901dd787eb9a698828c46277aee2e15820e7902e8eb972b1011ab4a3250afb075734fd911257cecb70dd SHA512 5fdf24b613cccee2802f3047b80058d18fe707f82d94282d95d70c8f748a6f6ea75cf7760baf4b24ef29294038b2bc88c1975ee4516a5d953251f15f1f1f17f3
 AUX yacas-1.7.0-use-bundled-not-external.patch 7485 BLAKE2B 9f4653465fa7dcb21a915c67e138053296a8a0c446b198f1ab394c34223be3526b247a2de90a46bbc481d5cdeaac43711f979edada93fded89144ca21c4f34d8 SHA512 58e58aeae8a9b89ba7df18d3a9ed9168f4654d5501d3cc42ced9079c87b3177e7d57e9109729d57eb0441d9de40a5212573671bfd739916366957a3be659d3ba
 DIST yacas-1.7.0.tar.gz 2610016 BLAKE2B 62400d8aaba192a088bb48e0e12ff79e7e2d24af4825b2d53aeffa7aace011beb728118d56e5a9dd9e7dedba545706bbf77cb9ef27b5075e555fc5cc1983dc5e SHA512 6da7d454b3a74638d743c5e8168b27b9a8a71e2c41fe3f35bcb397fb80e866277ddb5b4e15167e2c0d11dd6033491ca72b560440fe2db6dc34b91b2ad047ca1d
+DIST yacas-1.9.1.tar.gz 38815043 BLAKE2B 09ec83591a9c11220f4e74ea07f1cad679cfef8c7a679c379f9bbc5708a70ccf9eb09a2ec6ca3fee7d76bc86082afcbd03e3d20df2e703dc579d93e94feee3e1 SHA512 1af1d7d490cf2d98fa861c476c7a7051a28535edc815f69a58edd2d96053332a8de7125017f18acbe2bf7b4eaf561cdf4e22d3c3f8e6656aaa3fbc46d0f633ef
 DIST yacas-bundled-1.7.0.tar.xz 4940180 BLAKE2B e191f3806df0c15149df053c47b1f11a5113ee3b55cbc9a78bfaec058fb5d783e4157687bf4ee9a953bcd23a4e3e49a59e6743e4471e31209a9e24e03ddc8ff5 SHA512 a9c519d0721df69ec81998a3ec17043b59230f5b0650fc2fd6555eccb5503460f387433c019ae15bbd0fd3ff11e697d6da56a3d08aac5fadf4ff023ca5d8691c
 EBUILD yacas-1.7.0-r1.ebuild 1404 BLAKE2B efdf7cacc453179b9160a9e4eb6a9d5874dcd4a7bb5e8f574b5bf02c78b1fe74f3993b8e69902e06583fb67f9a521c0f95aedee524cec1c6f91dc47408c24830 SHA512 81fabcde11a797c837f8de983e47ac20ee018a0d95939b10a507c9da85fd6d16c6dea5c0bbbf6d77d4b0c4f9e7edc129650671dba85735ffda2e4799a1375b5a
+EBUILD yacas-1.9.1.ebuild 1902 BLAKE2B 59169b7c2d8943064bf1900151a2c786e557b03b785ceccdca1f5d864a48a231c254042a7883462fb05ac112ed1ae7b0ab0469759164d7bb503f7d249216a847 SHA512 3a85161560f7a4ca6171f607f0efa63c074d1621b94d4b3b9527e8997c32d65676710ac9ac0cbc806dc41e85bb67e96e462f37ef24b8dcf01542e43688fe718f
 MISC metadata.xml 850 BLAKE2B ae5238a5de38646997fdc6ccfa9085d56cefc395295fc2372e049de80547cd75870dedb075ed011084ad686bb51c27dc182a879c07ae1fcd942c0b1520d89ebb SHA512 c2d259bc09555b6aeeee9d922b8a1a6a13c637999b30b47534f810a9b8994e351328add99f789d72a7c09326d98771b4e8e94d7698da5422965fcaa84bcc42de
diff --git a/sci-mathematics/yacas/yacas-1.9.1.ebuild b/sci-mathematics/yacas/yacas-1.9.1.ebuild
new file mode 100644
index 000000000000..df6256bf81c2
--- /dev/null
+++ b/sci-mathematics/yacas/yacas-1.9.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Sphinx doc building is not compatible with in-tree version of sphinx-bibtex:
+# Extension error: You must configure the bibtex_bibfiles setting
+#
+# PYTHON_COMPAT=( python3_{8..10} )
+# DOCS_BUILDER="sphinx"
+# DOCS_DEPEND="
+# 	dev-python/sphinxcontrib-bibtex
+# 	dev-python/sphinx_rtd_theme
+# "
+
+inherit cmake xdg # python-any-r1 docs
+
+DESCRIPTION="General purpose computer algebra system"
+HOMEPAGE="https://www.yacas.org/"
+SRC_URI="https://github.com/grzegorzmazur/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 gui? ( MIT Apache-2.0 OFL-1.1 )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui +jupyter static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	gui? (
+		dev-libs/mathjax
+		dev-qt/qtcore:5[icu]
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwidgets:5
+	)
+	jupyter? (
+		dev-libs/boost:=
+		dev-libs/jsoncpp:=
+		dev-libs/openssl:0=
+		dev-python/jupyter
+		net-libs/zeromq
+		>=net-libs/zmqpp-4.1.2
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# respect DESTDIR. avoid sandbox violation
+	sed -i -e 's/${CMAKE_INSTALL_PREFIX}/\\$ENV{DESTDIR}\/${CMAKE_INSTALL_PREFIX}/g' \
+		cyacas/yacas-gui/resources/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# TODO: Unbundle CodeMirror
+	local mycmakeargs=(
+		-DENABLE_CYACAS_BENCHMARKS=OFF
+		-DENABLE_DOCS=OFF
+		# -DENABLE_DOCS=$(usex doc)
+		-DENABLE_JYACAS=OFF # requires manual install
+		-DENABLE_CYACAS_GUI=$(usex gui)
+		# use system version of mathjax instead
+		-DENABLE_CYACAS_GUI_PRIVATE_MATHJAX=OFF
+		-DMATHJAX_PATH="${EPREFIX}/usr/share/mathjax/MathJax.js"
+		-DENABLE_CYACAS_KERNEL=$(usex jupyter)
+		-DENABLE_CYACAS_UNIT_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 8d1c5c24bc08..8c68b03ce2ad 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,5 +1,4 @@
-DIST z3-4.8.13.tar.gz 5103999 BLAKE2B 5500bbc71e7a863092a36bdd2bc04f5a4435e9d8fdc62c7956aa2546ffa9e39344c9528bf802f6e4c211c799e873f2673dbf8b113599dcbb694ac040ada2e9a0 SHA512 c5e8f34525ed3b6b2935d7f01ce2f90f5dd99b4cdd035664b36c967fb1c7f3b05abed45c7288e2261723e73d68728ee91a0f67d92012d86b04598d7b54369c30
+AUX z3-4.8.14-libatomic.patch 2063 BLAKE2B b2cb8232817ccbff2b1a26897b81e50bf3fc4110924642735858d854f57bf625c2463fa23285e1bf6f3f8cedf544adb580d0a64ee15f4810eb2f95451aecad7e SHA512 56864d3be7b891bfce49855d457b22c9ba9e047c710da1856cffacf3b2e88a6429d07e604c948210a983ab1bd1f785e7de906828eeaf534851ddfc63f36632b2
 DIST z3-4.8.14.tar.gz 5113598 BLAKE2B c6a82cec33e879123c33506897ac02be682d08a6432da0b11c6918f2664fd7249d8874ccb6f543907f789cc3b40b126465548abeabf4ac16d2ee791ce179742a SHA512 10170516ca472258d2f9df28cd036e43023a76a25f1e1670290c62f3890d935bf82770970054a5fd3a0f02559409e7ed4b18fb08347c040ff2f9e0918e152aab
-EBUILD z3-4.8.13.ebuild 2594 BLAKE2B 672fa6fcbf0d98a092bbdd264d57dd8ca52a84fe9ae220eeb429697ec4eedd786764d412a4995d6bbc295c83bf0244934533f60b1d355c6ca600dabf0b0b455d SHA512 a5e24ea461889c39524412961cb77bcd40f5771ecec5a15a05293768435ef8261de0929c9387d6d79ef582f853dc66df6f73e4c57d70d30e19119167da89b17f
-EBUILD z3-4.8.14.ebuild 2599 BLAKE2B 7d4b057cf1b8a9853db7d5f482a7457cd55fe1e4c3bdaa727db86fa69d0d144ccb2de9e25e51f34c7edb7c3487e6b0f4a51a76890dc309820e8096e39d7d9f01 SHA512 3c40f3b590e1d46defc757c6133136693e5ee5129949dfd1f7dbf49bc7e0634c591c2ba6e0758b0a0e9b979425c9501864020e4e12cc685ce963d74d5b2b6889
+EBUILD z3-4.8.14.ebuild 2655 BLAKE2B a8814dc067dc38a5b3bd8f1c0821f5e02a3e9324fab5b934ad5d0dc7723b800972923b9f1a640337e8c0c89dd1261ded27e24673f6477181e2619d7aef2587da SHA512 361c243eac4cf1a9123e85927f5f939d7428da702ded6a82d1672dcc67a93c495a57915e032b27230a4bcf31d6854c52a8c61f110ea7f048f806eecf4541033d
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch b/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch
new file mode 100644
index 000000000000..4b7503ef47fd
--- /dev/null
+++ b/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch
@@ -0,0 +1,60 @@
+https://github.com/Z3Prover/z3/commit/3d87d86c2825437780167ae6ff8f5b203f15ee7f.patch
+https://bugs.gentoo.org/835003
+
+From b2b407cdedc586f8d11f9dd029e1c3016c80bba7 Mon Sep 17 00:00:00 2001
+From: Revy <rabenda.cn@gmail.com>
+Date: Tue, 15 Mar 2022 02:11:40 +0800
+Subject: [PATCH] fix: build on non-x86 platform
+
+Signed-off-by: Revy <rabenda.cn@gmail.com>
+---
+ CMakeLists.txt                |  5 +++++
+ cmake/check_link_atomic.cmake | 23 +++++++++++++++++++++++
+ 2 files changed, 28 insertions(+)
+ create mode 100644 cmake/check_link_atomic.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be300607dd..477410ba8d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -431,6 +431,11 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   string(APPEND CMAKE_SHARED_LINKER_FLAGS " /RELEASE")
+ endif()
+ 
++################################################################################
++# Check atomic linking as needed
++################################################################################
++include(${PROJECT_SOURCE_DIR}/cmake/check_link_atomic.cmake)
++
+ ################################################################################
+ # Report default CMake flags
+ ################################################################################
+diff --git a/cmake/check_link_atomic.cmake b/cmake/check_link_atomic.cmake
+new file mode 100644
+index 0000000000..d462191a0b
+--- /dev/null
++++ b/cmake/check_link_atomic.cmake
+@@ -0,0 +1,23 @@
++set(ATOMIC_TEST_SOURCE "
++#include <atomic>
++std::atomic<int> x;
++std::atomic<short> y;
++std::atomic<char> z;
++std::atomic<long long> w;
++int main() {
++	++z;
++	++y;
++    ++w;
++	return ++x;
++}")
++CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" BUILTIN_ATOMIC)
++if (NOT BUILTIN_ATOMIC)
++  set(CMAKE_REQUIRED_LIBRARIES atomic)
++  CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC)
++  unset(CMAKE_REQUIRED_LIBRARIES)
++  if (ATOMICS_REQUIRE_LIBATOMIC)
++    list(APPEND Z3_DEPENDENT_LIBS atomic)
++  else()
++    message(FATAL_ERROR "Host compiler must support std::atomic!")
++  endif()
++endif()
diff --git a/sci-mathematics/z3/z3-4.8.13.ebuild b/sci-mathematics/z3/z3-4.8.13.ebuild
deleted file mode 100644
index 66a173a9a933..000000000000
--- a/sci-mathematics/z3/z3-4.8.13.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/4.8"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv 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 )"
-
-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/${P}"
-		-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 RELEASE_NOTES
-	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.8.14.ebuild b/sci-mathematics/z3/z3-4.8.14.ebuild
index 488e59de75e0..513000b5c713 100644
--- a/sci-mathematics/z3/z3-4.8.14.ebuild
+++ b/sci-mathematics/z3/z3-4.8.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libatomic.patch" #bug 835003
+)
+
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
 src_prepare() {
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /sci-mathematics
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)