12 files changed, 233 insertions, 379 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 34bfb04710f4..e7d35fa908fe 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 6e0e64f41bbd..0a053c429262 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -3,6 +3,9 @@ DIST CGAL-5.2-doc_html.tar.xz 51123300 BLAKE2B 748b94d199343402baf6aef298b352fc2
 DIST CGAL-5.2.tar.xz 23250240 BLAKE2B eb80a81dd01b2b2e30fe72f45cceee0861b36f47e395d1c905f8551e23d57c36dd9a7c66e32f6c2a0a2cfbd4c780fd5d5ae098709bfc1072e7ac7f761d328fd3 SHA512 8dddec18bd7e375ea3b18c636ddb2ca4f3a318e177305058f702206b830e2605837024e4b1265789f1bdc46dda80133d6fa8d61a036cda3c93a227f4c244cc1a
 DIST CGAL-5.4.1-doc_html.tar.xz 50436088 BLAKE2B 9f293349f054094ecdce7a04ca1f276c56e824b4c9edd7ef82b9c450e3bde5ae26c9e6d06c5feea370c345d2b419cd426427ce34f329ea9a88ad5fa5931a0446 SHA512 5167a0fb0e390ab72c7d6106bc7d34e4a6c927f9634b02f71b675f8456d17cdcbc4a5d944c5ebf5ba1d6b635f469ee474c484913b768bff8a7c8ba52669373e8
 DIST CGAL-5.4.1.tar.xz 24110884 BLAKE2B 2d01404333fdaa00d66028decbaa522d6767290e2f5be5c2b7d0323d16b9b44cd00fe58fb7d20cb02b2731893bc251bcdd4de7013107bc1d4c086e999bbf240d SHA512 751871952173c31b356284e12f3cd0840863dad51c8dad5eb8894f8285470d0e23b6b09d97d60c4ffe6eb93b14ff141a18e381eab07ea29cb48923e90f9b657b
+DIST CGAL-5.5-doc_html.tar.xz 53145672 BLAKE2B 7a575f09eed2fd97f3e68f37428d4ab41c267a6e4c158e653a8c2b5a17f2c56a31b64937fa161d3f256b473a1e617acbce2f3bfb71c2e810b8b0335b57a8b54c SHA512 41e16b44b93664ddd5185358165cce99f149fa33bdb308ce7230550ee79e3603c24df5b8d4f67de324ebf7e8a8c1e343e6d76341464cedd9d9af50f5d512af3b
+DIST CGAL-5.5.tar.xz 24156768 BLAKE2B e5f02cd082abfa8443e65430ed366cfdc3736c6a7af37284969ddd558ede1aa6c881d6928c65708504fd58f68ea01f56aa0749267d6dc83fd54f0b28e8c01374 SHA512 7fa6bf6c046727a9e0bce7cbde34cbe85979127a1ad0904f2865be83a80e89fa9af5118e5647572414f8096d29ecc808ee471d4bd3e7ecd41338be649b549290
 EBUILD cgal-5.2-r2.ebuild 1674 BLAKE2B 2c9ce25313006e087ab352fc8d296ef7b2d9aebb0d4c07341dbac914fc66ac15ee7802e36773e108286f4ca1f89a670efdc58a19ca0f1ee0b37fdfc57a01e914 SHA512 bec84e99aab09791d872dc2708d981e33d7170c1aa56a35a34b9119f53f4da34ba4d67fc6453e6c8b02b58b3d95cf7b672abe53eb93abdb80261fcd33afd152b
 EBUILD cgal-5.4.1.ebuild 1697 BLAKE2B 59864ae06e3af97aec9e129ee4752ed241f09409c0ebfa90f4b2695401295c4571e032e1125fddd588fef98a906be1b4a5a6dc649015bbfef48c65729e0f6c26 SHA512 c1e75ae5ebdce4d4001585984e9e952b96b53dc3a6a3e9a692faff633e9e833cd7ad235c2dbe3b03c61bd86fe522c5bfd245bb8aa0996c8769cdbfbb69e092a1
