gentoo (valentine's day) resync : 14.02.2021

21 files changed, 596 insertions, 78 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 2e5f1dcf457c..f222dc80c338 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index f33959c32726..1bb483d5dc00 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,7 +1,11 @@
+DIST coq-8.11.2.tar.gz 6564523 BLAKE2B 37ae7a1f899b8ce662d5c21542b2bec0e2e8f25e976fb46689e0eae182fa4ec571524ae9f4f1a5ebbd44966fbdc4ee10cffda59c287d51ab48df4ac0e5e6844c SHA512 f8ab307b8e39ffda5f6984e187c1f8de1cb6dec5c322726dbbe535ee611683cfeeb9cee3e11ad83f5e44e843fc51e7e2d50b4ea69ab42fde38aaf3d0cf2dea3c
 DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
+DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252afc05e046267cae4265c1be71f89d0345f9e40ab3a93f5063080fd0224502cc0de808c7a0ddbb0edacab5fca SHA512 c355f0a9183f3669debd5f8f4ab96786215d0cccc37d1c2ac95a2d3c6115c8b0ee7ff7e23464b18444e2648ef3f8c221f0f3a28acf91199751cea2b74ee3fe8e
 DIST coq-8.6.1.tar.gz 5588811 BLAKE2B 1016e54ef9b42a8534add55ab057454fad35b3fe103ba877689489c7d9cf43d76c1fbee123801d91035d353a882120650f94c433d9ee1daa878b8c819609c949 SHA512 814ab76a06ca15f927081428da74add4bc67290199fa011853b9c68a00cdefaf813b10fbac18a434f4504fce8f2173eb544080bf6f50d62caa41bb8724b13083
 DIST coq-8.9.1.tar.gz 6001970 BLAKE2B f65498e2485c59f4f95d2afeac35750ebf85b5af6db7c269a11635f2414df483d4cb159557060c9118de25f4922176f54d2e5c6f12174599371348341cb4d80f SHA512 66344f801b955d1b6daf3ab1d704551070c95cf9032ae74f15fb33f7ec313812b3e05c0ec277a2eb448e3fdfd9721df06d36612e2fb4928b6530d70147f1d983
-EBUILD coq-8.12.0.ebuild 1823 BLAKE2B 84da9000cdaf8ae40283fca252940fec5ca491766998e644450fd506f001baa2cf686cb28e9ea6d669927f6cca4eb9fa33f65d5c097bb953e42921227b601ca6 SHA512 9c1025360c6cb55f420f75a2f9d6aec7964bbf76db4494f4e4fa948d3e4a939dcea52f69943e1bc2baabe0fed983fcd756bc502090462b81c2933db8ba1cb4a2
+EBUILD coq-8.11.2.ebuild 1828 BLAKE2B d07bc2a17b827c6e063e45b8f025b492405d30ce6e1a5e8e297bdc4395da7a3d2f7bf8f5ad25e6258aad3a386f5cbf22bae5a75c442539ba88845e52b151f3f1 SHA512 f1b63d03e3e0a22c6491171ea481f44bbb178783ad7d8dff90e96dca6aa3b28392e4d05366f6bbfd6fcc7417f4a01349f206a994c5eef3b07adb64b3deb43184
+EBUILD coq-8.12.0-r1.ebuild 1826 BLAKE2B a19aefc94ef90a5bbefad421a64ce70d67f4300f565b3a3bc26ecee6388a753f3e711ab738effdc9a9afa26b65fa608a2e938b8299d1ce10502fc9275caa84d9 SHA512 6f25da4262d515986f1f1c8535e8cd0b4b4d539bc4ce1d8afc4dd43710b15db8ce7db8b59a6699c0d816356f3a2ca87ac91eb57ae57bc709a545403fb6868158
+EBUILD coq-8.13.0.ebuild 1800 BLAKE2B 62589bd54d8387dd7b6edc0a04708c2288b35c470dbffdb97046eee76d5e1c870616c6695179b3c5aef83da39eb125886e3645a51ad9124afe5ccc527f6de577 SHA512 e02446464e6d91f599168329238e9f51e79c0b3400864e8e2a64fff90616c2df44f490a2b3a7a3d12d9b2394397614fdf36ce52158c1ed5a5e4e85eed894b9ae
 EBUILD coq-8.6.1-r1.ebuild 2007 BLAKE2B e11542ca13987c776b7dd4b181a4e369381d5b4bf16d61e2ba06b77d7c26e93295a18040ca757b02df492fb034f8852e9d340f52dbd22e7dde8cefaf60fe14f8 SHA512 b26850dc5f062a938a6974c1b49eb6f09645c75cdbac945262919be3d13c46e897d839ea063258868c6e6785cdeb31fc41152c2ffc0b412ca3b152e5ea89ffbc
 EBUILD coq-8.9.1-r1.ebuild 1884 BLAKE2B d060bd67a71bbe9cfc8c73ec578ca19565f88b671f667305ffbf7a911f46de8040918848321cbebee6c7957d566638007b634a0909ff8603497ca2ef71607a7f SHA512 76d68162cfc431547f5c499d1ffa80c1446a95e2f96c414830a93d4d91ed65143eb0c8bf3b12ed27d3d1b4bd302e498ea1ebf783b37a8576c7c009d4681a83ef
-MISC metadata.xml 999 BLAKE2B 04e27cb6563eca4cfab69c0a73a12e2ea5cb3ccb6dc711400ebbfb4790c896ab8f7efff0da1f985596333a4f32cd6d8278e750ef90cb5f0d61728d8f453095fa SHA512 0c78334d0d352fbe268804040a4f7765fba09055e316fd67739d052fbb4048817e3136065939f763248a3cbe27daf5884f2953b887690a7593aed6b5dc7157a6
+MISC metadata.xml 1052 BLAKE2B c753067972f26a5be88afddf96eea063047e03aff71acc4b69a20d8b9d2b4124ac5fc8f2a84f66ff60281de288baa4c9b473738f87225db16ca4c69430174f7d SHA512 8811ecdefbfda7d1f41ecf10578b77e7c821956b0ec9267c4bdf44bb8f6adedd6b1031ca9deea0b1a8595a3dcab530c8fa07d6046fcd82d142ce510cdfdaeabb
diff --git a/sci-mathematics/coq/coq-8.12.0.ebuild b/sci-mathematics/coq/coq-8.11.2.ebuild
index f057ce34b154..184f6501ee75 100644
--- a/sci-mathematics/coq/coq-8.12.0.ebuild
+++ b/sci-mathematics/coq/coq-8.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,13 +20,15 @@ IUSE="gtk debug +ocamlopt doc"
 RESTRICT=test
 
 RDEPEND="
-	>=dev-lang/ocaml-4.11.0:=[ocamlopt?]
 	dev-ml/camlp5:=[ocamlopt?]
-	dev-ml/num:=
+	|| (
+		dev-ml/num
+		<dev-lang/ocaml-4.09.0[ocamlopt?]
+	)
 	gtk? (
 		dev-ml/lablgtk:3=[sourceview,ocamlopt?]
 		dev-ml/lablgtk-sourceview:3=[ocamlopt?]
-		)"
+	)"
 DEPEND="${RDEPEND}
 	dev-ml/findlib
 	doc? (
diff --git a/sci-mathematics/coq/coq-8.12.0-r1.ebuild b/sci-mathematics/coq/coq-8.12.0-r1.ebuild
new file mode 100644
index 000000000000..b1c11d4f6633
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.12.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk debug +ocamlopt doc"
+
+RESTRICT=test
+
+RDEPEND="
+	dev-ml/camlp5:=[ocamlopt?]
+	|| (
+		dev-ml/num
+		<dev-lang/ocaml-4.09.0[ocamlopt?]
+	)
+	gtk? (
+		dev-ml/lablgtk:3=[sourceview,ocamlopt?]
+		dev-ml/lablgtk-sourceview:3=[ocamlopt?]
+	)"
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+	doc? (
+		media-libs/netpbm[png,zlib]
+		virtual/latex-base
+		dev-tex/hevea
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-latexextra
+		)"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	ocaml_lib=$(ocamlc -where)
+	local myconf=(
+		-prefix /usr
+		-bindir /usr/bin
+		-libdir /usr/$(get_libdir)/coq
+		-mandir /usr/share/man
+		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
+		-docdir /usr/share/doc/${PF}
+		-configdir /etc/xdg/${PN}
+		)
+
+	use debug && myconf+=( -debug )
+	use doc || myconf+=( -with-doc no )
+
+	if use gtk; then
+		if use ocamlopt; then
+			myconf+=( -coqide opt )
+		else
+			myconf+=( -coqide byte )
+		fi
+	else
+		myconf+=( -coqide no )
+	fi
+
+	use ocamlopt || myconf+=( -byte-only )
+
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake STRIP="true" -j1 world VERBOSE=1
+}
+
+src_test() {
+	emake STRIP="true" check VERBOSE=1
+}
+
+src_install() {
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
+	dodoc README.md CREDITS
+
+	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+}
diff --git a/sci-mathematics/coq/coq-8.13.0.ebuild b/sci-mathematics/coq/coq-8.13.0.ebuild
new file mode 100644
index 000000000000..0bb383826cd3
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.13.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop findlib
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk debug +ocamlopt doc"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/zarith
+	|| (
+		dev-ml/num
+		<dev-lang/ocaml-4.09.0[ocamlopt?]
+	)
+	gtk? (
+		dev-ml/lablgtk:3=[sourceview,ocamlopt?]
+		dev-ml/lablgtk-sourceview:3=[ocamlopt?]
+	)"
+DEPEND="${RDEPEND}
+	doc? (
+		media-libs/netpbm[png,zlib]
+		virtual/latex-base
+		dev-tex/hevea
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-latexextra
+		)"
+
+src_configure() {
+	ocaml_lib=$(ocamlc -where)
+	local myconf=(
+		-prefix /usr
+		-bindir /usr/bin
+		-libdir /usr/$(get_libdir)/coq
+		-mandir /usr/share/man
+		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
+		-docdir /usr/share/doc/${PF}
+		-configdir /etc/xdg/${PN}
+	)
+
+	use debug && myconf+=( -debug )
+	use doc || myconf+=( -with-doc no )
+
+	if use gtk; then
+		if use ocamlopt; then
+			myconf+=( -coqide opt )
+		else
+			myconf+=( -coqide byte )
+		fi
+	else
+		myconf+=( -coqide no )
+	fi
+
+	use ocamlopt || myconf+=( -byte-only )
+
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake STRIP="true" -j1 world VERBOSE=1
+}
+
+src_test() {
+	emake STRIP="true" check VERBOSE=1
+}
+
+src_install() {
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
+	dodoc README.md CREDITS
+
+	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+}
diff --git a/sci-mathematics/coq/metadata.xml b/sci-mathematics/coq/metadata.xml
index 3dd30ec86367..c08f4cb96842 100644
--- a/sci-mathematics/coq/metadata.xml
+++ b/sci-mathematics/coq/metadata.xml
@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  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.
-  In particular, Coq allows:
-  * the definition of functions or predicates,
-  * to state mathematical theorems and software specifications,
-  * to develop interactively formal proofs of these theorems,
-  * to check these proofs by a small certification "kernel".
-  Coq is based on a logical framework called "Calculus of Inductive
-  Constructions" extended by a modular development system for
-  theories.
-</longdescription>
-  <use>
-    <flag name="camlp5">Build using camlp5. This is required for some plugins like Ssreflect.</flag>
-  </use>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+	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.
+
+	In particular, Coq allows:
+	* the definition of functions or predicates,
+	* to state mathematical theorems and software specifications,
+	* to develop interactively formal proofs of these theorems,
+	* to check these proofs by a small certification "kernel".
+
+	Coq is based on a logical framework called "Calculus of Inductive
+	Constructions" extended by a modular development system for
+	theories.
+	</longdescription>
+	<use>
+		<flag name="camlp5">Build using camlp5. This is required for some plugins like Ssreflect.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">coq/coq</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index e152a3b9a2ec..11410f9d5ec8 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -5,5 +5,7 @@ AUX gimps.service 283 BLAKE2B db6c0c777d514aa0216c1af087418ead25561ffa950752e237
 AUX gimps.tmpfiles 38 BLAKE2B c306d739ed0a0cc8bb4c80c7051ad93326cf0054d3f7fd61c4ed8a7d518356d521f7d3c3202d0b8b69723b8e7178457a34c65e92732eb15e8e64c3dff468ae2a SHA512 61c5eda13289175cdf55704442ceab4d5391d24cfa49f04155799fc2798e5ad5f1e624802e1c04b99685b1560f9898d1b0fc0c15c82251d1a765dd5de93024d8
 DIST p95v303b6.linux32.tar.gz 5702312 BLAKE2B 728c8b8e7e2b5187dc8126bccc5e2c165fbfbc0900d6c35517cd21b78e5292df143641e3766cc0146918062039b1eecab568f9b278f64b1b9197ee2f775603b9 SHA512 3e06fb77be07334949ece3ae152bdf5491f0b7f8e33e0e8ed2af3c34332841975a9514d1993ed2355abfa4e09f93e42093d02f96dc30c3471ae9f974cc2de11a
 DIST p95v303b6.linux64.tar.gz 7046127 BLAKE2B 9cde9c2670203071cfc463434a47c8123064cb232bfeb25d8767cad2c25ea75b395e2ec135b7b4a6dc9616e9d6b05ead371e1083274a82468f62a0e1de93c98f SHA512 6d6ded9a1724993d42adee28d400b0337835c52a4ce42271e62efb37134adfc6f017f55475860fbc1224e377a227ef8547b8852a35c082c37e996f4a1c1b570c
