gentoo resync : 16.04.2022

11 files changed, 195 insertions, 281 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 9ed66c372a37..fe50675b1a46 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index 4dbe9e2ac57e..da5632ef448d 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,5 +1,7 @@
 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
+DIST alt-ergo-2.4.1_p20220407.tar.gz 2884310 BLAKE2B aaa31242de3ffe3f804de1e47fb740593812991e60eb583339ec0e1c56caa40b3c7f14108d068a1dbcbd7efc0d8fc96f1ba652a77c03170bddef90931a44c12c SHA512 4c353a359c92e121859f84455bb98bd80c0d33bb2001d6f2998a822e6b3dd65c9c56b0bdcaf93e52863afd8e999de6939d05859b5fc6de2ed9689c1d083bba0a
 EBUILD alt-ergo-2.3.0.ebuild 1207 BLAKE2B 395779b3fa2c360a9162ee18b5a8266f978ac96ac09e4da308efbb3f3eabc1cff770c2404dd1e2c0531d8b74b40b82e11331b5a5a69ef92bfe589ddcd7fbfa05 SHA512 d4611afe608836003b93f7e6942da711799116cffaed63ccbbbd1b36a8d8de638a5fee103d3cc751df8cb332e54e28bcaff72142b1be2a3fa1ba4bea1349b257
-EBUILD alt-ergo-2.4.1-r1.ebuild 996 BLAKE2B 028f9d965c0a4f2ca4618ffb5a5d0b70a93a8a47bda0e2a2c1228118019f4a6a7badc73929e9af6ccd0ed3c49498728fb1c2b2e4f6f33572bd3891502072120c SHA512 4f626f7b727d1766458d9f999fff8982712a784c4911844bcae5a20c5354cee8fd16302048b1cb2a1b2e83ed12209ae7fd8a5f838c2f2e8c6c5fc18b6213d8df
+EBUILD alt-ergo-2.4.1-r2.ebuild 1003 BLAKE2B 5adc8d1899e50c29fe46cbd404ea52b543acec152a0445bc858903bf01976fe19ca27c1cb5fff78c4f0cd18656d1533b4ac1fad04c2873e5a45f9290b429b6a8 SHA512 2f7d5a3aa6706254fa55c80dedb1ec5022d57d39b38bdeeb9f19f75bcdb8428ff5857a57f5dcdd6b2aed0b8fb6f5f6c65a8d13776d6c988e1f202bad5bc62b49
+EBUILD alt-ergo-2.4.1_p20220407.ebuild 1074 BLAKE2B 2b7690d870434693abf896bdb0038cf75e75e7673160749996f79b50ecc1748fcb86cfb78893d90b86d1e748724f295917b0215969c5ff356656d6405bcfbec6 SHA512 e399595aef6ee46ba3c14a9d124d6132e1992ece2b4b695e3d9da5ba60186f8d2538cdb6af1e6fecdfee436693ce8137e400f3558ce9c80af46018a25616e867
 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-r2.ebuild
index b1fc33bf89fa..bc908a192c9e 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.4.1-r1.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.4.1-r2.ebuild
@@ -18,10 +18,10 @@ RDEPEND="
 	>=dev-lang/ocaml-4.09.0:=[ocamlopt=]
 	>=sci-mathematics/psmt2-frontend-0.4.0:=
 
+	<dev-ml/cmdliner-1.1.0:=
 	>=dev-ml/menhir-20181006:=
 	>=dev-ml/ocplib-simplex-0.4:=
 	dev-ml/camlzip:=
