gentoo resync : 12.05.2022

39 files changed, 1224 insertions, 564 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index fe50675b1a46..e52660d6b8c9 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/coq-serapi/Manifest b/sci-mathematics/coq-serapi/Manifest
index 79adbadee5cb..9e8f2153507b 100644
--- a/sci-mathematics/coq-serapi/Manifest
+++ b/sci-mathematics/coq-serapi/Manifest
@@ -1,5 +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
+EBUILD coq-serapi-0.15.0-r2.ebuild 1403 BLAKE2B c0ccb04d66e214da207cc225e75ce7a81c176ce810bb473f829abe4c4668a44d43d9bec11a6db394c2139add2539bc8888fd6fcd456f0d32366a4b1c51916934 SHA512 b95f91e5050104df60329ba167454863a25bbcad5c8b7427e7ab903747bf78a57b5a058994f46441f38627363264ccad048cc66bd436933039649165a2d75fa4
 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-r2.ebuild
index 2733c490f747..2290f780d192 100644
--- a/sci-mathematics/coq-serapi/coq-serapi-0.15.0.ebuild
+++ b/sci-mathematics/coq-serapi/coq-serapi-0.15.0-r2.ebuild
@@ -22,11 +22,11 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=sci-mathematics/coq-${COQV}:=
+	>=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:=
 	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:=
 "
@@ -50,7 +50,7 @@ src_install() {
 
 	rm -r "${D}"/usr/share/emacs || die
 	if use emacs ; then
-		elisp-install sertop sertop.el{,c}
+		elisp-install ${PN} sertop.el{,c}
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 }
diff --git a/sci-mathematics/easycrypt/Manifest b/sci-mathematics/easycrypt/Manifest
index 5236f5665c12..de5be6a92a95 100644
--- a/sci-mathematics/easycrypt/Manifest
+++ b/sci-mathematics/easycrypt/Manifest
@@ -1,5 +1,7 @@
-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
+DIST easycrypt-2022.04.tar.gz 1277930 BLAKE2B 4bb68325b9894e28dcf33f2b78f63c029375ba4f77d0df06cedff3a26be768827c9fb25f49cc8ecc8a2d341191fb0b9371825979f0f7cd14c69b3ced16ddc32c SHA512 9234de7f28999a6de79a3ecd27d3499ffb15fe651b2a577cf0b49fc73e034bbe1b4d99c2a7aafd3df70d9b4e095d1ae09ed8ff7a7885c020f9e5c990afe9b592
+DIST easycrypt-2022.04_p20220505.tar.gz 1279876 BLAKE2B 10ae22e216b8a35973ad7d1dbffe1dba9ce328b67319577cd1a7fad957f08174d1651ee6c1bab8cdf12d8fda20cb85d5a334ad41dfb3e55f9ee8beb8a233a2eb SHA512 b1231e0be787a667c836d970236d47311e490443a66bc0a3834963557b32358ad9db2008e32d427d232f2a94c72afc65bd3330b6db1eb938335791ea997b4013
+EBUILD easycrypt-1.0_pre20220303-r1.ebuild 1025 BLAKE2B c4460c36a18f69a1fa1f43f9921427f9e53bfce1a34b8f07415ebaf1079d63ebf44e7e81580425c176a4c85ef98390b5e3f8a2a41154c7be0b6ce7925a06e3a3 SHA512 23fccb37b6c1900488c6dd7ebd35f807179d221d5bcc6e08403627e2682e91f850fc0ee44b498061f2ac597ece28043b6f9bcedb9c2e3a7f686da9fbd058fcae
+EBUILD easycrypt-2022.04-r1.ebuild 971 BLAKE2B 8887540e64030be55d90ba605fa29956ca5d4d14c329beb66f5894b1e88d2ad2c838d8b97be54679296a5f2fe2a3a1308e909eebbc40430f71238dedcf0ca033 SHA512 b87dcb1187f50164b95f3869503d3ab7e91a5a43b361f5d6cfb40df9bfd23da4908272e81044fbd2cf4bcfbdcce2759d5993a1e55753e6e3a0a94826cfb1eb59
+EBUILD easycrypt-2022.04_p20220505.ebuild 1012 BLAKE2B 95a9c43ec8869b7873020327e26f2052b5897c3b3ed44ba64c05037138852ff72bd135daa42bb0edf7308f42b599b5790bf4bb876e908af31b67436efbf9e66b SHA512 0563ec8ba74bb0946c80981d5d02ed80bae89e439c9e635e8fac8a8f7402f08d9351697db4d5335ced5963212bca316bba4706dfd85e0980aa89388abff79cf6
 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-r1.ebuild
index 84353ee281ec..c4f262d6d87c 100644
--- a/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303.ebuild
+++ b/sci-mathematics/easycrypt/easycrypt-1.0_pre20220303-r1.ebuild
@@ -25,7 +25,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
-	>=sci-mathematics/why3-1.4:=
+	>=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:=
 	dev-ml/batteries:=
 	dev-ml/camlzip:=
 	dev-ml/dune-build-info:=
diff --git a/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild
new file mode 100644
index 000000000000..0e74e30a9b91
--- /dev/null
+++ b/sci-mathematics/easycrypt/easycrypt-2022.04-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Computer-Aided Cryptographic Proofs"
+HOMEPAGE="https://github.com/EasyCrypt/easycrypt"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/EasyCrypt/${PN}.git"
+else
+	SRC_URI="https://github.com/EasyCrypt/${PN}/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-r${PV}
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
+	>=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:=
+	dev-ml/batteries:=
+	dev-ml/camlzip:=
+	dev-ml/dune-build-info:=
+	dev-ml/dune-site:=
+	dev-ml/ocaml-inifiles:=
+	dev-ml/pcre-ocaml:=
+	dev-ml/yojson:=
+	dev-ml/zarith:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	local theories="[\"$(ocamlc -where)/easycrypt/theories\"]"
+	sed -i "s|EcRelocate\.Sites\.theories|${theories}|g" src/ec.ml || die
+
+	default
+}
diff --git a/sci-mathematics/easycrypt/easycrypt-1.0_pre20211210-r2.ebuild b/sci-mathematics/easycrypt/easycrypt-2022.04_p20220505.ebuild
index ef1279bbd12b..e83988a1a04e 100644
--- a/sci-mathematics/easycrypt/easycrypt-1.0_pre20211210-r2.ebuild
+++ b/sci-mathematics/easycrypt/easycrypt-2022.04_p20220505.ebuild
@@ -3,29 +3,29 @@
 
 EAPI=8
 
-H=49aec58ea63a64adcf5fbabcc14c6739f337b206
+H=a49a0acf5f7e2776f6b10cd49f8a201ebab0cf03
 
 inherit dune
 
 DESCRIPTION="Computer-Aided Cryptographic Proofs"
 HOMEPAGE="https://github.com/EasyCrypt/easycrypt"
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/EasyCrypt/${PN}.git"
 else
 	SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${H}"
+	S="${WORKDIR}"/${PN}-${H}
 fi
 
-LICENSE="CeCILL-B CeCILL-C"
+LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.08.0:=[ocamlopt?]
-	>=sci-mathematics/why3-1.4:=
+	>=sci-mathematics/why3-1.5:= <sci-mathematics/why3-1.6:=
 	dev-ml/batteries:=
 	dev-ml/camlzip:=
 	dev-ml/dune-build-info:=
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index 934278d0509f..ca9659c49ae0 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -3,6 +3,8 @@ AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88
 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-47.tar.gz 96787570 BLAKE2B b05b3f44f10695a5d085df0a0db9aba761ac011964caeb247bd6034ca2a41505e5eb30df0de494826270703d9b62fbb3b9d4869f4cdd32d1d88636f374fbae16 SHA512 60a8550f7da2a163365759266660421c936797a9d52c3ba3802b5e00610fc460b49ccef44df809331abb1cbb65432e283fb4484b1efffb577c4802ab44fecff7
+DIST giac_1.9.0-5.tar.gz 97863572 BLAKE2B 8766061ace737972b5f47cd7d9f92b0002fa6c94a754dd723fb06001560cc62c60631163bd038b2e7b50919088d8bc669e61582189084395ad2aacf39865cb52 SHA512 86a6edc31797bd3d6ec0ac9ed93c092bbe77cb056269be64c9a23304fcc8ce56c521d829d61ffeac98efd2995ef8371500360462815d61ba97d0cd7bd3b86976
 EBUILD giac-1.7.0.13-r1.ebuild 4257 BLAKE2B af1277a69e3a27cf215e870fe6dab127d4ac7edc0fd1e8905498e5b745bc92133d7f4f725fc096c4a83bd649fd5ba3731d16c86688f3bee1a9f8e4b7b1bd2aaf SHA512 351d891b219e15c24cae84e5ef1e1063a702c36d0fc6a6f9955f0eb3b1d16cb179e0fdbfd39bd6f820929fbe9d259a3ab91e71976cdb1a270cedbb66ec6fff83
 EBUILD giac-1.7.0.47.ebuild 4247 BLAKE2B b28c9cfc47b8eed41a1add40aa2d66858cb1f065aa020b0c5a3d667ef57509f732dabeb27d6dea2a699c36b8cad483e4f939f8569bda37a7ca7e6f94bcf949bb SHA512 24b2907aaa1a68b5ca0afe5965d68b8004fa991abaf9dbd0cd1b01b138ce5ac810da244374edc85a0b794e4856b7959dc2bcc53e2551092f298b5d6e8bc277ac
+EBUILD giac-1.9.0.5.ebuild 4247 BLAKE2B b28c9cfc47b8eed41a1add40aa2d66858cb1f065aa020b0c5a3d667ef57509f732dabeb27d6dea2a699c36b8cad483e4f939f8569bda37a7ca7e6f94bcf949bb SHA512 24b2907aaa1a68b5ca0afe5965d68b8004fa991abaf9dbd0cd1b01b138ce5ac810da244374edc85a0b794e4856b7959dc2bcc53e2551092f298b5d6e8bc277ac
 MISC metadata.xml 1315 BLAKE2B a461d359b33617422f5863466bdbec9ddf56db03467b992c887bce9967d434913489602fd684edc893303078f89cf94d01b44cfdc0ccff33db9b42c5e686cfa8 SHA512 eaeb480010c9dbdfd75516e45e97e3226d2b2812c44e217b318c5a1d86dc40820bac0de69686d7b502775b14a6f1ed3bc11d2372b891c46a37080b4e84da9a1c