+DIST p95v304b8.linux64.tar.gz 7163830 BLAKE2B 248a2d5343e25fd9153294bf8e84a59253f28feb7ede8147b73d08077a107c63e0209adfd48845f64ce51e06cd32aec966e4a36ef20e1c30df4f0be0d4978d86 SHA512 b4f89c89714e738f468f085ac9902db0b62cad720a926f91cf8dbe25153e41a207e1c10a5d74136976994b9d1ca312653e6b91536ed3d57bc44760055143f4b3
 EBUILD gimps-30.3.6.ebuild 1808 BLAKE2B 3483a73734d0b0008c992a946d36558f1e8ac93872a46bf80d79bb21ae65720c5614df1e1380fb15c2db2537559bc1969fc90dba0614afef1c2f8a6419ea996d SHA512 0dd32cf22373ec922a2716afc7f60ed5af2b0f76ba8f91b94eef891b1137b1dc597f0aca3609f76cb56b3f90b973953decd946d37e02cb6a1db1df1fd81c55a4
+EBUILD gimps-30.4.8.ebuild 1798 BLAKE2B b90eb57316e3cb619ecc84ea1e8a86e0f5ff1ca57f99a1a6bf7b603b3ce555335e5b13792b42347340bcc09c40e5f15ebd957e4c6b534f2dd2742c22330a61a4 SHA512 e9c7147cd7b9488273406c3f2085e34650e961cd29ac8f1f2314a6828edcaa9e2f70600b33aa3186f34f0d4acd21b62f440ebdfda79a4a6e713fd39b4104c88d
 MISC metadata.xml 529 BLAKE2B a6e3550d128d6c4801029726feb868aa1cd1017b8a2f6f7ebbb3743a7b2190d40db06d22eb4f8ce94e35ab5e6b1f213afdf179fe7777501ad87457be43d9af44 SHA512 a7fb9bd05f987e1d48a04b70e78cbb3906927197793870435fee8b68dd9da623a68fc30ca96d0173952414d9741674ba2cc2c3f821dfd7b302f91f09e887a362