+EBUILD cgal-5.5.ebuild 1243 BLAKE2B 0f9f3c3658964ca4e848a426b7a5afc700da528c0ca7c81b8bb34bee0cec5a3647f02bd03f763be072a57145d4746453ae3459c918eafe71ea082f67b714708f SHA512 cb74939a6129de7b2a92f40058d3b68ef055aed2d0a9c3f73d019c00a80c0421cd41fb8de4a73538093ed6d5bba84681feb6ea05fdb76af48b7dc1b1c09e2be4
 MISC metadata.xml 1373 BLAKE2B 7e3ecb8f36476edb32f20a03775f01f916fa82ab2c7a6e0554066a4b47019d3a13350e442ba4f9e6f184eb7678707a683339f223d5c86e18c08e9de5b359218c SHA512 a99c724624e7cdd71c65424adef18966dc6a88bd8e56e38fa5ba0ad4c40010481548d6d7f3e51044f62597096fdbf9e52a361d3c71d0ab870753526df664f7d2
diff --git a/sci-mathematics/cgal/cgal-5.5.ebuild b/sci-mathematics/cgal/cgal-5.5.ebuild
new file mode 100644
index 000000000000..2c573efaccb6
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-5.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Modules provided by dev-cpp/eigen
+CMAKE_REMOVE_MODULES_LIST=( FindEigen3 )
+inherit cmake
+
+MY_P=CGAL-${PV}
+DESCRIPTION="C++ library for geometric algorithms and data structures"
+HOMEPAGE="https://www.cgal.org/"
+SRC_URI="
+	https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}.tar.xz
+	doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-cpp/eigen
+	dev-libs/boost:=[threads(+)]
+	dev-libs/gmp:=[cxx]
+	dev-libs/mpfr:=
+	sys-libs/zlib
+	x11-libs/libX11:=
+	virtual/glu:=
+	virtual/opengl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
+		-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
+
+	cmake_src_install
+
+	if use examples; then
+		dodoc -r examples demo
+	fi
+}
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index ca9659c49ae0..d136a0e50225 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -3,8 +3,10 @@ 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-19.tar.gz 102909053 BLAKE2B 5d141449d5ba3c9c1209eb24ef6fefbfbff61e2f0d3d8b62e1e92e78a0112ba03c392dddb5b9a91016c9d44ef85ca3b53404f21f87f20b7d99c39e6055f02bad SHA512 2af168cf88829613765bbad3e70f54ca2516c52a1465e90fc7b3fc2f44636f70df9943c2fbfe3e9d2cd5036f9c18d704e8bf867bc381c1fda78a7618419cd0c4
 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.19.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.19.ebuild b/sci-mathematics/giac/giac-1.9.0.19.ebuild
new file mode 100644
index 000000000000..bf7ed2bdb24c
--- /dev/null
+++ b/sci-mathematics/giac/giac-1.9.0.19.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/lcalc/Manifest b/sci-mathematics/lcalc/Manifest
index 520e2692a609..e6a67cab3303 100644
--- a/sci-mathematics/lcalc/Manifest
+++ b/sci-mathematics/lcalc/Manifest
@@ -1,4 +1,3 @@
 DIST lcalc-2.0.5.tar.xz 830360 BLAKE2B 4a282de8548bc0b3d95fe079362ea98dd1397a1f0f7c4c61c6d2df8c5f95b9638aa628a25b138e6037520c69e56bfab635872115139caf3270d473e01276b980 SHA512 d3b7fa25dd3c2a8f88671076dfb5ab5e933be7feff24bbd160c92a476953f5553f9fb58f72c36b9c668929385084918fc3396e1a0bcc55de12ea8cb647c53929