diff --git a/sci-mathematics/giac/giac-1.9.0.5.ebuild b/sci-mathematics/giac/giac-1.9.0.5.ebuild
new file mode 100644
index 000000000000..bf7ed2bdb24c
--- /dev/null
+++ b/sci-mathematics/giac/giac-1.9.0.5.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic xdg-utils
+
+FETCH_P="${PN}_"$(ver_rs  3 '-')
+MY_PV=$(ver_cut 1-3)
+DESCRIPTION="A free C++ Computer Algebra System library and its interfaces"
+HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS="el en es pt"
+IUSE="ao doc +ecm examples gc +glpk gui static-libs test"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+# nauty and cliquer are automagical dependencies
+RDEPEND="dev-libs/gmp:=[cxx(+)]
+	sys-libs/readline:=
+	gui? ( x11-libs/fltk
+		media-libs/libpng:= )
+	ao? ( media-libs/libao )
+	dev-libs/mpfr:=
+	sci-libs/mpfi
+	sci-libs/gsl:=
+	sci-mathematics/pari:=[threads]
+	dev-libs/ntl:=
+	virtual/lapack
+	virtual/blas
+	net-misc/curl
+	sci-mathematics/cliquer
+	sci-mathematics/nauty
+	ecm? ( sci-mathematics/gmp-ecm )
+	glpk? ( sci-mathematics/glpk )
+	gc? ( dev-libs/boehm-gc )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-tex/hevea
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
+	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
+)
+
+REQUIRED_USE="test? ( gui )"
+
+# The mirror restriction is due to the French documentation for which
+# "Other kind of redistributions require the consent of the copyright
+# holder."
+RESTRICT="!test? ( test ) mirror"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14 # bug 788283
+
+	if use gui; then
+		append-cppflags -I$(fltk-config --includedir)
+		append-lfs-flags
+
+		# Get the big-L flags from fltk's LDFLAGS.
+		append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
+	fi
+
+	# Using libsamplerate is currently broken
+	#
+	# The giac build system supports --docdir, but the path /usr/share/giac/doc
+	# 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, 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)  \
+		$(use_enable gui png)  \
+		$(use_enable ao) \
+		$(use_enable ecm) \
+		$(use_enable glpk) \
+		$(use_enable gc)
+
+}
+
+src_install() {
+	docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples}
+	emake install DESTDIR="${D}"
+
+	# Move all of /usr/share/giac (which contains only documentation) to
+	# its /usr/share/doc/${PF} counterpart.
+	dodir /usr/share/doc
+	mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die
+
+	# and create a symlink from the original location to the new one
+	dosym "./doc/${PF}" /usr/share/giac
+
+	# This is duplicated in ${ED}/usr/share/doc/${PF}/examples
+	rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die
+
+	# These aren't supposed to be installed at all.
+	find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die
+
+	# The French docs are not freely licensed according to the README.
+	rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES
+	if ! use gui; then
+		rm -rf \
+			"${ED}"/usr/bin/x* \
+			"${ED}"/usr/share/application-registry \
+			"${ED}"/usr/share/applications \
+			"${ED}"/usr/share/icons \
+			|| die "failed to clean up fltk files"
+	fi
+
+	if ! use doc; then
+		rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory"
+	else
+		for lang in ${LANGS}; do
+			if use l10n_$lang; then
+				dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas"
+			else
+				rm -r "${ED}/usr/share/giac/doc/${lang}" \
+					|| die "failed to remove ${lang} documentation"
+			fi
+		done
+	fi
+
+	if ! use examples; then
+		rm -r "${ED}/usr/share/doc/${PF}/examples" \
+		   || die "failed to remove examples"
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 8c3caa2bca15..6abce55f281d 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,5 +1,7 @@
 AUX gmp-ecm-7.0.4-execstack.patch 1568 BLAKE2B ccf8b74074bf357e74bc6126c505ebc77c389c851ee0ec35743c99270b6f36fa92d26c9df4b1f1a20e125a3b6dbd53522fa441d91fc4f8427d3b6d6ab50be07a SHA512 874924dd2f81c2e85dd4cdb0d8a14d1e22a9aca0c3883a9e16f1888f61b5af9b26a8c80469b65566a4becefce6a1d37ecdbba029648b4d62dc320f9e5a776453
 AUX gmp-ecm-7.0.4-openmp.patch 795 BLAKE2B 2a857cba5e0bc4e7dfe710c250bcb721dd2fd5e0c9c049987f8505d2efc758ff026b313bc92a2b18472bbebc320c8d1187c8506eaea6d2f1f6d51da284bca3ae SHA512 063d20e5a4cf088aaed31eb79c6b253ef4747d3d449c70936b4079c519480767f4f19dc259894422dc6d5783c9c360fc2c3a9fda4bb9b2a124a0e7bd90c08554
 DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
+DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B 7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7d712c5306775c6f07eacb3cbbbd11d651bbbdd687a87692f4920170557b51f9498881a6c5018a2ce0b1b7f SHA512 f5a482a231339304683adc3334c9b86f21a0d9b42ea871418d4c01005057d560cd418eddfcc1c7be7f8c249960b2ee612a1454ccc5d8e41319b06c6f42e6662e
 EBUILD gmp-ecm-7.0.4-r4.ebuild 2011 BLAKE2B 384a95201168380077786279ed6813f1b369fb81e87bb5392824b3704eddcd70789b56891d1ecc65da47bda2fc68006c4d28d7fe4844f8a75d0fb12ef8656569 SHA512 51dd9ad9e6ac27be94c1839ef4ea61f5b300d714fea9b144dec57b354f1412dc4977c83d399723493984d829fa92f4892d58f20325c470119760026de2b1acb8