-	dev-ml/cmdliner:=
 	dev-ml/num:=
 	dev-ml/seq:=
 	dev-ml/stdlib-shims:=
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.4.1_p20220407.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.4.1_p20220407.ebuild
new file mode 100644
index 000000000000..f76781a05972
--- /dev/null
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.4.1_p20220407.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=4e082218efe6e0e2315331580bbd08306c1f8a2d
+
+inherit dune
+
+DESCRIPTION="Automatic theorem prover"
+HOMEPAGE="https://alt-ergo.ocamlpro.com"
+SRC_URI="https://github.com/OCamlPro/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="CeCILL-C"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="examples +ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.09.0:=[ocamlopt=]
+	>=sci-mathematics/psmt2-frontend-0.4.0:=
+
+	>=dev-ml/cmdliner-1.1.0:=
+	>=dev-ml/menhir-20181006:=
+	>=dev-ml/ocplib-simplex-0.4:=
+	dev-ml/camlzip:=
+	dev-ml/num:=
+	dev-ml/seq:=
+	dev-ml/stdlib-shims:=
+	dev-ml/zarith:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ml/dune-configurator"
+
+src_prepare() {
+	default
+
+	# Remove the GTK2 GUI frontend because GTK2 in Gentoo is deprecated
+	rm -r src/bin/gui || die
+}
+
+src_configure() {
+	sh ./configure --prefix /usr --libdir=/usr/$(get_libdir) || die
+}
+
+src_install() {
+	dune-install alt-ergo-lib alt-ergo-parsers alt-ergo
+
+	use examples && dodoc -r examples
+}
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 41cdfc15117f..960e3f36382f 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -14,10 +14,9 @@ AUX support-new-vtk.patch 924 BLAKE2B 960c3342ca4374c03aff30d7d2326c6e826ffb2cb0
 AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f93b949a05de9226d19d7898daf998cbedc61a77556c923f3f6f8e57508b73f3cae117f62d214d SHA512 110db85899241e1f9ea8427ffb397737aefe0bb6286d037c2c04cfad9726838521ef6403242aeb1e4246d06f13cf83af84bba38567a99b00ed6a081f17b38ead
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
 DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
-DIST maxima-5.44.0.tar.gz 34976354 BLAKE2B d6870b6fb0581d9e60d6ed97c7daed8ce12b8b1ae49d0edb7b8d31dd723f9b879eb70440659ff958f53cee16d8d2a92f80dcaa3898d9f6dbabd79a5059073a65 SHA512 1e043bebb7c6d002c113d8de20a98d58d1a8e7bedfc9bcf52819e7c7554655991dc2f42f0333889706574249736db833a237b3e59b967e7e42ede28262e31f2f
 DIST maxima-5.45.1.tar.gz 39951932 BLAKE2B b6d67aebf34c12567ec5d08581dc22d13a902d42074abc967f8e50e029845a52a2538da8cb4382e3e28163ce11a6d8c245cfc48150cc10768250de34368acf6c SHA512 08e7a2b24324c0f0dda127d291b9d439125fa1324732b17c804c3eb68d35f87e3fc713c147472821a1781e6378b7afb0721d5da907826324ec3d24848251b7cf
+DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef
 EBUILD maxima-5.42.1-r1.ebuild 4916 BLAKE2B 838203d4b4e1d417eb35a0891cb8b9801114f53fbce2ca9910e3ecfe53932a4be96e454721e46049a4fdd84b61eb447610eb028b33860fd34b0e2d60c9595bea SHA512 77184d89fa584f92da3e691ebddab58da12733c99742d6eb835d1be2d69ff0f11bdfffa40f3c7dfe537a4ee08fc34e8d269a5cec20c60a498eb9e77f92f137ce
-EBUILD maxima-5.44.0-r10.ebuild 6372 BLAKE2B e3297b624215d728f9e2496548dd7f8120a580769a4d9a4900732b81410f6e10df28b132bb89272668ad29fbab8c95507ea9c7d0854894bff23ce3e82597ba0f SHA512 1f8d36eb61225a4a76250808964a6a6352a642c031ee129680a4f5cc6b418515c34c5c275478a4b46fcc41caffa3cc80d3111205b530b2384b313b46b481ea1b
-EBUILD maxima-5.44.0-r9.ebuild 6298 BLAKE2B 8db82bbae80fd131141e5d5b8a700972865ae187b6b72956f14d48733ed91d54527e8784da044d63ee6c48f0c0604124dbe08aad856fbfd81bb61546aabb21d5 SHA512 f166a500b8bfc04de71d0851fe25fe8e9e48e5fe274d38099d5b9277c839ecb2fa4e6ec11c6b854921691b782a1c47b03001b0ac3723d6b9e42710bafc8cac78
 EBUILD maxima-5.45.1-r2.ebuild 6374 BLAKE2B bae227125971213b20fc68eb0e6e6e1b653e07969169edc6c0157b0567e4fa64d5c9dc8233e0b03bcc0d41a19757da740bfe6a87742b5d9be0ae18a6ce53f42d SHA512 7729217e3978f9d05bbfcef32127c8f43a820ad176195032c8a6d8fe26e95e69ff0369d1c0e5fb92925ce35c7c73adc531dc7f0175fddbfb5798d79932f56d43