-EBUILD lcalc-2.0.5-r1.ebuild 925 BLAKE2B 98e8909c3bf87fe2446ced959d9a9f57d7ada72e81d40393d4b0e0488a5cf0ef6cbc0ae215ca61c0b5293bb309257cb7af682fe2013b99b17fa732bec5e6ae0e SHA512 10df01062ba4b5e27be0e69603350bc7361ca17f9a2468f3da8a550b81f8637afec065d2a9e42dc147afb562053c8b0c1eab57e269b6c88ebf928b8b9f5f7821
-EBUILD lcalc-2.0.5-r2.ebuild 1004 BLAKE2B 0031433a7ea5552239336d240347ca4b80a3ec1d2365ba8d784013bf768ee82ab7bfc9398c63bfd8e7246c49e9aa973995797568ae40b819dd0b31a5defb3cfb SHA512 32f6b8753a198006fe5165127c0e28de2212077f03ec8c66e93c76c10fea258b6f1cd693c7a05965f1a8097ce52a1be895b65f7bad374d6b33682948c593824e
+EBUILD lcalc-2.0.5-r2.ebuild 1003 BLAKE2B b900a458372ed5b34ec5bf4e1f11c046e95f29b33932c97891faf80583a12c7238ae48c6571ec6c25dd93da24a1693d2e7a5394bd64ce358b2ea3ca6344668f2 SHA512 c30aec4f6970c3086df43ca7c68de71544fc01d2005220711520b6416e6ac625cceafe5effab150760c4a61a0f74b5c6f4b9eaee5779158c656579219441494d
 MISC metadata.xml 1165 BLAKE2B 77544a05687fad32c18cb8d840d8de4291cae4135976bd741bbfd57a015956d5104026b99b1aec934d6a260501d89cd947e052a2ac85e35d2c93f7fc08224ac1 SHA512 cce822c8b50d97a7f8405634f565c3fbe147732db57bd66cccbaad2c2eda23076b76d0dfa442d462d55625a5dff06dde9bdf5e6ab4a9c9417d2f69972cc87add