-MISC metadata.xml 643 BLAKE2B 90da8b09f30dd8bd8d4df3dcc388663e52d57ea7b2974becede9ed0c592eaacb33958d202cee33988b79364e058ef84676e995b9d8467beb1f7d89ad8b177136 SHA512 e2f0d6f286440543ed15531183671b30f0044c38685e58617d004286b596ba1b898c470dc39e2ebe95db10c83be9430f1a010539ba2b0231883fe6bf4b0b97a8
+EBUILD gmp-ecm-7.0.5.ebuild 1628 BLAKE2B 3e1630ddb1589e75dc51caa0cfb4611e3f1358079cf175e289f4e647bcb84a779e68791d0ee35d28404b5a18fbc1c04cd5b7c7f78f332983c7b5fd533dc2dcf1 SHA512 6351f92edf8d40e31b4a7b099c4306236c93a4a1b81aba4fe8f642ce246fb27400c49c3261d03c823a03f18c73cf8aaa6bc0ff0b6846c4a6d9f659fd531f65a1
+MISC metadata.xml 727 BLAKE2B 9362e7772528adeb4ed10d53bb319cdd3e1a73959c8bc0d59d1ed589b9d854790acd10887cf8e09a4be009e2c2b6ce994508c9227d6e7c1d51c82b666e8db33e SHA512 6782da887f25301a029726237583a52ca3509ebbf8a0920e16ae1828723d8653108967639813cca7300bedd694469447b34b76a05e3382dc9b7cce74cf86ea83
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
new file mode 100644
index 000000000000..bf4ba87d79a1
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN="ecm"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="https://gitlab.inria.fr/zimmerma/ecm"
+SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/${MY_P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~ppc-macos ~x64-macos"
+IUSE="cuda +custom-tune openmp static-libs cpu_flags_x86_sse2"
+
+DEPEND="dev-libs/gmp:=
+	cuda? (
+		dev-util/nvidia-cuda-toolkit
+		x11-drivers/nvidia-drivers
+	)
+"
+RDEPEND="${DEPEND}"
+# xsltproc is used to produce the manppage in combination with the appropriate stylesheet
+BDEPEND="dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_compile() {
+	default
+	if use custom-tune; then
+		# One "emake" was needed to build the library. Now we can find
+		# the best set of parameters, and then run "emake" one more time
+		# to rebuild the library with the custom parameters. See the
+		# project's README or INSTALL-ecm. The build targets don't depend
+		# on ecm-params.h, so we need to "make clean" to force a rebuild.
+		emake ecm-params && emake clean && emake
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable openmp) \
+		$(use_enable cuda gpu) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable custom-tune asm-redc)
+}
+
+src_install() {
+	default
+
+	# remove .la file
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/gmp-ecm/metadata.xml b/sci-mathematics/gmp-ecm/metadata.xml
index e89f3c570a87..3723f0d56e48 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/metadata.xml
@@ -16,6 +16,9 @@
   </maintainer>
 
   <use>
+    <flag name="cuda">
+      Use NVidia's cuda toolkit for computations
+    </flag>
     <flag name="custom-tune">
       Improve performance of some operations by selecting
       machine-specific defaults
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index 039b82566ef9..0bf09530fe11 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,5 +1,7 @@
 DIST normaliz-3.1.3.tar.gz 3075453 BLAKE2B 0860b466dfa5335a58a496c21f7567e7e4682b07c73e36dbbd947eb65500e03758577d32355adb02fa4e271ca2f49bc5cb0449e26f1bdd11eab2dd5dbafd8f17 SHA512 c7fb1620e758dc59de88f0d7c55f50db0f67be772a00af27205e478f30c3836b7cf012a16a8adfdee3f0367d3adb4e3f887dc7d03793a7ca1601968ddb1946ce
 DIST normaliz-3.8.10.tar.gz 5086191 BLAKE2B b40de665718dc1cee8a7246ccfb9b8496bdfa0754408f0260421352f1b4776133047ed1a5e8e0f044bdc15dde63a9f7d9ea1721773f36ecdccce3a8575493772 SHA512 8755011b1305b571d6bef7b6200e01bb56dbadce3f67de022fae0ef42c69c095b1f7cd2a2a432282098277ee39aa17caeffda15c806b28a6060a737930d5b82c
+DIST normaliz-3.9.3.tar.gz 4946498 BLAKE2B 3faff64fda86216ee11b0f55ba1341d70988472f65eedafe5b52bf6b05abd817add2dbab45144de0a43d02c501caf3c4a89d66c2b2d621b81188a2a5100d158f SHA512 5d6866cc35835c196d22d6b4b0d5f0e3e2e00f772553115fbbabd8415b20388cf367cf9a282904a72c03c2ef482b804f7009d67e3334add4fc37f3bab675da6c
 EBUILD normaliz-3.1.3-r1.ebuild 1662 BLAKE2B d819f3709adb1af4b60efaab9c122158e49a3b6dffc418ab2a2d35655b95bf3a6e0421bdc57ec8ad9a957a59ef3a217dab725bfb8441ec46a71c2a8d4720b382 SHA512 4f19213464518951abec233ba53ac2f5a60d683ffa59a7fc81bdeece1361182f2d7cd0f517ec259c3b130776eb9acdd200d01fe8de9b59fc4945bec75e319ed5
 EBUILD normaliz-3.8.10-r1.ebuild 1129 BLAKE2B c10dec79da1c8199c49ca50ce4bb23c2c3c9460fbc412da1aca8055e79a4931787d8511a71c27c39beb1b4b9504a116ffc55790f6b0eac84b37c4a6335df5f2d SHA512 92e2cab1733ff1a5d7d301ed488b8fa4b92cf4a5ecb5c6cc1cda0dad3f1a0ddd1e867e615f1b781e7782fb549acb9e44dc75ceda70636e05731f455921d5ffba
-MISC metadata.xml 695 BLAKE2B 34dca8b8b1b6ccd935a828950d138bea485e37b2589c5408fda5602e2964132d03ea1b2cfea902d9faa5475cff888f4f980b5f3a9ca8a5ea919d0a583b894d2b SHA512 2513d18751c28fa76ce1db4bfcc914fb0d09baf12056d074b3c0a7dbc3b17bacd34eb72a8b6b768cd790f5e46bd4778a84d3159a142625ded7ef5bf30f1af7f0
+EBUILD normaliz-3.9.3.ebuild 1485 BLAKE2B 86345d201f397916cc0e6afebc84a2dd64b283e5fcb7b3ef4e9217a20331217c684674f630b6ac5499d484c2c998dbb95e995ebd92c14ddcf66777cdc84d1f7a SHA512 96368f73fe01b8969550d5d8f2eb296a68c78cf317a16decc3539a085710cbdfdfc386de04950213c664cd566e48de8001b01f697b4950286043bdd627b0ce82
+MISC metadata.xml 823 BLAKE2B e6ac647e395713b5589b2dd6655bdde020fdb4113067f83d503497e0e5ec916b04d2742227ea16f1dda4551c1275b2d0e684e3dab4cb331fc4d42597ea2bc004 SHA512 3f242ea780a29900dfda6b7a0372a87d38ebd11184e1eed976653bc3712e54c2cf5897f07c7f2d0aa50a1af6364fb797c2c4e78cb9c3fa4344370cab4dbe4abb
diff --git a/sci-mathematics/normaliz/metadata.xml b/sci-mathematics/normaliz/metadata.xml
index e7b4f0b40e9a..802b12e6eb3d 100644
--- a/sci-mathematics/normaliz/metadata.xml
+++ b/sci-mathematics/normaliz/metadata.xml
@@ -6,7 +6,13 @@
     <name>Gentoo Mathematics Project</name>
   </maintainer>
   <use>
-    <flag name="extras"> Install Macaulay2 and <pkg>sci-mathematics/singular</pkg>packages as shipped by upstream</flag>
+    <flag name="extras">
+      Install Macaulay2 and <pkg>sci-mathematics/singular</pkg>packages
+      as shipped by upstream
+    </flag>
+    <flag name="nauty">
+      Use <pkg>sci-mathematics/nauty</pkg> to compute automorphism groups.
+    </flag>
   </use>
   <longdescription lang="en">
     Normaliz is a (command line) tool for computations in affine
diff --git a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
new file mode 100644
index 000000000000..7b7436eeb4e9
--- /dev/null
+++ b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tool for computations in affine monoids and more"
+HOMEPAGE="https://www.normaliz.uni-osnabrueck.de/"
+SRC_URI="https://github.com/Normaliz/Normaliz/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc extras nauty openmp"
+
+RDEPEND="
+	dev-libs/gmp:=[cxx(+)]
+	nauty? ( sci-mathematics/nauty )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+# Only a boost header is needed -> not RDEPEND
+
+pkg_setup() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	# flint (and arb, which doesn't make an appearance in ./configure --help)
+	# is somehow connected to e-antic, which we do not yet package. Likewise
+	# we have no packages for cocoalib or hashlibrary.
+	econf \
+		$(use_enable openmp) \
+		$(use_with nauty) \
+		--without-cocoalib \
+		--without-hashlibrary \
+		--without-flint \
+		--without-e-antic \
+		--disable-static
+}
+
+src_compile() {
+	# Clobber the default "AM_LDFLAGS = -Wl,-s" to avoid QA warnings
+	# about pre-stripped binaries.
+	emake AM_LDFLAGS=""
+}
+
+src_install() {
+	default
+
+	use doc && dodoc doc/Normaliz.pdf doc/NmzShortRef.pdf
+	if use extras; then
+		newdoc Singular/normaliz.pdf singular-normaliz.pdf
+		insinto /usr/share/${PN}
+		doins Singular/normaliz.lib
+		doins Macaulay2/Normaliz.m2
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index e914e45678a0..def3e7cb3c01 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -2,9 +2,12 @@ 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-omit-qtchooser-qtver.patch 765 BLAKE2B 2f889e8278e48489f2eab1c399b0bf7af26be7f79e35c29fc2963124852067429f7ee25325402ad6983c047398a5c43c2d9f44d3a96e5c3db49282f826ecab82 SHA512 a1edd69d06aadd5c9772b12f32468bcd25b181883d3c303cd5ff58175e95021ed661d363137002a50073ec9c90564442c8b968ea1a3ad6fe56a80cf27e2efc3a
 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
+DIST octave-7.1.0.tar.gz 34187598 BLAKE2B da4c1b47e0d71f05edc47036b9b10fb83aa6edb8aa911ff22f77a013935ea37295f776f5c478e198c38102b8d1ad68edada818c9b46ad1061a466b5c77eeed58 SHA512 042a68bd2c5c873ccc846c6de13743c6fddd166e8b062948daf184133eb774a05e29ab6132829886411a5ba330126d20a3d0700a606819a424c3db6e57471888
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
-EBUILD octave-6.4.0.ebuild 5552 BLAKE2B 812230e7263273c4db7e2e0c928323aab58a030ce8563d7c14aed90478d48203244999bb5d102c07ff24015af8e7d52657837f5295601771b33e36d83da06bd0 SHA512 694e05ed20b2f3ce7e3df25c668d84869f99f7a4e771a7b0d997da700f561aec593f3af63d604e0749c61b7ada6b0555788933217659ab696ad85abe9ee5c1ee
-MISC metadata.xml 1154 BLAKE2B 34f491369b5ef047f0540be74994b9d6507310db475dc25868e2320e5c4474ebeaba2f80ba90759df53c15294c71ad9631e5f98ad81d2098d3e86e308d5c9eaf SHA512 9f73af69e5318693db98720836f0df25518c4bc3ac9ff72071aa04aaca1147e2c21d14a299b199689e926bff059c33c20f39b9f85062d1e1227e466b2b8b3446
+EBUILD octave-6.4.0-r2.ebuild 5995 BLAKE2B ed94a76a9ce898c58add76c3470062115ed26263dbe61b49c4c480908e2034f2903d54884ef873b1e4b8ca9c251250555fe0f4bfd27034786edfcca6bbd57ddd SHA512 789710b0a71797ef2dbf536959d03bae3da5ba569601e9b91f2e0054f560af78b1ae6c4d8d8c52533eb88b7dffaab8e24f6f3f0d94c626d9edc6df194b50c27e
+EBUILD octave-7.1.0.ebuild 5920 BLAKE2B dd66f57ea2f1c1b61f6837e1964a79deeb35ad81fd42e40ebd2f9f20256f9f4b490e0b2f1d637ec32c561658dbbe045af9f315636ea6e14d29c4155b76ceca95 SHA512 adef7ac2c481acf24be8cb30369745ee0a24dccf21667ed00b0706e4ed6734c9500242cb4aa3b12c56662855993fe6e51dac185b19072663ea6ea0ee7386fcc2
+MISC metadata.xml 1262 BLAKE2B 39736c6913fb3241bed38c5dd9218190d570a3e914a01d1d06fff2cdd68c3c07296a19e2a35305a67aa776a12636445e523b3e349daeffbf67ab60b074a25fed SHA512 177539fd369e2eee0db21ef46d64f8e9f30b39eb4648c5224ff221465c55cd554ac142940f32171ec36b9561b68243761f4e3cbcfb6b06896d45986cbb568c82
diff --git a/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
new file mode 100644
index 000000000000..2b16fbf411e1
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/839285
+--- a/m4/acinclude.m4
++++ b/m4/acinclude.m4
+@@ -2095,9 +2071,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [
+   if test -z "$m4_toupper([$1])_QTVER"; then
+     AC_CHECK_TOOLS(m4_toupper([$1]), [$1])
+     if test -n "$m4_toupper([$1])"; then
+-      if test -n "$QTCHOOSER"; then
+-        m4_toupper([$1])FLAGS="-qt=$qt_version"
+-      fi
+       QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
+     else
+       QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1"
+@@ -2167,8 +2167,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1])
+   QT_TOOLS_MISSING=
+ 
+   if test $build_qt_gui = yes; then
+-    AC_CHECK_TOOLS(QTCHOOSER, [qtchooser])
+-
+     OCTAVE_CHECK_QT_TOOL([moc])
+     OCTAVE_CHECK_QT_TOOL([uic])
+     OCTAVE_CHECK_QT_TOOL([rcc])
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index cfb2c2525f7c..759ec5c83e0f 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -10,6 +10,7 @@
 	</longdescription>
 	<use>
 		<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
+		<flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></flag>
 		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
 		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
 		<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
diff --git a/sci-mathematics/octave/octave-6.4.0.ebuild b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
index bc0547dacdd3..fc956ca314bf 100644
--- a/sci-mathematics/octave/octave-6.4.0.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="High-level interactive language for numerical computations"
 LICENSE="GPL-3"
@@ -76,7 +76,7 @@ RDEPEND="
 		sci-libs/umfpack:0=
 	)
 	ssl? (
-		 dev-libs/openssl:0=
+		dev-libs/openssl:0=
 	)
 	sundials? ( >=sci-libs/sundials-4:0= )
 	X? ( x11-libs/libX11:0= )"
@@ -92,15 +92,19 @@ DEPEND="${RDEPEND}
 	gui? ( dev-qt/linguist-tools:5 )
 	java? ( >=virtual/jdk-1.6.0 )
 	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )"
+	sparse? ( app-misc/pax-utils )
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
 	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
 	"${FILESDIR}/${PN}-6.4.0-slibtool.patch"