diff --git a/sci-mathematics/gimps/gimps-30.4.8.ebuild b/sci-mathematics/gimps/gimps-30.4.8.ebuild
new file mode 100644
index 000000000000..59980c5dd0c3
--- /dev/null
+++ b/sci-mathematics/gimps/gimps-30.4.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="The Great Internet Mersenne Prime Search"
+HOMEPAGE="https://www.mersenne.org/"
+
+# The author has finally caved in to the pressure of putting the build
+# number in the package name. Some dark magic necessary to get to the
+# package name
+
+MY_PV=$(ver_rs 2 'b' )
+
+SRC_URI="
+	amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux64.tar.gz )
+	"
+
+SLOT="0"
+LICENSE="GIMPS"
+RESTRICT="mirror bindist"
+KEYWORDS="-* ~amd64"
+
+# 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
+# ones and try to cover the .so deps with the packages listed in RDEPEND.
+# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
+
+DEPEND=""
+RDEPEND="net-misc/curl
+	>=dev-libs/gmp-6.1.2"
+
+S="${WORKDIR}"
+OPTINSTALLDIR="/opt/gimps"
+
+QA_PREBUILT="opt/gimps/mprime"
+
+DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
+
+src_install() {
+	dodir ${OPTINSTALLDIR}
+	keepdir /var/lib/gimps
+	pax-mark m mprime
+	cp mprime "${D}/${OPTINSTALLDIR}" || die
+	fperms a-w "${OPTINSTALLDIR}/mprime"
+	fowners root:0 "${OPTINSTALLDIR}"
+	fowners root:0 "${OPTINSTALLDIR}/mprime"
+
+	einstalldocs
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
+	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	echo
+	einfo "GIMPS data files were not removed."
+	einfo "Remove them manually from /var/lib/gimps/"
+	echo
+}
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 146379e26933..28420b80883e 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -2,5 +2,5 @@ AUX ginac-1.5.1-pkgconfig.patch 340 BLAKE2B 4e45d5af711f0a6bb833bd805340527be897
 DIST ginac-1.6.6.tar.bz2 1028211 BLAKE2B 3f939e82cfa833ee5ba6714d4db38edf80de4e380b0bcacfe23992ca3c5eefbd719506cf77f57aebc1517968eff7d26c8d24d14167c596e5e7145458367074e8 SHA512 495ef255dd32e71ee91257a515c0566e56525e0c54c8955c19beaf9e2e55457f7d8171c7e5f6e4f29f555f5d262bbaf4edf4f033166c4904c016987a5029e958
 DIST ginac-1.7.11.tar.bz2 1077491 BLAKE2B 741e9c8adfec15c225c3656b935707f86292b98310b50533269b238d1a9746bf54d186074c879fdbdd23f915dde225d9ee34fdbd87977835e8f9e78af364d77d SHA512 35a029915c946fcc10ba7b78df6fe1ece9a9f2f6bc172816a923c35f5b495154ab356526b904ac2a16a1bd6b0a81c480c5abb39ef40238ca7b32d1acbf97276c
 EBUILD ginac-1.6.6.ebuild 1400 BLAKE2B 7813592727485b9e4ffe56a4f5cbde1250823b239e621fdbbcd9485b25ab0062efc4cd09cdf2556c19fbaee1b34c8ab2b27d001f3b16c19fce5f748ad093b9ec SHA512 363562d721e28744c64b535404e8bab606c040df3d36af53b5e04156401db9c88210ed623317cd52a482b276585dc3741b3233cc0cf942abd2f1d55a790db8a3