diff --git a/sci-mathematics/lcalc/lcalc-2.0.5-r1.ebuild b/sci-mathematics/lcalc/lcalc-2.0.5-r1.ebuild
deleted file mode 100644
index 7e0b02e50370..000000000000
--- a/sci-mathematics/lcalc/lcalc-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Command-line utility and library for L-function computations"
-HOMEPAGE="https://gitlab.com/sagemath/lcalc"
-SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/25f029f3c02fcb6c3174972e0ac0e192/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-# The subslot is the libLfunction soname major version
-SLOT="0/1"
-KEYWORDS="amd64"
-
-# Omit USE=mpfr for now because it's broken upstream:
-#
-#   https://gitlab.com/sagemath/lcalc/-/issues/7
-#
-IUSE="+double double-double quad-double pari"
-REQUIRED_USE="^^ ( double double-double quad-double )"
-
-BDEPEND="dev-util/gengetopt"
-DEPEND="double-double? ( sci-libs/qd:= )
-	quad-double? ( sci-libs/qd:= )
-	pari? ( sci-mathematics/pari:= )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_with pari) \
-		  --enable-precision="$(usev double)$(usev double-double)$(usev quad-double)"
-}
diff --git a/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild b/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild
index 640cc2e5b59b..27c1bc7592fc 100644
--- a/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild
+++ b/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/25f029f3c02fcb6c3174972e0ac0e
 LICENSE="GPL-2+"
 # The subslot is the libLfunction soname major version
 SLOT="0/1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Omit USE=mpfr for now because it's broken upstream:
 #
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 48ab6bccb9c8..1eb0224822de 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -7,15 +7,9 @@ AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2
 AUX singular-4.2.1-htmldoc.patch 2086 BLAKE2B 28ab2e8ef9ad2ff1343d3efd33917503c00fb74428f35b1ab0fb1475368d3760d3c915668d4fb008ccc618e2aa1c13a35f66d3a62f8c3abe93b5275f1648c8e7 SHA512 5c28c31bc51a937ddff4e52da3ed93f20516b64ac6abfc05031d09e708e557268e757c55e625abfd77c19600f64a7f284903de619c113a57194367e23148ff82
 AUX singular-4.3.0_p1-gcc12.patch 2670 BLAKE2B a7dcbe6a6b93baa53ffddf5f25fbf2cea54be1fa453854ddec7b177a132ab38ec5b8cb93078c2183e43896f342231866095dbf2e453fa1952e4215abfdf82baa SHA512 7d3f80e6e2a4980872f5bbc2a41c7925f6fac7dd6184df372375bb959c098203d5551f8c5e0bcaae2bb8ff498515135c8ca2859f43b86eeb5b950e64a6d8d2fd
 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.0p1.tar.gz 15097535 BLAKE2B 0afc8adea054ccdf68f276b3c4c25e55f938ef9cf9c85fbab86163c6d6839dcfb3d8e1632c135d4d3c978477f165d58727d35c6aaac2f39b4b6f942ca8bbb062 SHA512 af4d3377e9ea8f0b5f34db42c36817e8cf47717accba40c151b68213d8e0832bee71e480e22c60fcc6ced619f6117c24f6d18b87cf66406a175b38e3a7aece69
 DIST singular-4.3.1p1.tar.gz 15090370 BLAKE2B d4e40378b3892b98b1f78c3928c8a40484336ea25ea4dcd4b3a1e5f651281d2cdb06d92c9cc64427ce76e91c5bf4eaa1c3b643df174a24c188823ae808817ad9 SHA512 d27d8e042ea085e49aed6a0697056c36e78e62ea0b9d17751cdf4c556cf4f6efce3b34b411c77aef97c6d90675bea11c97651eb7009634cb8a9b630ec820a06e
 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_p1.ebuild 2442 BLAKE2B 414fb3fe1752c58e0eb776e337ce3c8fb1f36488856a1f103d71a52495b9200b83bf73c3bca369681584ba65642cb54ba7996c0362f54791d242077ef5cb14e8 SHA512 e9d0287082cfcd5143858033dff722ec98d48091cb21145b7bbc5cfd66c4eca745e73033134a3c23e3a7c9081a9b489aac1c0ef8d1cea7d52403fc7f27a3e2ee
 EBUILD singular-4.3.1_p1.ebuild 2296 BLAKE2B 4c1cacc1976fa42355106d381764b0ce6bb7ac78d0c540b83b634036456af4c8dc7404fc73bf0187c39a8c3eeeb94f451590afd687fd512e3aba3056a5b35ead SHA512 9e944311c909a6cfeee4a5efc97714b2c5f9c3c3ec2104435685cde4bdaa527ffcf3ea7db9cbacea59fe7c4afe6023c1059261b29143be97391111b213704acf
 MISC metadata.xml 782 BLAKE2B 7f10704c78b5a55cff9d07ffc3456a57aba4001ffd337dfbbb712e32608446ab9ae8039d14143939ad41710dcc6d4725992db2c80bcd1678397e563fefa929b4 SHA512 3c4904a4a8f63ff073745409caf9a9a68aa5d46861b8e8d77a538716a7a6a099d87137d604e52a3b8ce4ab81b7333f95389cd888ccbabe52017b6e8b1e4a77d0