+	"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
 )
 
 src_prepare() {
+	default
+
 	# nasty prefix hacks for fltk:1 linking
 	if use prefix; then
 		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
@@ -109,7 +113,6 @@ src_prepare() {
 	# occasional fail on install, force regeneration (bug #401189)
 	rm doc/interpreter/contributors.texi || die
 
-	default
 	eautoreconf
 }
 
@@ -118,6 +121,11 @@ src_configure() {
 	use hdf5 && has_version sci-libs/hdf5[mpi] && \
 		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
 
+	# tell autoconf where to find qt binaries, fix bug #837752
+	export MOC="$(qt5_get_bindir)/moc" UIC="$(qt5_get_bindir)/uic" RCC="$(qt5_get_bindir)/rcc" \
+		LRELEASE="$(qt5_get_bindir)/lrelease" QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
+		QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
+
 	# Some of these use_with flags are a bit mismatched. The configure
 	# script offers only --without-foo, and detects "foo" automatically
 	# unless --without-foo is specified. Passing --with-foo is not an
@@ -187,7 +195,7 @@ src_install() {
 	fi
 	[[ -e test/fntests.log ]] && dodoc test/fntests.log
 	use java && \
-		java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
+		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
 	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
 	doenvd 99octave
 }
diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild b/sci-mathematics/octave/octave-7.1.0.ebuild
new file mode 100644
index 000000000000..b04de9f52552
--- /dev/null
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="High-level interactive language for numerical computations"
+HOMEPAGE="https://www.gnu.org/software/octave/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl
+	portaudio postscript +qhull +qrupdate readline sndfile +sparse
+	ssl static-libs sundials X zlib"
+# Issue when building w/ SSL needs investigation
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug 775254).
+#
+RDEPEND="
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
+	app-text/ghostscript-gpl
+	sys-apps/texinfo
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	virtual/blas
+	virtual/lapack
+	curl? ( net-misc/curl:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
+	gnuplot? ( sci-visualization/gnuplot )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-libs/qscintilla:=
+	)
+	hdf5? ( sci-libs/hdf5:0= )
+	java? ( >=virtual/jre-1.8:* )
+	json? ( dev-libs/rapidjson )
+	opengl? (
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		virtual/glu
+		>=x11-libs/fltk-1.3:1=[opengl,xft]
+		x11-libs/gl2ps:0=
+	)
+	portaudio? ( media-libs/portaudio )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		media-gfx/transfig
+	)
+	qhull? ( media-libs/qhull:0= )
+	qrupdate? ( sci-libs/qrupdate:0= )
+	readline? ( sys-libs/readline:0= )
+	sndfile? ( media-libs/libsndfile )
+	sparse? (
+		sci-libs/arpack:0=
+		sci-libs/camd:0=
+		sci-libs/ccolamd:0=
+		sci-libs/cholmod:0=
+		sci-libs/colamd:0=
+		sci-libs/cxsparse:0=
+		sci-libs/umfpack:0=
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	sundials? ( >=sci-libs/sundials-4:0= )
+	X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gperf
+	virtual/pkgconfig
+	virtual/imagemagick-tools
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	java? ( >=virtual/jdk-1.8:* )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+	"${FILESDIR}"/${PN}-6.4.0-slibtool.patch
+	"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
+)
+
+src_prepare() {
+	default
+
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	# tell autoconf where to find qt binaries, fix bug #837752
+	export MOC="$(qt5_get_bindir)/moc" UIC="$(qt5_get_bindir)/uic" RCC="$(qt5_get_bindir)/rcc" \
+		LRELEASE="$(qt5_get_bindir)/lrelease" QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
+		QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
+
+	# Some of these use_with flags are a bit mismatched. The configure
+	# script offers only --without-foo, and detects "foo" automatically
+	# unless --without-foo is specified. Passing --with-foo is not an
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	# The --enable-link-all-dependencies flag is needed because
+	# otherwise, the build system appends --no-undefined to LDFLAGS and
+	# then proceeds to undefine things. GNU libtool ignores this, but
+	# slibtool (for example) does not (bug #776583).
+	econf \
+		--localstatedir="${EPREFIX}/var/state/octave" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		--disable-64 \
+		--enable-link-all-dependencies \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable json rapidjson) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull qhull_r) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		dodoc $(find doc -name '*.pdf')
+	else
+		# bug #566134, macros.texi is installed by make install if use doc
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+
+	use java && \
+		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
+	doenvd 99octave
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 6deb3b7a23dd..cb84ff2ba5ec 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -5,12 +5,16 @@ AUX singular-4.2.0-doc_install-v2.patch 2918 BLAKE2B 9b844a51165425e696db1270dcb
 AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae
 AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
 AUX singular-4.2.1-htmldoc.patch 2086 BLAKE2B 28ab2e8ef9ad2ff1343d3efd33917503c00fb74428f35b1ab0fb1475368d3760d3c915668d4fb008ccc618e2aa1c13a35f66d3a62f8c3abe93b5275f1648c8e7 SHA512 5c28c31bc51a937ddff4e52da3ed93f20516b64ac6abfc05031d09e708e557268e757c55e625abfd77c19600f64a7f284903de619c113a57194367e23148ff82
+AUX singular-4.3.0-includes.patch 764 BLAKE2B 19c83711d2f7eb0d0971a7259f4b0ed9234204bd2ee45d0f3ffd6de18de8d71bccd00b186edae1af180a36a24fef8e72a4a8bc8371eaef1059ec51dcfec0c116 SHA512 dc775f69280f2194f6fca2a7005ab9363a8feabad3d66d0e285cd76a70da5fd9ad6cbb3e95732cf32f9c55b30a0c201260e4bef56830f498016b6554a7230f53
+AUX singular-4.3.0-slibtool.patch 1511 BLAKE2B 495d226fdd4114468364bdbee0add287d70c3d7c991e81a86c03023c2b73c85936365ebfe254b9a3e45f2043d4f9a6e385d40d4546437f34b4c6478f4f02ada3 SHA512 e62f40e51879709c1d5a409d2ff5fea49ac5b37d73b6e5fc6041756143882fd9ab2bdc4e5ec68ab1626109a27d4b8c7e361e88080ed2a3c62c7f0a1e591c69cf
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
 DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766 SHA512 48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168
+DIST singular-4.3.0.tar.gz 15098830 BLAKE2B 9d99683c23e0fe031866807a7f24888d8e759b93ce8f454db702fee2b5200942957360edb1563f832715837f7908dbc3f37aa2a3bd1224dcf7eaa8594fc0a51f SHA512 b765536fc929f2445a3f7bea73a6a351ff98fe3326b9f3ba99c5b1cec3bfb494ed957725aad548e349a2a3f8a4058ef350ab11e7153091c9b0233f201008bbb2
 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.ebuild 2571 BLAKE2B 7ccf61735ce3bfd5472b646dceb77239430d44bff9816ea2c1a5cd1cd4807c0138ec2396a193c98b7c3b456a36ee72c6351ff95f949f3afa318b5955a14a014b SHA512 1aad8be5aee15235c8f4a865ec8e3e19c3cac61ae6c8db39e7a7f614119fa2dfc1869a7ce9cc6fb896a5ffb455c65e90b2fc91cf98d5b0a3e193941deadc807c
 EBUILD singular-4.2.1_p3-r1.ebuild 2628 BLAKE2B 5ff968e3c06d722d2f1c0c872ea4c541e9e5e90bda4e8af8e54ba38aba21464ed8f7cfea727883de0ed34831f12c780ed45dd2a038856a19d142200d0073688e SHA512 8d0e74684f138c08288ac642ad0450a364c5b0deb6f805680289408d54fee563cadd32a81297a48e8148679b537903190e8abba069a60e38e06cb8bc10b6ee75
+EBUILD singular-4.3.0.ebuild 2499 BLAKE2B b03d3c8a01eeeafea83d23c3cd6979239b2be9febabd42b81774676ae44d8df64144f734e3d202e2f916d1a186e9ce1b5e38ce844358d373cd56cd68ac73245d SHA512 27bf7a713bbbb23046a05961e91c2249c7a3240ef37925b4d9873f2def8ec8d9ac5f92f92d893ea9cbb036c0de462347d20c262be1e3bc6a6412a3442d101aee
 MISC metadata.xml 510 BLAKE2B 54fa3549c356ab3cb45b859dda337a25959bee37acf1210704b79de849e5b9861b9f0d85639d11db461995074ca00c91fb0dce8459231ef42f76257c8f0a6e51 SHA512 d2f4ec93fe340097a9a09845fffcd4a385434fb267350bb8dce9eae9248487b87cb3b68e0e1e05a1c78ad956a48548f47663a2f4db84af0d68ade02327df1268