-EBUILD ginac-1.7.11.ebuild 1628 BLAKE2B 3810a7bdde0344d086b8c00155a790e4e078aa163d4fb6645705102b97f0359d9ea39255094efec33dcaebf14e78d86c04057e73ed2272879a16773a0b41c41f SHA512 3f8db3ec36c581e6ec15f628fecc19c08816c6a90d0f0d7a279220aa1aa303115f40b5729f4febcf7a8409b42e591b6b82ee254c997c2da8df79268e1b1d139c
+EBUILD ginac-1.7.11.ebuild 1474 BLAKE2B 80960c7c7d3b8aa3196c3bb606abca7d174e02ab3e7048ce267ac74b37ad4dde177581274c081e81237f9fc366eb3c64a29239a3f13ca352dad5db1e87ade20a SHA512 2ace30976f57eb93dca8b6a4dbf851b9ac5bcdfdc09ad6dc0838358a55784e04168266e5281eab8d4096c699bc8c02b44f600a1c80d7d11be3d590c8b7d19f0c
 MISC metadata.xml 685 BLAKE2B 78804186606452771e8b37a00dd41458fd7ffabd1813303528cda8596cebdd54c5daea16f324b7d23dfcf679255e73f1cff84116b0bf8a81cd79bb559dcd77ae SHA512 d0075823063455623b875bf678448b146243347879eb9ca5a4fb9324183d8dcda9c060145d5b874fead55491625ef08289b349b8abf1bf105e09ac9ebc647c37
diff --git a/sci-mathematics/ginac/ginac-1.7.11.ebuild b/sci-mathematics/ginac/ginac-1.7.11.ebuild
index bd90fbd5c1b4..6bd2388f1c08 100644
--- a/sci-mathematics/ginac/ginac-1.7.11.ebuild
+++ b/sci-mathematics/ginac/ginac-1.7.11.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib flag-o-matic
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-any-r1
 
 DESCRIPTION="C++ library and tools for symbolic calculations"
 SRC_URI="http://www.ginac.de/${P}.tar.bz2"