+EBUILD maxima-5.46.0.ebuild 5956 BLAKE2B 8e3ddf245d7001934f9fb82867a2842c3e062f4d9881cbc2319cd64bf83cee81681cc7e49ead4d0de17fd07cb22b8fbd7ec1dbb76ad5f6c80fc4a74e97d08a4f SHA512 5be5951714e2072cb4d0c3e2a6bbbb723f45227930d5e9e2ce183b439361dfaf5575f09ca8760b2319113cdf34e5d051fded3dea0d771227b4afce849a7c3ec3
 MISC metadata.xml 1734 BLAKE2B a7f2d1c80272f79cce70c14b84b2c5bec1898f59464ce871a97ed4af1026b1d49622e865743002dbb7a9c91a878d2e8b4ae0302084f5bb2f7c75eedfd5370099 SHA512 2fbe921b196b17d6cf866f1193b4b83aa9974598f4b923acd7847dc1d327f5ab2b623ffd19bb772176740a96b1efb438f26c57a108151f0f18c720ce8b540bf7
diff --git a/sci-mathematics/maxima/maxima-5.44.0-r9.ebuild b/sci-mathematics/maxima/maxima-5.44.0-r9.ebuild
deleted file mode 100644
index 4f4ea7fe41d2..000000000000
--- a/sci-mathematics/maxima/maxima-5.44.0-r9.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 xdg-utils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# Supported lisps
-LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
-# <lisp> supports readline: . - no, y - yes
-SUPP_RL=(   .    .     y               .    .         y     )
-# . - just --enable-<lisp>, <flag> - --enable-<flag>
-CONF_FLAG=( .    .     .               ecl  ccl       .     )
-# patch file version; . - no patch
-PATCH_V=(   2    1     .               4    3         1     )
-
-IUSE="emacs gui nls unicode vtk X test ${LISPS[*]}"
-RESTRICT="!test? ( test )"
-
-# Languages
-LANGS="de es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} l10n_${lang/_/-}"
-done
-
-# texlive-latexrecommended needed by imaxima for breqn.sty
-#
-# VTK is an optional plotting backend that can be enabled by
-# running "draw_renderer: 'vtk;" within maxima.
-#
-# It's NON-optional for the scene() command, but that command is
-# currently useless since Tcl/Tk support was dropped in sci-libs/vtk.
-# Thus we include VTK only as an optional dependency.
-RDEPEND="
-	virtual/libcrypt:=
-	X? (
-		x11-misc/xdg-utils
-		sci-visualization/gnuplot[gd]
-		vtk? (
-			${PYTHON_DEPS}
-			sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}]
-		)
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		virtual/latex-base
-		app-emacs/auctex
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latexrecommended
-	)
-	gui? ( dev-lang/tk:0 )"
-
-# generating lisp dependencies
-depends() {
-	local LISP DEP
-	LISP=${LISPS[$1]}
-	DEP="dev-lisp/${LISP}:="
-	if [ "${SUPP_RL[$1]}" = "." ]; then
-		DEP="${DEP} app-misc/rlwrap"
-	fi
-	echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	LISP=${LISPS[${n}]}
-	RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
-	DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-
-# default lisp
-DEF_LISP=0 # sbcl
-ARM_LISP=2 # gcl
-DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-# Maxima can make use of X features like plotting (and launching a PNG
-# viewer) from the console, but you can't use the xmaxima GUI without X.
-REQUIRED_USE="${PYTHON_REQUIRED_USE} gui? ( X )"
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-# Python is used in e.g. doc/info/build_html.sh to build the docs.
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	test? ( sci-visualization/gnuplot )
-	sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
-	# Set the PYTHON variable to whatever it should be.
-	python-single-r1_pkg_setup
-
-	local n=${#LISPS[*]}
-
-	for ((n--; n >= 0; n--)); do
-		use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
-	done
-
-	if [ -z "${NLISPS}" ]; then
-		use arm && DEF_LISP=${ARM_LISP}
-		ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
-		NLISPS=${DEF_LISP}
-	fi
-}
-
-src_prepare() {
-	local n PATCHES v
-	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1
-			  dont-hardcode-python support-new-vtk )
-
-	n=${#PATCHES[*]}
-	for ((n--; n >= 0; n--)); do
-		eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
-	done
-
-	n=${#LISPS[*]}
-	for ((n--; n >= 0; n--)); do
-		v=${PATCH_V[${n}]}
-		if [ "${v}" != "." ]; then
-			eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
-		fi
-	done
-
-	eapply_user
-
-	# bug #343331
-	rm share/Makefile.in || die
-	rm src/Makefile.in || die
-	touch src/*.mk
-	touch src/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local CONFS CONF n lang
-	for n in ${NLISPS}; do
-		CONF=${CONF_FLAG[${n}]}
-		if [ ${CONF} = . ]; then
-			CONF=${LISPS[${n}]}
-		fi
-		CONFS="${CONFS} --enable-${CONF}"
-	done
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "l10n_${lang/_/-}"; then
-				CONFS="${CONFS} --enable-lang-${lang}"
-				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	# Using raw-ldflags fixes the error,
-	#
-	#   x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option
-	#   value (expected an integer): 1 -Wl
-	#
-	# when building the maxima.fas library for ECL.
-	#
-	econf ${CONFS} \
-		LDFLAGS="$(raw-ldflags)" \
-		$(use_with gui wish) \
-		$(use_enable emacs) \
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-}
-
-src_compile() {
-	# The variable PYTHONBIN is used in one place while building the
-	# German documentation. Some day that script should be converted
-	# to use the value of @PYTHON@ obtained during ./configure.
-	emake PYTHONBIN="${PYTHON}"
-	if use emacs; then
-		pushd interfaces/emacs/emaxima > /dev/null
-		elisp-compile *.el
-		popd > /dev/null
-		pushd interfaces/emacs/imaxima > /dev/null
-		BYTECOMPFLAGS="-L . -L ../emaxima"
-		elisp-compile *.el
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	docompress -x /usr/share/info
-	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
-	use gui && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
-
-	if use emacs; then
-		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
-
-		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-
-		insinto /usr/share/${PN}/${PV}/doc/imaxima
-		doins interfaces/emacs/imaxima/README
-		doins -r interfaces/emacs/imaxima/imath-example
-	fi
-
-	if use ecls; then
-		# Use ECL to find the path where it expects to load packages from.
-		ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
-		insinto "${ECLLIB#${EPREFIX}}"
-		doins src/binary-ecl/maxima.fas
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
diff --git a/sci-mathematics/maxima/maxima-5.44.0-r10.ebuild b/sci-mathematics/maxima/maxima-5.46.0.ebuild
index 7b3910f71060..e6051e772c32 100644
--- a/sci-mathematics/maxima/maxima-5.44.0-r10.ebuild
+++ b/sci-mathematics/maxima/maxima-5.46.0.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
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools elisp-common flag-o-matic python-single-r1 xdg-utils
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test"
+IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test"
 RESTRICT="!test? ( test )"
 
 # Languages
@@ -25,21 +25,19 @@ for lang in ${LANGS}; do
 done
 
 LISP_DEPEND="
-	clisp? ( dev-lisp/clisp )
+	clisp? ( dev-lisp/clisp:= )
 	clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
 	clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
 	cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
-	ecls? ( dev-lisp/ecls app-misc/rlwrap )
+	ecls? ( dev-lisp/ecls:= app-misc/rlwrap )
 	gcl? ( dev-lisp/gcl[ansi,readline] )
-	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
+	sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap )
 "
 
-# Python is used in e.g. doc/info/build_html.sh to build the docs.
 # LISP_DEPEND is included in both BDEPEND and DEPEND because the various
 # lisp engines are used to both compile and run maxima. It's possible
 # that they don't (all?) need to be listed in DEPEND; who knows.
 BDEPEND="
-	${PYTHON_DEPS}
 	${LISP_DEPEND}
 	test? ( sci-visualization/gnuplot )
 	sys-apps/texinfo
@@ -48,7 +46,7 @@ BDEPEND="
 DEPEND="
 	${LISP_DEPEND}
 	virtual/libcrypt:=
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? ( >=app-editors/emacs-26:* )
 	gui? ( dev-lang/tk:0 )
 "
 
@@ -83,7 +81,7 @@ RDEPEND="
 # Maxima can make use of X features like plotting (and launching a PNG
 # viewer) from the console, but you can't use the xmaxima GUI without X.
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
+	vtk? ( ${PYTHON_REQUIRED_USE} )
 	|| ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
 	gui? ( X )"
 
@@ -91,19 +89,17 @@ TEXMF="${EPREFIX}"/usr/share/texmf-site
 
 pkg_setup() {
 	# Set the PYTHON variable to whatever it should be.
-	python-single-r1_pkg_setup
+	use vtk && python-single-r1_pkg_setup
 }
 
 PATCHES=(
-	"${FILESDIR}/support-new-vtk.patch"
-	"${FILESDIR}/dont-hardcode-python.patch"
+	"${FILESDIR}/imaxima-0.patch"
 	"${FILESDIR}/xdg-utils-1.patch"
 	"${FILESDIR}/wish-2.patch"
 	"${FILESDIR}/rmaxima-0.patch"
 	"${FILESDIR}/emacs-0.patch"
 	"${FILESDIR}/clisp-1.patch"
 	"${FILESDIR}/clozurecl-3.patch"
-	"${FILESDIR}/ecls-4.patch"
 	"${FILESDIR}/cmucl-1.patch"
 	"${FILESDIR}/sbcl-2.patch"
 )
@@ -128,7 +124,6 @@ src_configure() {
 		for lang in ${LANGS}; do
 			if use "l10n_${lang/_/-}"; then
 				CONFS="${CONFS} --enable-lang-${lang}"
-				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
 			fi
 		done
 	fi
@@ -165,10 +160,7 @@ src_configure() {
 }
 
 src_compile() {
-	# The variable PYTHONBIN is used in one place while building the
-	# German documentation. Some day that script should be converted
-	# to use the value of @PYTHON@ obtained during ./configure.
-	emake PYTHONBIN="${PYTHON}"
+	emake
 	if use emacs; then
 		pushd interfaces/emacs/emaxima > /dev/null
 		elisp-compile *.el
@@ -187,7 +179,7 @@ src_install() {
 	# do not use dodoc because interfaces can't read compressed files
 	# read COPYING before attempt to remove it from dodoc
 	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps
+	doins AUTHORS COPYING README README-lisps.md
 	dodir /usr/share/doc
 	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
 
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 96558fa174ff..aed51250bfd8 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -5,5 +5,7 @@ AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.13.3.tar.gz 4768312 BLAKE2B e6df23d3929ef1549009eb82c628cc2b9f1f3a446b2c2b246e157b93859006c3f4526c6fef4b975be87b9c6c011e179c169b4f237981c2ca1e02df0adbc4c00a SHA512 16cc20e44bc9b408798a86ffc31f8096e5adc01e0b8f7620e3d03201d71ddbe1d1bfecb22ab69c5b03270e9e97657042de29bb2055173b0d4cf169ec4373972b
+DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
 EBUILD pari-2.13.3.ebuild 3420 BLAKE2B 5c30dcb0cc91164956ce0ba5425d591dccbfda71b45991f3620129400a4924934ce857a0bd6758b10a0677ff560ef0295fba04ac3e2536897278ea9a9dec6cc3 SHA512 c18904b5fc26f7d32e8dbc8360f1daeebf2f16ff24760037780512bb85c3470df540d1f56a0b777cf71fa825c2058a8153e3fb5af50c586357fcffa0ee012535
+EBUILD pari-2.13.4.ebuild 3424 BLAKE2B 36ae63d5c05de92b91df55ccac68b205061828de8198ad64530c1d9193a78b89a9d9740d8f709e3cc9e39bb11015edf257134f878323e208ed1e68ae917750b6 SHA512 e8475e888ceb29c08ec17aaebcc615ceffbccd3ade0f95fec17c5c1703167bad46c24576b4b05bf859f99d5b6cbff7b089c972b72f111cdaa82bf98cc78fd785
 MISC metadata.xml 1765 BLAKE2B 5d45009ff34f4d7780e70d2cdd94a5c60ebef674c235ba84d0989485dec62e83d15b9be7cbcbd583bf258fc936c5aff3d610ca8ea682323b07430fc2e71ee225 SHA512 32f560edbcfcf283b7f6a907277c584e5e9a33044b334e66818bc3529fb49a8709888aa27332da3f46e8c80971711403f333de3616132a47c34b9a1413237772
diff --git a/sci-mathematics/pari/pari-2.13.4.ebuild b/sci-mathematics/pari/pari-2.13.4.ebuild
new file mode 100644
index 000000000000..59258dadea5d
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.13.4.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Computer-aided number theory C library and tools"
+HOMEPAGE="https://pari.math.u-bordeaux.fr/"
+SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+# The subslot is the value of $soname_num obtained from
+# upstream's config/version script.
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="data doc fltk gmp test threads X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
+DEPEND="
+	sys-libs/readline:0=
+	data? ( sci-mathematics/pari-data )
+	doc? ( X? ( x11-misc/xdg-utils ) )
+	fltk? ( x11-libs/fltk:1= )
+	gmp? ( dev-libs/gmp:0= )
+	X? ( x11-libs/libX11:0= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.9.4-strip.patch
+	"${FILESDIR}/${PN}"-2.9.4-ppc.patch
+	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
+	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
+	"${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch
+	"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
+)
+
+src_prepare() {
+	default
+
+	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
+	sed -i \
+		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
+		-e 's:"acroread":"xdg-open":' \
+		doc/gphelp.in || die "Failed to fix doc dir"
+}
+
+src_configure() {
+	tc-export CC CXX PKG_CONFIG
+
+	# Workaraound to "asm operand has impossible constraints" as
+	# suggested in bug #499996.
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# need to force optimization here, as it breaks without
+	if is-flag -O0; then
+		replace-flags -O0 -O2
+	elif ! is-flag -O?; then
+		append-flags -O2
+	fi
+
+	# sysdatadir installs a pari.cfg stuff which is informative only.
+	# It is supposed to be for "architecture-dependent" data.
+	# It needs to be easily discoverable for downstream packages such as gp2c.
+	# We set LD to "" so that it is set to the value of the compiler used
+	# which is how a normal end user is expected to configure it. pari's build
+	# system do not cope very well with a naked linker, it is expecting a
+	# compiler driver. See https://bugs.gentoo.org/722090
+	LD="" ./Configure \
+		--prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}/usr/share/${PN}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sysdatadir="${EPREFIX}"/usr/share/pari \
+		--mandir="${EPREFIX}"/usr/share/man/man1 \
+		--with-readline="${EPREFIX}"/usr \
+		--with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_with fltk) \
+		$(use_with gmp) \
+		--without-qt \
+		$(usex threads "--mt=pthread" "" "" "") \
+		|| die "./Configure failed"
+}
+
+src_compile() {
+	local mymake=""
+	use hppa && \
+		mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
+
+	emake ${mymake} gp
+
+	if use doc; then
+		# To prevent sandbox violations by metafont
+		VARTEXFONTS="${T}/fonts" emake docpdf
+	fi
+}
+
+src_test() {
+	# Welcome to the jungle, where the tests fail if you make your
+	# terminal bigger.
+	emake COLUMNS=80 test-all
+}
+
+src_install() {
+	DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
+	default
+
+	if use doc; then
+		docompress -x "/usr/share/doc/${PF}"
+		emake \
+			DESTDIR="${D}" \
+			EXDIR="${ED}/usr/share/doc/${PF}/examples" \
+			DOCDIR="${ED}/usr/share/doc/${PF}" \
+			install-doc
+	fi
+}
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 5426d8d901e0..070e03dfc7e9 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,7 +1,7 @@
 DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb
-DIST wxmaxima-21.05.2.tar.gz 17782421 BLAKE2B 8a4057087b38f1023f5773b4f3457060b1624e6de654c2b5fadb8fb529461bdf3393e6ea443e69d0ea2057130aa1a7de7ab6739d7797c3a90bb114ec96587289 SHA512 a5d7832d224bad0963a86d3714172d51b67a1c8daf933e66b6c7817da102f942e37aa2a31d8f0f1e27438b61b1ba2705af333edcf2c33a53fdeec318fe837ff6
 DIST wxmaxima-21.11.0.tar.gz 15982803 BLAKE2B 8eff24b3b08fd156341cbd1c565fd832277f99cbbfa2f166671502399e8658273dca86c48b3b09c8616b9d9a17ec4ea9230def645719bcf3c22fc410f5f31d62 SHA512 1660537d475dc16e6d25011ae02b50a9179dd97b19dd115e914636fac71684906d77a2e4f4ab2d8506ac9f6b297de8feeeb46489a6dbf5782783f890a4181506
+DIST wxmaxima-22.04.0.tar.gz 21477753 BLAKE2B aad35f628b2b74d41a7cb501d5e98c59b8588103f729fc39e901c50416a17bd296c4959f2276728a2654924bd16dd7416ef39b69eb01c5c05ee857f69ea1d42d SHA512 5197dab483012b39e910208406f32f2892d9acc3c0abc8582a61a43fad4f13e95692f8e499a2d0ca1680ca2ca48ea4c4853aa04c3f18d5e3a923c11316ebbf62
 EBUILD wxmaxima-20.12.2.ebuild 1428 BLAKE2B 30e26a147fe84b328902bedb1ee7df68a6c27d203b9b6e900096d931091ce51cce41d22e45fe779bb4144949b1ebcf259fbd085cc4e2f992e495405c5176410d SHA512 823b28ad77dfa70536103b64735ec68cdefe38abeec760b15acb6904f7f8f97d6ace10eec836f0536ff576f7711b2d135a989072087ae67d133506a301920882
-EBUILD wxmaxima-21.05.2.ebuild 1893 BLAKE2B 2540d12b43a6dd9d663446fd8c49f33b57cb95f24bdd7a87ffdd2f23213756086d98a520e5d5d6907288324913c98048c03045c22516545dc67262c098bb792e SHA512 4f1e82caeba02332438bcf5532a9e488341e5a77b077b0fc853f82f2b7c6c8528047a67c9b01c332d20e2ff162d9b6834fc12013062973b61ec0eb349e6e2d3e
 EBUILD wxmaxima-21.11.0.ebuild 1893 BLAKE2B 2540d12b43a6dd9d663446fd8c49f33b57cb95f24bdd7a87ffdd2f23213756086d98a520e5d5d6907288324913c98048c03045c22516545dc67262c098bb792e SHA512 4f1e82caeba02332438bcf5532a9e488341e5a77b077b0fc853f82f2b7c6c8528047a67c9b01c332d20e2ff162d9b6834fc12013062973b61ec0eb349e6e2d3e
+EBUILD wxmaxima-22.04.0.ebuild 1893 BLAKE2B e83faab0df73eb403b223b6698b1fb1d8f806f40b485023f5a7b31477f2aa6949585ae677afa59a5ffc127528213e6b0ecafc88168b7d0e9e2fb916179e11c93 SHA512 acff61ffbadf7d193630ecdc2bdcbab2a483757f4d67a944e28e78793c43b26d0e85d0214f24e1de8fc7e463ac2d53ff8efa87e591fc4961d3878470d5846ed0
 MISC metadata.xml 724 BLAKE2B d51bb78a15283c2c6dfe7f7e1d26c7d06522a9eafb9493e7ff3fb3e489ac8530cd896d207a2d5f49dbb2150553ba3075b4f7c131bc079af9950f6d5459131647 SHA512 3f1eddc6f7529e317ce91484474c9bf1165b85bb90ca62e9fe0c9fece1cb559c7c538fb5482580dd24af518c863570f2aa834da37147016fe1f7444c0c8e4a90
diff --git a/sci-mathematics/wxmaxima/wxmaxima-21.05.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-22.04.0.ebuild
index 9abff2ab71ee..010023dd6e2b 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-21.05.2.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-22.04.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=7