diff --git a/sci-mathematics/singular/files/singular-4.3.0-includes.patch b/sci-mathematics/singular/files/singular-4.3.0-includes.patch
new file mode 100644
index 000000000000..07df5c0cc068
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.0-includes.patch
@@ -0,0 +1,29 @@
+From bbc293564bf76fcdfdc37354d406b7ca77bc780f Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
+Date: Wed, 19 Jan 2022 15:02:14 +0100
+Subject: [PATCH] fix: missing includes
+
+---
+ kernel/oswrapper/feread.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/kernel/oswrapper/feread.cc b/kernel/oswrapper/feread.cc
+index ccdd272285..5491007478 100644
+--- a/kernel/oswrapper/feread.cc
++++ b/kernel/oswrapper/feread.cc
+@@ -7,6 +7,7 @@
+ 
+ #include "kernel/mod2.h"
+ #include <errno.h>
++#include <stdio.h>
+ 
+ // ----------------------------------------
+ // system settings:
+@@ -21,6 +22,7 @@
+ #include "misc/options.h"
+ 
+ #include "kernel/oswrapper/feread.h"
++#include "reporter/reporter.h"
+ 
+ #if defined(HAVE_DYN_RL)
+ #include <unistd.h>
diff --git a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
new file mode 100644
index 000000000000..72d88979e870
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
@@ -0,0 +1,33 @@
+diff --git a/libpolys/configure.ac b/libpolys/configure.ac
+index ba7d911..346602f 100644
+--- a/libpolys/configure.ac
++++ b/libpolys/configure.ac
+@@ -88,6 +88,7 @@ AC_CANONICAL_HOST
+ 
+ case $host_os in
+   *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
++  *) AX_APPEND_LINK_FLAGS([-shared -dynamic -export-dynamic -avoid-version -flat_namespace],[P_PROCS_MODULE_LDFLAGS]);;
+ esac
+ 
+ dnl INCLUDES=""
+diff --git a/libpolys/polys/Makefile.am b/libpolys/polys/Makefile.am
+index 23f216e..119c4ef 100644
+--- a/libpolys/polys/Makefile.am
++++ b/libpolys/polys/Makefile.am
+@@ -69,12 +69,10 @@ p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
+ p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
+ p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
+ 
+-P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -flat_namespace
+-
+-p_Procs_FieldGeneral_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
+-p_Procs_FieldIndep_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
+-p_Procs_FieldQ_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
+-p_Procs_FieldZp_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
++p_Procs_FieldGeneral_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
++p_Procs_FieldIndep_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
++p_Procs_FieldQ_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
++p_Procs_FieldZp_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
+ 
+ P_PROCS = templates/p_Procs_Lib.cc
+ 
diff --git a/sci-mathematics/singular/singular-4.3.0.ebuild b/sci-mathematics/singular/singular-4.3.0.ebuild
new file mode 100644
index 000000000000..e2ccc7d6e9a3
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.3.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 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 ~ppc ~riscv ~x86 ~x86-linux"
+IUSE="emacs examples 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:* )
+	polymake? ( sci-mathematics/polymake )
+	readline? ( sys-libs/readline )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE=60${PN}-gentoo.el
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.1-htmldoc.patch"
+	"${FILESDIR}/${PN}-4.3.0-slibtool.patch"
+	"${FILESDIR}/${PN}-4.3.0-includes.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-debug
+		--disable-doc
+		--disable-optimizationflags
+		--disable-pyobject-module
+		--disable-python
+		--disable-python-module
+		--disable-python_module
+		--enable-factory
+		--enable-gfanlib
+		--enable-libfac
+		--with-flint
+		--with-gmp
+		--with-libparse
+		--with-ntl
+		--without-python
+		--without-pythonmodule
+		$(use_enable emacs)
+		$(use_enable polymake polymake-module)
+		$(use_enable static-libs static)
+		$(use_with readline)
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		pushd "${S}"/emacs
+		elisp-compile *.el || die "elisp-compile failed"
+		popd
+	fi
+}
+
+src_install() {
+	# Do not compress singular's info file (singular.hlp)
+	# some consumer of that file do not know how to deal with compression
+	docompress -x /usr/share/info
+
+	default
+
+	dosym Singular /usr/bin/"${PN}"
+
+	# purge .la file
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	# SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
+	# an already installed version of singular may be used and cause segfault
+	# See https://github.com/Singular/Sources/issues/980
+	SINGULAR_PROCS_DIR="" emake check
+}
+
+pkg_postinst() {
+	einfo "Additional functionality can be enabled by installing"
+	einfo "sci-mathematics/4ti2"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index a79bad965c98..7bf56ea5992f 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,8 +1,5 @@
-AUX topcom-0.17.7-buildsystem.patch 16106 BLAKE2B 3194b44cd20ace8f164b5624e988fab30839a4a967adf1f7fec91a1c517ae2e94404df9ee6a92ad96212aaf4f5ce2226a9e931543e8feb111436bdc6e7432f99 SHA512 a9fc6a067537f85b437e8a3de17cae8ad1cf96848832bc493ade869be9d4621193ec40752d5f80a5244768fe121a53bde97e606e04ede6f602228d244cf312e6
-AUX topcom-0.17.8-buildsystem.patch 4989 BLAKE2B a19b70ff73da5e93beac923db339b8ffbde2a8867417ac2be02bf0c067ed11d47400e89fa0c4c0abd51fdc838da8190e41d1141bc4f23d89842b6de8f51f2edc SHA512 7d5339ae6140222898df6ddaf17a47cd016f4fb7dc88d30dea492d2818402ab1882907b86e15168f4bc31b576aac9cb74307601e1f021b65253f08adb1acf60d
-DIST TOPCOM-0.17.7.tar.gz 8661519 BLAKE2B f42d273b39b15ccaf0d24ad360dc91cecd2ab83c97eb5a2fffe95575d7c8063d9afa842d7bfae03faee32ced1f98ccc55a750a59c1f544acded462a478aac636 SHA512 528e566e488641e078a8c9150f88a1544f607e6859da1d95a98dc5890c5a52882f8c8790097c3a77277066bd5d4c10a1e0a9c131fbc521f56f6139eeab7e21d1
-DIST TOPCOM-0.17.8.tar.gz 8994044 BLAKE2B 27426b9fd9da8bc51e3632483cdd1c3f878a03d22dcad637c1c26368d58dbc9a9ef4c6918e314484336b1355cdf703287bf50d248e257773729a4d9fd012c0ca SHA512 2ddab2f30bf3adf93f0bb76c50bc70a5927fe2a9561a59df0ac7bec193b9a9b231eecb58c69840247536b73fda5298955518e798c3b5f8d2961ca09dfdc81cce
+AUX topcom-0.17.8-buildsystem.patch 8162 BLAKE2B 2eb03fd1c2559f09ebc41180d0fa6e55d3b0b7de039e9c0f16f12cda88ec3a4af6f26029dabee037f23be303e7b7c33c79712dc9f24481bc36ecd1ccb8a8a4ab SHA512 70e247f5a366c7efa4cf30de06670694700ffa3b4a047301ee477ac407da452488819466d99e3db73c5b8971a1f5d0f2544116680481cbde3a4112a41d4dc344
+DIST TOPCOM-0_17_8.tgz 8994044 BLAKE2B 27426b9fd9da8bc51e3632483cdd1c3f878a03d22dcad637c1c26368d58dbc9a9ef4c6918e314484336b1355cdf703287bf50d248e257773729a4d9fd012c0ca SHA512 2ddab2f30bf3adf93f0bb76c50bc70a5927fe2a9561a59df0ac7bec193b9a9b231eecb58c69840247536b73fda5298955518e798c3b5f8d2961ca09dfdc81cce
 DIST TOPCOM-manual.html 19251 BLAKE2B 8e361fd81bed45b552766a86a856ed1411154b5c523e14463750651d1c8d7b0f1f25a7c29bfdc34910fad3d19a1df94ded47b63a973f22baf3d60a7c5f0e1578 SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67
-EBUILD topcom-0.17.7-r1.ebuild 1167 BLAKE2B 2e94f559c1f84a4ff1d384f2da1a86dbc76fa2fc405fedf6d00040d8ca3a71f23365f4d04947236f02195ea3d2b0c23a762e1abf48c384de88b233d6686bda40 SHA512 a4e492e95d249625f67cdab3e492475a3276e45e550f9b6c643fa1214db07dca72f84bf3110bd2dbcaff0694542d2d05bab0197ae2b43077ebe010273be87981
-EBUILD topcom-0.17.8-r1.ebuild 1308 BLAKE2B a090c79de38e71c559f29ef9919d899044d105184f05ea83b96dd757b2379939bc7c0876dac33eaa6db655d0381eac6a6f4c9f2001cf82664483c27f718c1772 SHA512 eae5309fbcf4d2105839867725e852fa3077fcc2fa4e77dfa99a54054f23d1b452e0551d6509b6b7f682dae980f147d8e6a709c68ecef51e1cae4c36d84d1669
+EBUILD topcom-0.17.8-r3.ebuild 1456 BLAKE2B c111eab374ad4ab77bbba83d9e07ca2318a25fd8efa631c016103554786e1e1196d5f68b5d81f6acda644352e800ecac5fea6bfbb2f7dd0fe038388ea6760037 SHA512 696583d83ac2f0e8bf0ed4157cce8136af6053c4930f9e8c06701bd9451ffb53b68fb03ca505e203e383faa9ff28bae8a1e8c3671123ad3fd61ef53e581f4e3d
 MISC metadata.xml 270 BLAKE2B 4a5eb6dd2d9b902f13d543c859532c69cadc4595acd36675d25ff9ff204757f274327f87aa1bd7ddb1f040d5b028f52f614828b6794c19f60cc08dca04185af6 SHA512 cff77e4b0c454fc9c32b427b012585f4b1ab12dc2ca19ef669b43b0c64eb0ad6ffdc07a04c0c3e4eef8ce621f3a90c701bdd824cbc6e828aa62f6450f40ac1c6
diff --git a/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch
deleted file mode 100644
index 154ccd0382b8..000000000000
--- a/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -U 3 -dHrN topcom-0.17.7.orig/src/Makefile.in topcom-0.17.7/src/Makefile.in
---- topcom-0.17.7.orig/src/Makefile.in	2016-07-08 12:46:13.000000000 +0200
-+++ topcom-0.17.7/src/Makefile.in	2016-09-25 20:22:51.729578197 +0200
-@@ -119,249 +119,206 @@
- am_B_A_OBJECTS = B_A.$(OBJEXT)
- B_A_OBJECTS = $(am_B_A_OBJECTS)
- B_A_LDADD = $(LDADD)
--B_A_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a \
--	../external/lib/libcddgmp.a ../external/lib/libgmpxx.a \
--	../external/lib/libgmp.a
-+B_A_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a
- am_B_A_center_OBJECTS = B_A_center.$(OBJEXT)
- B_A_center_OBJECTS = $(am_B_A_center_OBJECTS)
- B_A_center_LDADD = $(LDADD)
- B_A_center_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_B_D_OBJECTS = B_D.$(OBJEXT)
- B_D_OBJECTS = $(am_B_D_OBJECTS)
- B_D_LDADD = $(LDADD)
--B_D_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a \
--	../external/lib/libcddgmp.a ../external/lib/libgmpxx.a \
--	../external/lib/libgmp.a
-+B_D_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a
- am_chiro2allfinetriangs_OBJECTS = chiro2allfinetriangs.$(OBJEXT)
- chiro2allfinetriangs_OBJECTS = $(am_chiro2allfinetriangs_OBJECTS)
- chiro2allfinetriangs_LDADD = $(LDADD)
- chiro2allfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2alltriangs_OBJECTS = chiro2alltriangs.$(OBJEXT)
- chiro2alltriangs_OBJECTS = $(am_chiro2alltriangs_OBJECTS)
- chiro2alltriangs_LDADD = $(LDADD)
- chiro2alltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2circuits_OBJECTS = chiro2circuits.$(OBJEXT)
- chiro2circuits_OBJECTS = $(am_chiro2circuits_OBJECTS)
- chiro2circuits_LDADD = $(LDADD)
- chiro2circuits_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a
- am_chiro2cocircuits_OBJECTS = chiro2cocircuits.$(OBJEXT)
- chiro2cocircuits_OBJECTS = $(am_chiro2cocircuits_OBJECTS)
- chiro2cocircuits_LDADD = $(LDADD)
- chiro2cocircuits_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2dual_OBJECTS = chiro2dual.$(OBJEXT)
- chiro2dual_OBJECTS = $(am_chiro2dual_OBJECTS)
- chiro2dual_LDADD = $(LDADD)
- chiro2dual_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2finetriang_OBJECTS = chiro2finetriang.$(OBJEXT)
- chiro2finetriang_OBJECTS = $(am_chiro2finetriang_OBJECTS)
- chiro2finetriang_LDADD = $(LDADD)
- chiro2finetriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2finetriangs_OBJECTS = chiro2finetriangs.$(OBJEXT)
- chiro2finetriangs_OBJECTS = $(am_chiro2finetriangs_OBJECTS)
- chiro2finetriangs_LDADD = $(LDADD)
- chiro2finetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2mintriang_OBJECTS = chiro2mintriang.$(OBJEXT)
- chiro2mintriang_OBJECTS = $(am_chiro2mintriang_OBJECTS)
- chiro2mintriang_LDADD = $(LDADD)
- chiro2mintriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2nallfinetriangs_OBJECTS = chiro2nallfinetriangs.$(OBJEXT)
- chiro2nallfinetriangs_OBJECTS = $(am_chiro2nallfinetriangs_OBJECTS)
- chiro2nallfinetriangs_LDADD = $(LDADD)
- chiro2nallfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2nalltriangs_OBJECTS = chiro2nalltriangs.$(OBJEXT)
- chiro2nalltriangs_OBJECTS = $(am_chiro2nalltriangs_OBJECTS)
- chiro2nalltriangs_LDADD = $(LDADD)
- chiro2nalltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2nfinetriangs_OBJECTS = chiro2nfinetriangs.$(OBJEXT)
- chiro2nfinetriangs_OBJECTS = $(am_chiro2nfinetriangs_OBJECTS)
- chiro2nfinetriangs_LDADD = $(LDADD)
- chiro2nfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2ntriangs_OBJECTS = chiro2ntriangs.$(OBJEXT)
- chiro2ntriangs_OBJECTS = $(am_chiro2ntriangs_OBJECTS)
- chiro2ntriangs_LDADD = $(LDADD)
- chiro2ntriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2placingtriang_OBJECTS = chiro2placingtriang.$(OBJEXT)
- chiro2placingtriang_OBJECTS = $(am_chiro2placingtriang_OBJECTS)
- chiro2placingtriang_LDADD = $(LDADD)
- chiro2placingtriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_chiro2triangs_OBJECTS = chiro2triangs.$(OBJEXT)
- chiro2triangs_OBJECTS = $(am_chiro2triangs_OBJECTS)
- chiro2triangs_LDADD = $(LDADD)
- chiro2triangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_cocircuits2facets_OBJECTS = cocircuits2facets.$(OBJEXT)
- cocircuits2facets_OBJECTS = $(am_cocircuits2facets_OBJECTS)
- cocircuits2facets_LDADD = $(LDADD)
- cocircuits2facets_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a
- am_cross_OBJECTS = cross.$(OBJEXT)
- cross_OBJECTS = $(am_cross_OBJECTS)
- cross_LDADD = $(LDADD)
- cross_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a
- am_cube_OBJECTS = cube.$(OBJEXT)
- cube_OBJECTS = $(am_cube_OBJECTS)
- cube_LDADD = $(LDADD)
- cube_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_cyclic_OBJECTS = cyclic.$(OBJEXT)
- cyclic_OBJECTS = $(am_cyclic_OBJECTS)
- cyclic_LDADD = $(LDADD)
- cyclic_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_hypersimplex_OBJECTS = hypersimplex.$(OBJEXT)
- hypersimplex_OBJECTS = $(am_hypersimplex_OBJECTS)
- hypersimplex_LDADD = $(LDADD)
- hypersimplex_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_lattice_OBJECTS = lattice.$(OBJEXT)
- lattice_OBJECTS = $(am_lattice_OBJECTS)
- lattice_LDADD = $(LDADD)
- lattice_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2allfinetriangs_OBJECTS = points2allfinetriangs.$(OBJEXT)
- points2allfinetriangs_OBJECTS = $(am_points2allfinetriangs_OBJECTS)
- points2allfinetriangs_LDADD = $(LDADD)
- points2allfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2alltriangs_OBJECTS = points2alltriangs.$(OBJEXT)
- points2alltriangs_OBJECTS = $(am_points2alltriangs_OBJECTS)
- points2alltriangs_LDADD = $(LDADD)
- points2alltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2chiro_OBJECTS = points2chiro.$(OBJEXT)
- points2chiro_OBJECTS = $(am_points2chiro_OBJECTS)
- points2chiro_LDADD = $(LDADD)
- points2chiro_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2facets_OBJECTS = points2facets.$(OBJEXT)
- points2facets_OBJECTS = $(am_points2facets_OBJECTS)
- points2facets_LDADD = $(LDADD)
- points2facets_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2finetriang_OBJECTS = points2finetriang.$(OBJEXT)
- points2finetriang_OBJECTS = $(am_points2finetriang_OBJECTS)
- points2finetriang_LDADD = $(LDADD)
- points2finetriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2finetriangs_OBJECTS = points2finetriangs.$(OBJEXT)
- points2finetriangs_OBJECTS = $(am_points2finetriangs_OBJECTS)
- points2finetriangs_LDADD = $(LDADD)
- points2finetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2flips_OBJECTS = points2flips.$(OBJEXT)
- points2flips_OBJECTS = $(am_points2flips_OBJECTS)
- points2flips_LDADD = $(LDADD)
- points2flips_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2nallfinetriangs_OBJECTS = points2nallfinetriangs.$(OBJEXT)
- points2nallfinetriangs_OBJECTS = $(am_points2nallfinetriangs_OBJECTS)
- points2nallfinetriangs_LDADD = $(LDADD)
- points2nallfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2nalltriangs_OBJECTS = points2nalltriangs.$(OBJEXT)
- points2nalltriangs_OBJECTS = $(am_points2nalltriangs_OBJECTS)
- points2nalltriangs_LDADD = $(LDADD)
- points2nalltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2nfinetriangs_OBJECTS = points2nfinetriangs.$(OBJEXT)
- points2nfinetriangs_OBJECTS = $(am_points2nfinetriangs_OBJECTS)
- points2nfinetriangs_LDADD = $(LDADD)
- points2nfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2nflips_OBJECTS = points2nflips.$(OBJEXT)
- points2nflips_OBJECTS = $(am_points2nflips_OBJECTS)
- points2nflips_LDADD = $(LDADD)
- points2nflips_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2ntriangs_OBJECTS = points2ntriangs.$(OBJEXT)
- points2ntriangs_OBJECTS = $(am_points2ntriangs_OBJECTS)
- points2ntriangs_LDADD = $(LDADD)
- points2ntriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2placingtriang_OBJECTS = points2placingtriang.$(OBJEXT)
- points2placingtriang_OBJECTS = $(am_points2placingtriang_OBJECTS)
- points2placingtriang_LDADD = $(LDADD)
- points2placingtriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2triangs_OBJECTS = points2triangs.$(OBJEXT)
- points2triangs_OBJECTS = $(am_points2triangs_OBJECTS)
- points2triangs_LDADD = $(LDADD)
- points2triangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_points2volume_OBJECTS = points2volume.$(OBJEXT)
- points2volume_OBJECTS = $(am_points2volume_OBJECTS)
- points2volume_LDADD = $(LDADD)
- points2volume_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_santos_22_triang_OBJECTS = santos_22_triang.$(OBJEXT)
- santos_22_triang_OBJECTS = $(am_santos_22_triang_OBJECTS)
- santos_22_triang_LDADD = $(LDADD)
- santos_22_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_santos_dim4_triang_OBJECTS = santos_dim4_triang.$(OBJEXT)
- santos_dim4_triang_OBJECTS = $(am_santos_dim4_triang_OBJECTS)
- santos_dim4_triang_LDADD = $(LDADD)
- santos_dim4_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- am_santos_triang_OBJECTS = santos_triang.$(OBJEXT)
- santos_triang_OBJECTS = $(am_santos_triang_OBJECTS)
- santos_triang_LDADD = $(LDADD)
- santos_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
--	../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src-reg/libCHECKREG.a 
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -591,9 +548,6 @@
- santos_22_triang_SOURCES = santos_22_triang.cc
- LDADD = ../lib-src/libTOPCOM.a \
-                   ../lib-src-reg/libCHECKREG.a \
--                  ../external/lib/libcddgmp.a \
--                  ../external/lib/libgmpxx.a \
--                  ../external/lib/libgmp.a
- 
- AM_CPPFLAGS = -I../lib-src -I../lib-src-reg -I../wrap-gmp-gmpxx \
- 	-I../external/include -I$(includedir) -DVERBOSE -DGMPRATIONAL \
-diff -U 3 -dHrN topcom-0.17.7.orig/src-reg/Makefile.in topcom-0.17.7/src-reg/Makefile.in
---- topcom-0.17.7.orig/src-reg/Makefile.in	2016-07-08 12:46:13.000000000 +0200
-+++ topcom-0.17.7/src-reg/Makefile.in	2016-09-25 20:19:04.062645737 +0200
-@@ -102,8 +102,7 @@
- checkregularity_OBJECTS = $(am_checkregularity_OBJECTS)
- checkregularity_LDADD = $(LDADD)
- checkregularity_DEPENDENCIES = ../lib-src-reg/libCHECKREG.a \
--	../lib-src/libTOPCOM.a ../external/lib/libcddgmp.a \
--	../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+	../lib-src/libTOPCOM.a
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -257,9 +256,6 @@
- checkregularity_SOURCES = checkregularity.cc
- LDADD = ../lib-src-reg/libCHECKREG.a \
-                   ../lib-src/libTOPCOM.a \
--                  ../external/lib/libcddgmp.a \
--                  ../external/lib/libgmpxx.a \
--                  ../external/lib/libgmp.a
- 
- AM_CPPFLAGS = -I../lib-src -I../lib-src-reg -I../wrap-gmp-gmpxx \
- 	-I../external/include -I$(includedir) -DVERBOSE -DGMPRATIONAL \
diff --git a/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
index deb1ad3ebbad..2b517b441ed3 100644
--- a/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
+++ b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
@@ -1,7 +1,34 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2020-02-15 12:44:55.065569980 +0100
-+++ b/configure.ac	2020-02-15 14:08:21.905767776 +0100
-@@ -9,7 +9,9 @@
+From 27284e6a9cb95dcd274abbe184b21eed8a899904 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 May 2022 16:00:45 -0400
+Subject: [PATCH 1/3] Gentoo's existing build system patch
+
+---
+ Makefile.am                |  5 -----
+ configure.ac               |  8 +++-----
+ lib-src-reg/Makefile.am    |  8 ++++----
+ lib-src/Makefile.am        |  8 ++++----
+ src-reg/Makefile.am        | 15 +++++----------
+ src/Makefile.am            | 14 +++++---------
+ wrap-gmp-gmpxx/Makefile.am |  4 ++--
+ 7 files changed, 23 insertions(+), 39 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5dd0de0..4586f79 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1 @@
+ SUBDIRS      = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples
+-EXTRA_DIST   = external/Makefile
+-EXTRA_DIST  += external/gmp-6.1.1.tar.bz2
+-EXTRA_DIST  += external/cddlib-0.94f-TOPCOM.tar.gz
+-EXTRA_DIST  += external/gmpxx-patch
+-
+diff --git a/configure.ac b/configure.ac
+index 6635345..a10fb97 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,9 @@ dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_INSTALL
  AC_PROG_CXX
@@ -12,7 +39,7 @@ diff -ur a/configure.ac b/configure.ac
  
  dnl Checks for libraries.
  dnl Replace `main' with a function in -lg:
-@@ -18,10 +20,6 @@
+@@ -18,10 +20,6 @@ dnl Replace `main' with a function in -lstdc:
  dnl AC_CHECK_LIB(stdc, main)
  dnl Replace `main' with a function in -lstdc++:
  dnl AC_CHECK_LIB(stdc++, main)
@@ -23,9 +50,35 @@ diff -ur a/configure.ac b/configure.ac
  dnl Check for soplex:
  AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.')
  
-diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am
---- a/lib-src/Makefile.am	2020-02-15 12:44:55.145570436 +0100
-+++ b/lib-src/Makefile.am	2020-02-15 14:08:44.741903592 +0100
+diff --git a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am
+index fc8b005..d07b8f8 100644
+--- a/lib-src-reg/Makefile.am
++++ b/lib-src-reg/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LIBRARIES = libCHECKREG.a
++lib_LTLIBRARIES = libCHECKREG.la
+ 
+-libCHECKREG_a_SOURCES = \
++libCHECKREG_la_SOURCES = \
+ SPXinterface.cc \
+ LPinterface.cc \
+ RegularityCheck.cc
+@@ -12,9 +12,9 @@ LPinterface.hh
+ 
+ AM_CPPFLAGS     = -I../lib-src 
+ AM_CPPFLAGS    += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS    += -I../external/include
++AM_CPPFLAGS    += $(CPPFLAGS)
+ AM_CPPFLAGS    += -I$(includedir)
+ 
+ AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
+ 
+-AM_CXXFLAGS     = -O2
++AM_CXXFLAGS     = $(CXXFLAGS)
+diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
+index b2358cc..90b735a 100644
+--- a/lib-src/Makefile.am
++++ b/lib-src/Makefile.am
 @@ -1,6 +1,6 @@
 -lib_LIBRARIES       = libTOPCOM.a
 +lib_LTLIBRARIES       = libTOPCOM.la
@@ -35,7 +88,7 @@ diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am
  Admissibles.cc \
  CheckTriang.cc \
  Circuits.cc \
-@@ -90,9 +90,9 @@
+@@ -90,9 +90,9 @@ VirtualChiro.hh
  
  AM_CPPFLAGS     = -I../lib-src-reg
  AM_CPPFLAGS    += -I../wrap-gmp-gmpxx
@@ -47,49 +100,16 @@ diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am
  
 -AM_CXXFLAGS     = -O2 -g
 +AM_CXXFLAGS     = $(CXXFLAGS)
-diff -ur a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am
---- a/lib-src-reg/Makefile.am	2020-02-15 12:44:55.165570550 +0100
-+++ b/lib-src-reg/Makefile.am	2020-02-15 14:08:22.921773817 +0100
-@@ -1,6 +1,6 @@
--lib_LIBRARIES = libCHECKREG.a
-+lib_LTLIBRARIES = libCHECKREG.la
+diff --git a/src-reg/Makefile.am b/src-reg/Makefile.am
+index a351951..38f8f9f 100644
+--- a/src-reg/Makefile.am
++++ b/src-reg/Makefile.am
+@@ -2,20 +2,15 @@ bin_PROGRAMS = checkregularity
  
--libCHECKREG_a_SOURCES = \
-+libCHECKREG_la_SOURCES = \
- SPXinterface.cc \
- LPinterface.cc \
- RegularityCheck.cc
-@@ -12,9 +12,9 @@
- 
- AM_CPPFLAGS     = -I../lib-src 
- AM_CPPFLAGS    += -I../wrap-gmp-gmpxx
--AM_CPPFLAGS    += -I../external/include
-+AM_CPPFLAGS    += $(CPPFLAGS)
- AM_CPPFLAGS    += -I$(includedir)
- 
- AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
- 
--AM_CXXFLAGS     = -O2
-+AM_CXXFLAGS     = $(CXXFLAGS)
-diff -ur a/Makefile.am b/Makefile.am
---- a/Makefile.am	2020-02-15 12:44:55.065569980 +0100
-+++ b/Makefile.am	2020-02-15 14:08:22.929773865 +0100
-@@ -1,6 +1 @@
- SUBDIRS      = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples
--EXTRA_DIST   = external/Makefile
--EXTRA_DIST  += external/gmp-6.1.1.tar.bz2
--EXTRA_DIST  += external/cddlib-0.94f-TOPCOM.tar.gz
--EXTRA_DIST  += external/gmpxx-patch
--
-diff -ur a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am	2020-02-15 12:44:55.165570550 +0100
-+++ b/src/Makefile.am	2020-02-15 14:08:22.933773888 +0100
-@@ -83,18 +83,14 @@
- santos_dim4_triang_SOURCES         = santos_dim4_triang.cc
- santos_22_triang_SOURCES           = santos_22_triang.cc
+ checkregularity_SOURCES = checkregularity.cc
  
--LDADD           = ../lib-src/libTOPCOM.a \
--                  ../lib-src-reg/libCHECKREG.a \
+-LDADD           = ../lib-src-reg/libCHECKREG.a \
+-                  ../lib-src/libTOPCOM.a \
 -                  ../external/lib/libcddgmp.a \
 -                  ../external/lib/libgmpxx.a \
 -                  ../external/lib/libgmp.a
@@ -103,20 +123,23 @@ diff -ur a/src/Makefile.am b/src/Makefile.am
 +AM_CPPFLAGS    += $(CPPFLAGS)
  AM_CPPFLAGS    += -I$(includedir)
  
+ 
 -AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
+-
+-AM_CXXFLAGS     = -O2
 +AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG
  
--AM_CXXFLAGS     = -O2
 +AM_CXXFLAGS     = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG
-diff -ur a/src-reg/Makefile.am b/src-reg/Makefile.am
---- a/src-reg/Makefile.am	2020-02-15 12:44:55.165570550 +0100
-+++ b/src-reg/Makefile.am	2020-02-15 14:08:22.933773888 +0100
-@@ -2,20 +2,15 @@
- 
- checkregularity_SOURCES = checkregularity.cc
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ff7e574..63a76fc 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -83,18 +83,14 @@ santos_triang_SOURCES              = santos_triang.cc
+ santos_dim4_triang_SOURCES         = santos_dim4_triang.cc
+ santos_22_triang_SOURCES           = santos_22_triang.cc
  
--LDADD           = ../lib-src-reg/libCHECKREG.a \
--                  ../lib-src/libTOPCOM.a \
+-LDADD           = ../lib-src/libTOPCOM.a \
+-                  ../lib-src-reg/libCHECKREG.a \
 -                  ../external/lib/libcddgmp.a \
 -                  ../external/lib/libgmpxx.a \
 -                  ../external/lib/libgmp.a
@@ -130,17 +153,16 @@ diff -ur a/src-reg/Makefile.am b/src-reg/Makefile.am
 +AM_CPPFLAGS    += $(CPPFLAGS)
  AM_CPPFLAGS    += -I$(includedir)
  
- 
 -AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
--
--AM_CXXFLAGS     = -O2
 +AM_CPPFLAGS    += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG
  
+-AM_CXXFLAGS     = -O2
 +AM_CXXFLAGS     = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG
-diff -ur a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
---- a/wrap-gmp-gmpxx/Makefile.am	2020-02-15 12:44:55.165570550 +0100
-+++ b/wrap-gmp-gmpxx/Makefile.am	2020-02-15 14:08:23.105774912 +0100
-@@ -3,6 +3,6 @@
+diff --git a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
+index b9ef8db..4c3f675 100644
+--- a/wrap-gmp-gmpxx/Makefile.am
++++ b/wrap-gmp-gmpxx/Makefile.am
+@@ -3,6 +3,6 @@ Integer.h \
  Rational.h
  
  AM_CPPFLAGS        = -I../external/include
@@ -149,3 +171,87 @@ diff -ur a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
  
 -AM_CXXFLAGS     = -O2
 +AM_CXXFLAGS     = $(CXXFLAGS)
+-- 
+2.35.1
+
+From 1980a3cba20ac549f488d7e00a01d3eee61485be Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 May 2022 16:14:57 -0400
+Subject: [PATCH 2/3] configure.ac: don't try to invoke csh to print an
+ informational message.
+
+On systems that don't have csh, running "csh -c 'echo...'" will result
+in an error; for example,
+
+  ./configure: line 4102: csh: command not found
+
+Autoconf already provides macros to print the status and results of
+various checks, so here we switch this particular invocation to make
+use of AC_MSG_CHECKING and AC_MSG_RESULT.
+
+While we're at it, the old-fashioned AC_CHECK_LIB was updated to use
+the newer AC_SEARCH_LIBS.
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a10fb97..0b2c0aa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,11 @@ dnl AC_CHECK_LIB(stdc, main)
+ dnl Replace `main' with a function in -lstdc++:
+ dnl AC_CHECK_LIB(stdc++, main)
+ dnl Check for soplex:
+-AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.')
++AC_MSG_CHECKING([for soplex])
++AC_SEARCH_LIBS([main],
++               [soplex],
++               [AC_MSG_RESULT([success])],
++               [AC_MSG_RESULT([failed, --soplex will not work])])
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-- 
+2.35.1
+
+From 041f20f5712262ab99bfdfe29e20355d5e4fbf5d Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 May 2022 16:19:50 -0400
+Subject: [PATCH 3/3] configure.ac: run autoupdate.
+
+Autoconf-2.7x emits a few warnings while processing configure.ac. This
+commit is the result of running "autoupdate" to fix them.
+---
+ configure.ac | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0b2c0aa..cddaef6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(TOPCOM, 0.17.8)
++AC_INIT([TOPCOM],[0.17.8])
+ AC_CONFIG_SRCDIR(.)
+ 
+ dnl Init automake.
+@@ -27,12 +27,9 @@ AC_SEARCH_LIBS([main],
+                [AC_MSG_RESULT([success])],
+                [AC_MSG_RESULT([failed, --soplex will not work])])
+ 
+-dnl Checks for header files.
+-AC_HEADER_STDC
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ 
+-dnl Checks for library functions.
+-
+-AC_OUTPUT(wrap-gmp-gmpxx/Makefile lib-src/Makefile lib-src-reg/Makefile src/Makefile src-reg/Makefile examples/Makefile Makefile)
++AC_CONFIG_FILES([wrap-gmp-gmpxx/Makefile lib-src/Makefile lib-src-reg/Makefile src/Makefile src-reg/Makefile examples/Makefile Makefile])
++AC_OUTPUT
+-- 
+2.35.1
+
diff --git a/sci-mathematics/topcom/topcom-0.17.7-r1.ebuild b/sci-mathematics/topcom/topcom-0.17.7-r1.ebuild
deleted file mode 100644
index 0e7e8c06ff27..000000000000
--- a/sci-mathematics/topcom/topcom-0.17.7-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
-HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
-SRC_URI="
-	http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-${PV}.tar.gz
-	doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc examples static-libs"
-
-DEPEND="
-	dev-libs/gmp:0
-	>=sci-libs/cddlib-094f"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-buildsystem.patch
-)
-
-src_prepare() {
-	# ... and link in tree versions:
-	append-libs -lgmp -lgmpxx -lcddgmp
-
-	find external -delete || die
-
-	default
-}
-
-src_install() {
-	default
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*a
-
-	use examples && dodoc -r "${S}"/examples
-
-	docinto html
-	use doc && dodoc "${DISTDIR}"/TOPCOM-manual.html
-
-	mv "${ED}"/usr/bin/cube "${ED}"/usr/bin/topcom_cube || die
-}
-
-pkg_postinst() {
-	elog "Due to a file collision with media-libs/lib3ds the helper"
-	elog "'cube' has been installed as topcom_cube (see bug #547030)."
-}
diff --git a/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild b/sci-mathematics/topcom/topcom-0.17.8-r3.ebuild
index d0558905f947..a2d33b020ee2 100644
--- a/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild
+++ b/sci-mathematics/topcom/topcom-0.17.8-r3.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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
 