@@ -11,59 +13,63 @@ HOMEPAGE="https://www.ginac.de/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
 
 RDEPEND=">=sci-libs/cln-1.2.2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		   media-gfx/transfig
-		   virtual/texi2dvi
-		   dev-texlive/texlive-fontsrecommended
-		 )"
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-fontsrecommended
+		media-gfx/transfig
+		virtual/texi2dvi
+	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch )
 
 src_configure() {
-	append-cxxflags -std=c++14
-	econf --disable-rpath $(use_enable static-libs static)
+	econf \
+		--disable-rpath \
+		--disable-static
 }
 
 src_compile() {
 	emake
+
 	if use doc; then
-		export VARTEXFONTS="${T}"/fonts
-		pushd doc/reference >> /dev/null || die "pushd doc/reference failed"
-		emake html pdf
-		popd >> /dev/null
-		pushd doc/tutorial >> /dev/null || die "pushd doc/tutorial failed"
-		emake ginac.pdf ginac.html
-		popd >> /dev/null
+		local -x VARTEXFONTS="${T}"/fonts
+		emake -C doc/reference html pdf
+		emake -C doc/tutorial ginac.pdf ginac.html
 	fi
 }
 
-src_test() {
-	pushd ../${P}_build > /dev/null
-	emake check
-	popd > /dev/null
-}
-
 src_install() {
 	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN}.la || die "cannot rm lib${PN}.la"
-	fi
+
 	if use doc; then