diff --git a/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild b/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild
deleted file mode 100644
index 7e20b068308c..000000000000
--- a/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/Sources"
-SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
-IUSE="emacs examples +readline static-libs"
-
-RDEPEND="dev-libs/gmp:0
-	dev-libs/ntl:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	sci-mathematics/flint
-	sci-libs/cddlib
-	dev-lang/perl
-	readline? ( sys-libs/readline )"
-
-DEPEND="${RDEPEND}"
-
-SITEFILE=60${PN}-gentoo.el
-
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-gfan_linking.patch"
-	"${FILESDIR}/${PN}-4.2.0-doc_install-v2.patch"
-	"${FILESDIR}/${PN}-4.2.0-no-static.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# singular may segfault with common optimisation such as -O2 without this flag
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	econf --with-gmp \
-		--with-ntl \
-		--with-flint \
-		--enable-gfanlib \
-		--disable-debug \
-		--disable-doc \
-		--enable-factory \
-		--enable-libfac \
-		--disable-polymake \
-		--with-libparse \
-		--disable-optimizationflags \
-		$(use_enable static-libs static) \
-		$(use_enable emacs) \
-		$(use_with readline)
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		pushd "${S}"/emacs
-		elisp-compile *.el || die "elisp-compile failed"
-		popd
-	fi
-}
-
-src_install() {
-	# Do not compress singular's info file (singular.hlp)
-	# some consumer of that file do not know how to deal with compression
-	docompress -x /usr/share/info
-
-	default
-
-	dosym Singular /usr/bin/"${PN}"
-
-	# purge .la file
-	find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
-	# SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
-	# an already installed version of singular may be used and cause segfault
-	# See https://github.com/Singular/Sources/issues/980
-	SINGULAR_PROCS_DIR="" emake check
-}
-
-pkg_postinst() {
-	einfo "Additional functionality can be enabled by installing"
-	einfo "sci-mathematics/4ti2"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/singular/singular-4.2.1.ebuild b/sci-mathematics/singular/singular-4.2.1.ebuild
deleted file mode 100644
index 015943a9e875..000000000000
--- a/sci-mathematics/singular/singular-4.2.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/Sources"
-SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
-IUSE="emacs examples +readline static-libs"
-
-RDEPEND="dev-libs/gmp:0
-	dev-libs/ntl:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	sci-mathematics/flint
-	sci-libs/cddlib
-	dev-lang/perl
-	readline? ( sys-libs/readline )"
-
-DEPEND="${RDEPEND}"
-
-SITEFILE=60${PN}-gentoo.el
-
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-doc_install-v2.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Needed to avoid segfaults in the test suite until
-	#
-	#   https://github.com/Singular/Singular/issues/1105
-	#
-	# makes its way into a release.
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	econf \
-		--with-gmp \
-		--with-ntl \
-		--with-flint \
-		--enable-gfanlib \
-		--disable-debug \
-		--disable-doc \
-		--enable-factory \
-		--enable-libfac \
-		--disable-polymake \
-		--with-libparse \
-		--disable-optimizationflags \
-		--without-python \
-		--without-pythonmodule \
-		--disable-python \
-		--disable-python-module \
-		--disable-python_module \
-		--disable-pyobject-module \
-		$(use_enable static-libs static) \
-		$(use_enable emacs) \
-		$(use_with readline)
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		pushd "${S}"/emacs
-		elisp-compile *.el || die "elisp-compile failed"
-		popd
-	fi
-}
-
-src_install() {
-	# Do not compress singular's info file (singular.hlp)
-	# some consumer of that file do not know how to deal with compression
-	docompress -x /usr/share/info
-
-	default
-
-	dosym Singular /usr/bin/"${PN}"
-
-	# purge .la file
-	find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
-	# SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
-	# an already installed version of singular may be used and cause segfault
-	# See https://github.com/Singular/Sources/issues/980
-	SINGULAR_PROCS_DIR="" emake check
-}
-
-pkg_postinst() {
-	einfo "Additional functionality can be enabled by installing"
-	einfo "sci-mathematics/4ti2"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/singular/singular-4.3.0_p1.ebuild b/sci-mathematics/singular/singular-4.3.0_p1.ebuild
deleted file mode 100644
index f46ae019c973..000000000000
--- a/sci-mathematics/singular/singular-4.3.0_p1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common
-
-MY_PN=Singular
-MY_PV=$(ver_rs 3 '')
-# Consistency is different...
-MY_DIR2=$(ver_cut 1-3 ${PV})
-MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
-SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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_p1-gcc12.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
-}