+MY_PV=$(ver_rs 0-2 _)
+MY_P="${PN^^}-${MY_PV}"
+
 DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
-HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
+HOMEPAGE="https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM/index.html"
 SRC_URI="
-	http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-${PV}.tar.gz
-	http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html
+	https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM-Downloads/${MY_P}.tgz
+	https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM-Manual/index.html -> TOPCOM-manual.html
 "
 KEYWORDS="~amd64 ~riscv ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="examples"
 
+# need gmp[cxx] since we append -lgmpxx to LIBS
 DEPEND="
-	dev-libs/gmp:0
+	dev-libs/gmp:0[cxx]
 	>=sci-libs/cddlib-094f
 "
 RDEPEND="${DEPEND}"
-BDEPEND="app-shells/tcsh"
 
 PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
 
diff --git a/sci-mathematics/why3/Manifest b/sci-mathematics/why3/Manifest
index e33b6464dad5..80b02eefafd9 100644
--- a/sci-mathematics/why3/Manifest
+++ b/sci-mathematics/why3/Manifest
@@ -1,5 +1,7 @@
 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
+DIST why3-1.5.0.tar.gz 6723500 BLAKE2B e6ae5034cf0b3923dfaa760d604f754d4e385ea92ca1f70c7d4bd9985c75192ed381bb50d7211451f35d485e5c0969b3de4987603720b2fd6609cca5d074b85f SHA512 3ae443733321f2e487d6e503c4dbfe37d0e24c7dbe88eb94a3907775a1e6e30530b58ff835e3b2fff3fac5cd16622d758602e4f2b59aea567c7073199d67888c
+EBUILD why3-1.4.0-r2.ebuild 2170 BLAKE2B b9f9edd408278d9be81f88c16d343f4b0f1a6fc5cc7b19009e4b5683469f8cc08d7d4d82a583b54cec0327b18852c2a1597443891f753bfb1e3442f617b40e10 SHA512 93a3d0da51d5cfff710de6abad4bcfdf7c6aaf01beb0e42bd2220eb57e3e2718caa4044524731c2ea26474f6757f1c2e603996f9c74dc96e798c78e4ed8c6933
+EBUILD why3-1.4.1.ebuild 2170 BLAKE2B b9f9edd408278d9be81f88c16d343f4b0f1a6fc5cc7b19009e4b5683469f8cc08d7d4d82a583b54cec0327b18852c2a1597443891f753bfb1e3442f617b40e10 SHA512 93a3d0da51d5cfff710de6abad4bcfdf7c6aaf01beb0e42bd2220eb57e3e2718caa4044524731c2ea26474f6757f1c2e603996f9c74dc96e798c78e4ed8c6933
+EBUILD why3-1.5.0.ebuild 2352 BLAKE2B da183a5eddf06dce8fe5728a59d6d5ba021597177e9ba55b0dd788c86f2b16b099137c949e9c51e9bec3adecc4d3e7bbef1c473a70ae9f945b74b67fa4581161 SHA512 41906dfddf392cb77ca641f020cf9411f4216146046db94edb0ab37335746233204609b73bd0359fab8eddd80076c6cdce753549165f01237f01bb85a6d7869d
+MISC metadata.xml 1902 BLAKE2B 1868834e446b471f4b3f7b11fc987661dee83790110fa31c73f0060fd8340891ff85ec16591d1326977760c726ec04bd06a4cca46fb1a87f792340a002cba247 SHA512 4dc9408d44eafc037bfce9c996570e58c161e07c3ded2a052954c834fcf8c3a36cf8429493bc705ced7445d199eaf207cabb5df1b0ed6b625015af518e55d9e9
diff --git a/sci-mathematics/why3/metadata.xml b/sci-mathematics/why3/metadata.xml
index 9974e9e2b8a1..c8d6f06359fb 100644
--- a/sci-mathematics/why3/metadata.xml
+++ b/sci-mathematics/why3/metadata.xml
@@ -31,6 +31,7 @@
     <flag name="gtk">Build the IDE <pkg>x11-libs/gtk+</pkg></flag>
     <flag name="re">Use Re (<pkg>dev-ml/re</pkg>) instead of Str for regular expressions</flag>
     <flag name="sexp">Add support for outputting S-expressions with <pkg>dev-ml/ppx_sexp_conv</pkg></flag>