-		pushd doc > /dev/null || die "pushd doc failed"
+		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 "${S}"/doc/examples/*.cpp examples/ginac-examples.*
-		popd > /dev/null
+		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/lrcalc/Manifest b/sci-mathematics/lrcalc/Manifest
index ebb0893fd0b1..e12cfc825d1b 100644
--- a/sci-mathematics/lrcalc/Manifest
+++ b/sci-mathematics/lrcalc/Manifest
@@ -1,4 +1,6 @@
 AUX lrcalc-1.2-includes.patch 1939 BLAKE2B 37dc25d9219899cf9cd6268038715b927af294135f1acbebf5651fdfdcb50f7b041e53464c36f572201be411941d889b5ef7c1a20e31eda9915339ec378faf0b SHA512 d5ad549ddf23609870f6b15e389323bf26ea2c981c4af28c93dae7f70b4f7c96e242011213acb7c138ba9acc0ce0bc0c41d51d3fccf4cc5de331a12d965a46a6
 DIST lrcalc-1.2.tar.gz 363120 BLAKE2B d3f652abfe38e81331dcbac7068d087b198445bf02dc5ccb5bcbd76b9bbc329687209e6ccf40ecd09f166e7d2da054edd0e5c2b18503d8e4d961ae4ad91b5152 SHA512 699f4c2ddabe5879542d5c11f3df3979a4e009ad37741711a70fb48b4a0d4a7969e5bb110adb63d4473f3c2b61d1efdb7228a6b74c5dd7e1b5aea8cf1d170fab
+DIST lrcalc-2.0.tar.gz 420728 BLAKE2B 4d14276cf04cb1655d74bf9b85e12379034f43232db9b1a77db8ca4a508e5b490845fe44f4cfd533990bc567e51e817ca82aa917fce40517b8c8c9fc7dd2b4d3 SHA512 9224d1be971f53c0428f6f9a25850a892596175a6b5d6ca90b06abed00a72998b54fdfcd2be62318af142595f752b3a9ccc2efc1816ba7ce3ae59ecb43c49f81
 EBUILD lrcalc-1.2.ebuild 592 BLAKE2B faf95fcf9ad635380d47df7f691346cf7507fa858b4ed608071b9e50007bf271905e2fd7bbbf8dc73e203f0bcb8f0474ad8836268e7fb3f8bd80d7cbb02669dc SHA512 256609e7771b5fa1125d464de13631b6b0244ad1f6a55614f9a436dfe35dfd8344160202db02b4ebb99b299ad4773d8b7c5147097f981cf6728b431cd7d721e8
+EBUILD lrcalc-2.0.ebuild 542 BLAKE2B 6d0391e8749c80a7de030593ebc68241114b03258f3175ffcae437167b8ba009c7141d69595b73b1126ef94a8b9acc3a6589b9f582d98496ed971b6fe7837915 SHA512 a079da9b2c0ac7d184cb34f7370a32dd5bdc62e1ca6a9f20c955baf0d6a1b21185bf2afa9c5d1e2ff40f03fd8dd513f8f00923a25394c0b23c668f6982139c7a
 MISC metadata.xml 834 BLAKE2B d230c80d9552789e93a2f2cc9e1a8eac968d4762ceeba6103f92676cb709d45bf39b2b6820e889d11ad30c60493aec84076d8ee3f5f038640038655f3e2c5a07 SHA512 f54cc63235625646117f0d569fb69c3b3b66b5508fb65a65a3fb92811ff44f72df7546d44728f5882d2db9b70520036ccfda05cb58d9cf9dd3164132dbebbc57
diff --git a/sci-mathematics/lrcalc/lrcalc-2.0.ebuild b/sci-mathematics/lrcalc/lrcalc-2.0.ebuild
new file mode 100644
index 000000000000..194251793e74
--- /dev/null
+++ b/sci-mathematics/lrcalc/lrcalc-2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Littlewood-Richardson Calculator"
+HOMEPAGE="https://sites.math.rutgers.edu/~asbuch/lrcalc/"
+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"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/nestedsums/Manifest b/sci-mathematics/nestedsums/Manifest
index f28e1f25897b..19f9bbd1bd75 100644
--- a/sci-mathematics/nestedsums/Manifest
+++ b/sci-mathematics/nestedsums/Manifest
@@ -1,3 +1,3 @@
 DIST nestedsums-1.5.2.tar.gz 511806 BLAKE2B 9c40f4b3405134ea058aad356e131b29f7f0a058b68ed3081bbcc51d451e850bccd8ec26448a8ac391524913da7eccbce4fae1b9e4119c8692b8fca59a17d885 SHA512 2b7dd54e02695a741bbe8cc0b45a3804dc7c1cb6d0b46ad7c152489e952718b438b84d60b844ff0ed92b32c78186dac2d4ee8e705ad82f965bbec923c1970d33
-EBUILD nestedsums-1.5.2-r1.ebuild 996 BLAKE2B 859641ac39630571df447b112d3e2a85afd9e2a75b42f68c25cf946aabfc69df6e9a24bb419b3309a2ebd265e009c04aa6c95531bdfcb07b7b47ebf21a01d85e SHA512 1b56798b8eb0f3dde04b62e9d7a6250c2687a95dc17e45ffa8c33325d604a68c7ab94f05f80c2bb264181ff347892e8759bb4c5ce40e663c067e9d54d16cb51e
+EBUILD nestedsums-1.5.2-r1.ebuild 818 BLAKE2B 6514285ad73d50a6fdc94a6cdcfd6a0c86b41de234809240dea3cace5f95d0a4b42938aa42b5929704ee6aafbb295cbe1b585ff2e48627e1a4b7ace4c6136630 SHA512 c3e297b7cf67abd318176db5966dcdad56ab7dabf20ea26c2d2569f86ab92ad64e7cc05cc18a992740fe60d11e82bfe35f093b5be9ea528633c295baf68f90bb
 MISC metadata.xml 372 BLAKE2B d589eae4a189062cd16fdf18c36e36ba8816cc9e6c50945693296b755151e3e0db0e15715f1f08cf330ddd47330c9a36b4fe3460452e3bb97ae9ee3c7d280d22 SHA512 76123e8eaa43ad123a54600811325333ebe9306cebe4868f24af23928ab375df5a222b2e8ebab9247fc05fde2f90caf3b57e45fbcf2fbc90e6dd79df28862626
diff --git a/sci-mathematics/nestedsums/nestedsums-1.5.2-r1.ebuild b/sci-mathematics/nestedsums/nestedsums-1.5.2-r1.ebuild
index 99a09d617d4b..862b5e97fa20 100644
--- a/sci-mathematics/nestedsums/nestedsums-1.5.2-r1.ebuild
+++ b/sci-mathematics/nestedsums/nestedsums-1.5.2-r1.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="A GiNaC-based library for symbolic expansion of certain transcendental functions"
 HOMEPAGE="https://particlephysics.uni-mainz.de/weinzierl/nestedsums/"
-IUSE="doc static-libs"
 SRC_URI="http://particlephysics.uni-mainz.de/weinzierl/download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RDEPEND=">=sci-mathematics/ginac-1.7[static-libs=]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+IUSE="doc"
+
+RDEPEND=">=sci-mathematics/ginac-1.7"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
 	append-cxxflags -std=c++14
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_compile() {
@@ -26,20 +28,11 @@ src_compile() {
 
 	if use doc; then
 		doxygen Doxyfile || die "generating documentation failed"
+		HTML_DOCS=( reference/html/. )
 	fi
 }
 
-src_test() {
-	emake check
-}
-
 src_install() {
-	emake DESTDIR="${D}" install
-	rm "${D}"/usr/$(get_libdir)/lib${PN}.la || die "cannot rm lib${PN}.la"
-	dodoc AUTHORS ChangeLog
-
-	if use doc; then
-		docinto html
-		dodoc -r reference/html/.
-	fi
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index a2a63949dfa3..d22aab801b3b 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -1,8 +1,13 @@
 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
+AUX why3-for-spark-2020-flags.patch 841 BLAKE2B bc6b02a65cff3c705368a6612dcb1764c56c0aa5bade48ce79e5b8f75e36d6bc0b92257caea7bd531c92a8827d7c532875d6470e1dd4486863f320951061a865 SHA512 ea4148711def812c8fc7259ad046e6e29f383bd889c2fffea36cd8558026a3cba84702e47f06c372dc26c43dff87f5b5dbe98a162648d612059a5adc15c6415f
+AUX why3-for-spark-2020-gentoo.patch 332 BLAKE2B d71897d1d253a95f2a783483ee7bb0d243961cbc7218e05f3717a95388da0613e3f162a39cb4dac816035d6381ac69f189e352f2d83530b70b46b2439f7b92c3 SHA512 766de53c5cdede4bfdbac671851ec7de5060712622d4c89ce9117ef31596c2e4bd938bd2fe50d6a969f93ae252c40c83c2f782ad710fd52ab652434765483f90
+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-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
 EBUILD why3-for-spark-2018.ebuild 1729 BLAKE2B 14002f870711eaf350aa38c4fa8bcf3947585e08c873b6d9509756009caae20f52d389db22ef288c4c92146622ee43053cf784013331b638d6370278c5189772 SHA512 e3fac3fafa90980c2d3cf068e19477baa45cb01f517ee5dc235a7984f07f8dffb95f6ef329082bf6d5e88cfb8b02ae617b509010fdbb448644c3742b22d1733f
 EBUILD why3-for-spark-2019-r2.ebuild 3000 BLAKE2B c6f405a6e36086f7763e1717f610d2c3139e48ef259652b5489be6d0ac536efe17cada609b693e7d0d848d1c5a4d6b321015e03d7ee2f2ebff71a9ef23b08620 SHA512 27a484e227f693ad50b026e658bbe0fbdc230f7a96ee30115e8fe38149ebc9e574c638fa9e0012b6099aa5a03df3ac83ae5800b611ef6ad2406b18571831109a
+EBUILD why3-for-spark-2020.ebuild 2929 BLAKE2B 9a6dd9ee12f38a9c90899759318b7b4934bcdeb109320900c43b8b07f945f28988b8745771d88a3e284df2318280d08ea23cd72f4fd6fd98e23d3e7882990bb9 SHA512 eec3c1e053b2baaa97ef2808a4ccbff43358af9469e18cb14e30ceca043da68c3ec2ed848feff1cd1aeb0f31ef89f40cf192a9d47f9f8af11e0a487da8fba5ac
 MISC metadata.xml 1363 BLAKE2B 820bfc974ca6984f78340f223f8f19d12f0313016118110a35cfe149129c2dc189d6f03f34bf3d30c9d3e5d9c9ab90bba33dca4320c034821a7a89f97b92a7f9 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-bibtex.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-bibtex.patch
new file mode 100644
index 000000000000..bcc4762641b9
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-bibtex.patch
@@ -0,0 +1,11 @@
+--- a/doc/conf.py	2021-02-08 20:09:27.000629537 +0100
++++ b/doc/conf.py	2021-02-08 20:10:04.653994573 +0100
+@@ -34,6 +34,8 @@
+     'why3'
+ ]
+ 
++bibtex_bibfiles = ['manual.bib']
++
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+ 
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-flags.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-flags.patch
new file mode 100644
index 000000000000..2e5247ac3fa6
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-flags.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.in	2020-06-12 21:03:33.375534124 +0200
++++ b/Makefile.in	2020-06-12 21:03:48.623283408 +0200
+@@ -121,7 +121,7 @@
+ 
+ WARNINGS = A-4-9-41-44-45-50-52@5@8@48
+ 
+-FLAGS = -w $(WARNINGS) -safe-string -keep-locs -bin-annot -dtypes -g $(INCLUDES)
++FLAGS = -w $(WARNINGS) -safe-string -keep-locs -bin-annot -dtypes -g $(INCLUDES) -cclib "$(LDFLAGS)" -ccopt "$(CFLAGS)"
+ OFLAGS = $(FLAGS)
+ BFLAGS = $(FLAGS)
+ 
+@@ -664,13 +664,13 @@
+ all: $(TOOLS)
+ 
+ lib/why3server$(EXE): $(SERVER_O)
+-	$(CC) -Wall -o $@ $^
++	$(CC) -Wall $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ lib/why3cpulimit$(EXE): $(CPULIM_O)
+-	$(CC) -Wall -o $@ $^
++	$(CC) -Wall $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ %.o: %.c
+-	$(CC) -Wall -O -g -o $@ -c $<
++	$(CC) -Wall -O -g $(CFLAGS) -o $@ -c $<
+ 
+ uninstall-bin::
+ 	rm -f $(LIBDIR)/why3/why3server$(EXE) $(LIBDIR)/why3/why3cpulimit$(EXE)
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-gentoo.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-gentoo.patch
new file mode 100644
index 000000000000..47daa3e69908
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2020-gentoo.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.in	2020-05-27 21:19:08.736241502 +0200
++++ b/Makefile.in	2020-05-27 21:19:14.042156954 +0200
+@@ -50,7 +50,6 @@
+ OCAMLINSTALLLIB  = $(DESTDIR)@OCAMLINSTALLLIB@
+ OCAMLBEST = @OCAMLBEST@
+ OCAMLVERSION = @OCAMLVERSION@
+-CC        = gcc
+ COQC      = @COQC@
+ COQDEP    = @COQDEP@
+ FRAMAC_LIBDIR = $(DESTDIR)@FRAMAC_LIBDIR@
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild
new file mode 100644
index 000000000000..8fd579c6c8d4
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MYP=why3-${PV}-20200429-199EF-src
+
+DESCRIPTION="Platform for deductive program verification"
+HOMEPAGE="http://why3.lri.fr/"
+SRC_URI="https://community.download.adacore.com/v1/8bb5801e17b8b23453262da69c981c091959eec7?filename=${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="coq doc emacs gtk html +ocamlopt zarith zip"
+RESTRICT="strip"
+
+DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=]
+	>=dev-ml/ocamlbuild-0.14.0
+	dev-ml/menhir:=
+	<dev-ml/num-1.4:=
+	dev-ml/yojson:=
+	coq? (
+		>=sci-mathematics/coq-8.9.1
+		<sci-mathematics/coq-8.12
+	)
+	doc? (
+		dev-tex/rubber
+		dev-python/sphinx
+		media-gfx/graphviz
+		dev-python/sphinxcontrib-bibtex
+	)
+	gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	html? ( dev-tex/hevea:= )
+	zarith? ( dev-ml/zarith:= )
+	zip? ( >=dev-ml/camlzip-1.07:= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-bibtex.patch
+)
+
+QA_FLAGS_IGNORED=(
+	/usr/lib64/why3/commands/why3shell
+	/usr/lib64/why3/commands/why3extract
+	/usr/lib64/why3/commands/why3execute
+	/usr/lib64/why3/commands/why3prove
+	/usr/lib64/why3/commands/why3wc
+	/usr/lib64/why3/commands/why3doc
+	/usr/lib64/why3/commands/why3replay
+	/usr/lib64/why3/commands/why3webserver
+	/usr/lib64/why3/plugins/'.*'.cmxs
+	/usr/lib64/ocaml/why3/why3.cmxs
+	/usr/lib64/ocaml/why3/why3extract.cmxs
+	/usr/bin/why3
+	/usr/bin/why3config
+	/usr/bin/why3session
+	/usr/bin/gnat_server
+	/usr/bin/gnatwhy3
+	/usr/bin/why3realize
+)
+
+REQUIRED_USE="html? ( doc )"
+
+src_prepare() {
+	find examples -name \*gz | xargs gunzip
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-pvs-libs \
+		--disable-isabelle-libs \
+		--enable-verbose-make \
+		$(use_enable coq coq-libs) \
+		$(use_enable doc) \
+		$(use_enable emacs emacs-compilation) \
+		$(use_enable gtk ide) \
+		$(use_enable html html-pdf) \
+		$(use_enable ocamlopt native-code) \
+		$(use_enable zarith) \
+		$(use_enable zip)
+}
+
+src_compile() {
+	emake -j1
+	if use ocamlopt; then
+		emake byte
+	fi
+	use doc && emake doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install
+	emake DESTDIR="${D}" -j1 install-lib
+	emake DESTDIR="${D}" install_spark2014_dev
+	local cmdPath=/usr/$(get_libdir)/why3/commands
+	dosym ../why3server ${cmdPath}/why3server
+	# Remove duplicated files
+	for filename in config ide realize server session; do
+		if [[ -e "${D}"${cmdPath}/why3${filename} ]]; then
+			rm "${D}"${cmdPath}/why3${filename}
+			dosym ../../../bin/why3${filename} ${cmdPath}/why3${filename}
+		fi
+	done
+	rm "${D}"/usr/$(get_libdir)/why3/why3cpulimit
+	dosym ../../bin/why3cpulimit /usr/$(get_libdir)/why3/why3cpulimit
+
+	einstalldocs
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r examples
+	if use doc; then
+		use html && dodoc -r doc/html
+	fi
+}
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 785fb93c3757..8c1675fd8dc4 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,5 +1,7 @@
 DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e
 DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb
+DIST wxmaxima-21.01.0.tar.gz 16220587 BLAKE2B b987e8c44c253484d152092093ab9154b7c2a5817c584bc1a4f4a0e5beec3ec2e0bc6995aea6ba28df2223b039ca97905225cc2524840174b2c99a5f7774dab2 SHA512 aec5aa5d3a9883e9b21b890c133684004576411a8341f3913ae548175979ad1f07a16d0fccd24c7757d40f4d06b4070b00fa7ef54f73f26b99c825e03e2a408b
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
 EBUILD wxmaxima-20.12.2.ebuild 1433 BLAKE2B aab53bc0b36e755aeb883cf18b2a9dc74e6420478765b351c920f2937f6970a20524d31833da7d51730bd7a5955f998e2968cf36d3a48b8122f2eac339b04f8a SHA512 32773324509bc19466c91a43c39050f25a4922f67eac211a117ec6f69be379881f5615a4d000176c0fb490bd91a7534f75038867e4e91064d1ea1b59fcb79570
+EBUILD wxmaxima-21.01.0.ebuild 1433 BLAKE2B aab53bc0b36e755aeb883cf18b2a9dc74e6420478765b351c920f2937f6970a20524d31833da7d51730bd7a5955f998e2968cf36d3a48b8122f2eac339b04f8a SHA512 32773324509bc19466c91a43c39050f25a4922f67eac211a117ec6f69be379881f5615a4d000176c0fb490bd91a7534f75038867e4e91064d1ea1b59fcb79570
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild
new file mode 100644
index 000000000000..a76a6aeeb045
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
+inherit cmake wxwidgets l10n xdg
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
+SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+S="${WORKDIR}"/${PN}-Version-${PV}
+
+DEPEND="
+	dev-libs/libxml2:2
+	x11-libs/wxGTK:${WX_GTK_VER}"
+RDEPEND="${DEPEND}
+	media-fonts/jsmath
+	sci-visualization/gnuplot[wxwidgets]
+	sci-mathematics/maxima"
+
+src_prepare() {
+	setup-wxwidgets
+	cmake_src_prepare
+
+	sed -e "s|GPL.txt ||g" -e "s|share/doc/${PN}|share/doc/${PF}|g" -i CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i info/CMakeLists.txt \
+		|| die "sed info/CMakeLists.txt failed"
+
+	# locales
+	rm_po() {
+		rm locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
+		rm -f locales/manual/${1}.po
+		rm -f info/${PN}.${1}.md
+		rm -f info/${PN}.${1}.html
+		sed -e "\\|/${1}/wxmaxima.1|d" -i data/CMakeLists.txt
+	}
+	l10n_find_plocales_changes locales/wxMaxima '' '.po'
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}
+	cmake_src_install
+}