+    <flag name="stackify">Enable structure reconstruction algorithm for MLCFG</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>
diff --git a/sci-mathematics/why3/why3-1.4.0-r2.ebuild b/sci-mathematics/why3/why3-1.4.0-r2.ebuild
index 85da04d96b8a..efe23fa3bbde 100644
--- a/sci-mathematics/why3/why3-1.4.0-r2.ebuild
+++ b/sci-mathematics/why3/why3-1.4.0-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
@@ -17,7 +17,7 @@ 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/menhir-20170418:=
 	dev-ml/num:=
 	coq? ( >=sci-mathematics/coq-8.6 )
 	emacs? ( app-editors/emacs:* )
diff --git a/sci-mathematics/why3/why3-1.4.1.ebuild b/sci-mathematics/why3/why3-1.4.1.ebuild
index a9a9ef515374..efe23fa3bbde 100644
--- a/sci-mathematics/why3/why3-1.4.1.ebuild
+++ b/sci-mathematics/why3/why3-1.4.1.ebuild
@@ -17,7 +17,7 @@ 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/menhir-20170418:=
 	dev-ml/num:=
 	coq? ( >=sci-mathematics/coq-8.6 )
 	emacs? ( app-editors/emacs:* )
diff --git a/sci-mathematics/why3/why3-1.5.0.ebuild b/sci-mathematics/why3/why3-1.5.0.ebuild
new file mode 100644
index 000000000000..9c250c09c3d0
--- /dev/null
+++ b/sci-mathematics/why3/why3-1.5.0.ebuild
@@ -0,0 +1,103 @@
+# 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 stackify +zarith zip"
+
+RDEPEND="
+	!sci-mathematics/why3-for-spark
+	>=dev-lang/ocaml-4.05.0:=[ocamlopt?]
+	>=dev-ml/menhir-20170418:=
+	dev-ml/num:=
+	coq? ( >=sci-mathematics/coq-8.7 )
+	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?]
+	)
+	stackify? ( dev-ml/ocamlgraph:=[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
+
+	# remove QA warning about duplicated compressed file:
+	rm examples/mlcfg/basic/why3shapes.gz || 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 stackify)
+		$(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/z3/Manifest b/sci-mathematics/z3/Manifest
index 13db113caa3e..b827628b71bd 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,6 +1,7 @@
-AUX z3-4.8.14-libatomic.patch 2063 BLAKE2B b2cb8232817ccbff2b1a26897b81e50bf3fc4110924642735858d854f57bf625c2463fa23285e1bf6f3f8cedf544adb580d0a64ee15f4810eb2f95451aecad7e SHA512 56864d3be7b891bfce49855d457b22c9ba9e047c710da1856cffacf3b2e88a6429d07e604c948210a983ab1bd1f785e7de906828eeaf534851ddfc63f36632b2
-DIST z3-4.8.14.tar.gz 5113598 BLAKE2B c6a82cec33e879123c33506897ac02be682d08a6432da0b11c6918f2664fd7249d8874ccb6f543907f789cc3b40b126465548abeabf4ac16d2ee791ce179742a SHA512 10170516ca472258d2f9df28cd036e43023a76a25f1e1670290c62f3890d935bf82770970054a5fd3a0f02559409e7ed4b18fb08347c040ff2f9e0918e152aab
 DIST z3-4.8.15.tar.gz 5213633 BLAKE2B 6ca07309370f891f6ca5fa114721cb5df96e726687bf3c2310ba4963b1d1dfeec6ede62fd7a960e17e824ab8ff1e17d2af2a90d8156245ba048b04045c8f0531 SHA512 7b08dec5b035a38edc90c4c491f508fd9ed227357de94400169db53d4c59382bd6a81ae6615771023a06534a3aa92668844f0ebfcc2a3b5ef4bba957426a0c6c
-EBUILD z3-4.8.14-r1.ebuild 2661 BLAKE2B db8be08d461a83b79fd81e424dfa22510d1d6aa0df6d01f6d07efb34c22c608f6fcb84e3f7d65dc6cae8778528bb820daa333caa03aa5ea4b30e45298a467c7a SHA512 555eaec25e7fa285d3916e56138d8d966b1b722e759d8da6e5151fa6d4bb89515a027bbd0e831d594d087cad333fda287b14c8691a678e8a215b216c6b5b2fdf
-EBUILD z3-4.8.15-r1.ebuild 2605 BLAKE2B a3fe5a3d3164c6233098836c9d0db48c76425783c45987836795b84ed4645f15c70fbbd3df0566eb6afdad3596595dff9a9f3a523b5dadb5db0b391adc8fd5e6 SHA512 b17422c6d03d33e5840215333180e3af4293f078eab93f6806ab11626f74bd5686620fd42b53c5c92f3fa85e99b46a5da39ad69b1833e71543e70c25cdf09930
+DIST z3-4.8.16.tar.gz 5223980 BLAKE2B 67bca86d48df51c9aa4fa3544fd77133c4cc429e6f77f89aa26a559e56e267b8c0891befc6a5e24be541011aac02cb0d51ef26a636c3b360a1fa4d445967da21 SHA512 385f6e1ee075b9eadb5aad338657a81f518eef382b99ce623448a630b79f5d414ebccfd1bb5e959626f0b82ef54a5f20326814ae988b5688d51578de6fb69615
+DIST z3-4.8.17.tar.gz 5232392 BLAKE2B 80dbb5d48811eb6022c0d0117d1e954bae7b27ff984f24cdfbc9158eb548349f817f30ea231d1119aadeedaec63765834bff6f6d21276d0bf61c30212444f224 SHA512 95517014ec1798c2552253dd5cde6f955896ab297a4f56294f4bc6f2c5428069015f513c6eb9a090a809cfcf4cb1cc38cc83818f19b5b1051e4e6c06f973747d
+EBUILD z3-4.8.15-r1.ebuild 2600 BLAKE2B d55c66f4e595b84127e8d5ad5e0895d9df003094a47a68329eb7664e69bfb4b04c2c476abd16caee95467b1537ebff6bcf038858b2d6cb97ccfec72795cd9064 SHA512 fbe4d7a3b271e5938990ddbb6ecafd7f5f725508c6ee741f71ee46322313a606c3b5058ac37c8b7054bffb8670593fe24006a5a84c193f5bda41d09420882145
+EBUILD z3-4.8.16.ebuild 2619 BLAKE2B 0fbf96c6aead6ec343cc08bcf6f60c378ac7b9976f504aac283b1f8745117bf10d761f8c5639b0381d451961e675c03d1869a83cf181d203b0b93f70b4e3c6c7 SHA512 b91a7f6b3822ea9c8c559f06c0e7241e46925f93e5842c780631edca89664cc3312ec8fea7831a6a3665fd70ee9af71a56b7bc35386fc7a8c0a32206939b5a88
+EBUILD z3-4.8.17.ebuild 2619 BLAKE2B 0fbf96c6aead6ec343cc08bcf6f60c378ac7b9976f504aac283b1f8745117bf10d761f8c5639b0381d451961e675c03d1869a83cf181d203b0b93f70b4e3c6c7 SHA512 b91a7f6b3822ea9c8c559f06c0e7241e46925f93e5842c780631edca89664cc3312ec8fea7831a6a3665fd70ee9af71a56b7bc35386fc7a8c0a32206939b5a88
 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
deleted file mode 100644
index 4b7503ef47fd..000000000000
--- a/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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.15-r1.ebuild b/sci-mathematics/z3/z3-4.8.15-r1.ebuild
index 04689aa94acc..31cec588863f 100644
--- a/sci-mathematics/z3/z3-4.8.15-r1.ebuild
+++ b/sci-mathematics/z3/z3-4.8.15-r1.ebuild
@@ -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}"
 
diff --git a/sci-mathematics/z3/z3-4.8.14-r1.ebuild b/sci-mathematics/z3/z3-4.8.16.ebuild
index 9789ce8a98e1..7ebfae64d20b 100644
--- a/sci-mathematics/z3/z3-4.8.14-r1.ebuild
+++ b/sci-mathematics/z3/z3-4.8.16.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
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{8..10} )
@@ -15,20 +15,21 @@ 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 ~sparc ~x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )"
+RDEPEND="
+	${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )
+"
 BDEPEND="
-	doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libatomic.patch" #bug 835003
-)
+	doc? ( app-doc/doxygen[dot] )
+"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/sci-mathematics/z3/z3-4.8.17.ebuild b/sci-mathematics/z3/z3-4.8.17.ebuild
new file mode 100644
index 000000000000..7ebfae64d20b
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.17.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~sparc ~x86"
+IUSE="doc examples gmp isabelle java python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DZ3_USE_LIB_GMP=$(usex gmp)
+		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
+		-DZ3_INCLUDE_GIT_HASH=OFF
+	)
+
+	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md 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
+}