gentoo auto-resync : 15:01:2025 - 06:41:45

9 files changed, 62 insertions, 399 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index a05c06f89e4d..b4f67f359cff 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index 3035bd380d66..595a98f50625 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -6,6 +6,5 @@ AUX gfan-0.6.2-glibcxx-assertions.patch 1473 BLAKE2B 7b78600ca7bdc5cd23b5d0b0799
 AUX gfan-0.6.2-testsuite.patch 3223 BLAKE2B ddb94775a13bd503df5c9563750a6b4b68c9e72e1a19aaa0415c5484e07765dfd28ba02b3a0fab65a0b9cd5c61afafbc6a3d862a1de68ece57ef9d8bb2835c16 SHA512 d62e765a39ee1a8cb149fcae8afb538b19a91206dd0b8cf0ac2b681b28569e44f492b770b9e61d7573f2d52f265ad4cf25671197c204238a89075709753a83e6
 AUX gfan-0.6.2-xcode9.3_compat.patch 367 BLAKE2B fb7c685a4dd811fed83e2734a16507b1792e3a97c666d0e7de1d2ed53a7b9b43c5319517f9eef829f47147dc725f2c4ead38968fa3868baa1d16630a8b844636 SHA512 129d2c35777f82bf2a1581450ecb12dd6811fb72b583748b30665c0f9b20d39646233d9b40fb64a3c7790360514a51b30e49c53d83c34d259f664bf820ae1ce2
 DIST gfan0.6.2.tar.gz 1321059 BLAKE2B 1ed61e1e084a1ceb65dd21848440bc3a90486c0ce4012b3b64c8029e89636696d2b0e5446ea156d2cf050b5db179c7c2f25c97e683cecf6e9616e8553d8513bf SHA512 5961820750af2522fdc1a86c0254742c3b003607a8707df5d6cd5f0bc6461e4d3db3b1d3cb537979d57eb9dff387974a58aeb91d0b5246d7c701cadc5a2cf4cf
-EBUILD gfan-0.6.2-r4.ebuild 2007 BLAKE2B 21d014cbabb76f661135ffc1c1ce72b016448511e0ec7cb71cffc6f68fec9328c140f268ae3dce2a7ed58ee5559f56c274fb9ce1f7edcc000a9f0606f013bd3d SHA512 76b1e4b63458d5992b5036a7fff2f0e9be5ec0269fcd8a3d2854db21a89f8efd54b9d043049e9e9ac969852f975a8774735c6c426ac03068078c75c1517d0f2a
 EBUILD gfan-0.6.2-r6.ebuild 2202 BLAKE2B a819189e00cdd0daf8a38d4e94ebf5941ae67bd194e59ffd86c58e2be6d055c9b7bd1eae2b91a05f4c7afd624893e288fa4eb21b53b84733a4235ff20849cbdf SHA512 129705306493ecca9901e12d3aef5387ba890bca61a205d17d121fcafbd5252b78c8e81332933dd5f68aa53d4e4630f81daefbe0db1650f30e43c392b7b5ff79
 MISC metadata.xml 1344 BLAKE2B 1a1d24099e2338877b068dee2b9e17feb4063de3a681a3b8d6a707c863708d6f380bb4864eb2fd5fef8ed49d6b1a770a8d1b4c12ce722b4f7fe113876de0b792 SHA512 8d5c93337a82b132c66c8d7e64c97deedcfdc724e9874bf308e6d817f71e663bc2b281ea133ae15e30096f5c801f88116b11e4d36dd8dd8eec526b5bc16d5f54
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
deleted file mode 100644
index fe1b428750be..000000000000
--- a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Compute Groebner fans and tropical varieties"
-HOMEPAGE="https://users-math.au.dk/~jensen/software/gfan/gfan.html"
-SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz"
-
-S="${WORKDIR}/${PN}${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx(+)]
-	sci-libs/cddlib:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
-	"${FILESDIR}/${PN}-0.6.2-testsuite.patch"
-	"${FILESDIR}/${PN}-0.6.2-Makefile.patch"
-	)
-
-pkg_setup() {
-	tc-export CC CXX
-
-	# This should really go in cppflags, but that doesn't work with
-	# gfan's hand-written Makefile.
-	append-cxxflags -DNOCDDPREFIX -I"${EPREFIX}"/usr/include/cddlib
-}
-
-src_prepare() {
-	default
-
-	# This test hangs on x86, bug 717112.
-	rm -r testsuite/0602ResultantFanProjection || \
-		die "unable to disable test 0602ResultantFanProjection"
-
-	# And this one fails (harmlessly) on x86, bug 818397.
-	rm -r testsuite/0009RenderStairCase || \
-		die "unable to disable test 0009RenderStairCase"
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/863044
-	# Only contact method is email. I have sent one detailing the issue.
-	filter-lto
-
-	# The upstream Makefile says that GCC produces bad code with -O3.
-	replace-flags "-O3" "-O2"
-	default
-}
-
-src_compile() {
-	default
-	if use doc; then
-		pushd doc > /dev/null || die
-		# The LaTeX build commands need to be repeated until the
-		# document "stops changing," which is not as easy as it
-		# sounds to detect. Running it twice seems to work here.
-		for iteration in 1 2; do
-			latex manual.tex && \
-				bibtex manual && \
-				dvipdf manual.dvi manual.pdf || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-	use doc && dodoc doc/manual.pdf
-}
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 035fff077e54..29d246fcdb60 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,5 +1,7 @@
 DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B 7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7d712c5306775c6f07eacb3cbbbd11d651bbbdd687a87692f4920170557b51f9498881a6c5018a2ce0b1b7f SHA512 f5a482a231339304683adc3334c9b86f21a0d9b42ea871418d4c01005057d560cd418eddfcc1c7be7f8c249960b2ee612a1454ccc5d8e41319b06c6f42e6662e
+DIST ecm-7.0.6.tar.gz 971656 BLAKE2B 313197ea8a93e55eef82b24ff54b0f8661e4006ad8d9f3a43fbba0b04d3c5727f68595cb12dcf7e925650c141648294582bf99807145b862bbadce6ef28af827 SHA512 20d152055dda4020d2ccdcc93539a63b10140c63db4441a33a15f45c352e09e116fc1a400617065f2b49ae2f070da82708e22c79b41f709819b24c41d1258fff
 DIST gmp-ecm-7.0.6.tar.bz2 609323 BLAKE2B 30255322bd8e8d49393044bcc55fd05905cb5b6b374c5f2ea59fa9b02864b22fc2b6f14fda2271a4148a2ec361fd524551cafd136bbbdf025137ce101c776def SHA512 7ad262e78c59d33218e1d783ffa79114c04fe4ddac57e4059577aecebbfe3af975c2e1ba6049452c1c96488660ed79fcb546237966489fc2edc03bf7710495c0
 EBUILD gmp-ecm-7.0.5-r1.ebuild 1583 BLAKE2B a26660813145878658cfe888f320dfde424a3f112d558c4d2b6a29ad69d0cb7f126cf871b5145b9cb4e9c4ab972ad31ee54cc063177220b11ce91d643a37b310 SHA512 8dd5647f4a25fbd5f3d79c11925fc3b6ce56d54e0f4d76b5e8033cf4c6aa73799798b36bbab38c2363f154f5c34891e3870e1bab39b1bf7c523afaec2a0e95ea
+EBUILD gmp-ecm-7.0.6-r1.ebuild 1588 BLAKE2B d2a426c7e7613f81d076cc02eda7cdcf754de811e51b8cb0cac94f0ec58796fcc53cbb9173d7d1e3146cffbf8d75422dcab03f0980c8c42a9ad7a8595f6dffa5 SHA512 6b28ffb647350e18f78aefc3ed103375cdac7ebc74723c92d7fd665a6d118194c2057d9d41ca96b086c4f0c2f66d6a3887cd62b35db1d7735b7677cfd8c7db64
 EBUILD gmp-ecm-7.0.6.ebuild 1649 BLAKE2B 6891fb0bfbb1c64f43d3bffeb8e1931e94d8b92a667a9d6d9eb7b9bbe4b39499372662149ca9fad9613cecdf6ffd3211c5ca61b761007b6b932fc26566e8e194 SHA512 f610819af09d78029762645f20a0db8873fb39d0f70a0e4f98e03196e3479a73d4d5991341fc8c93ccc16ac76de9bfaddba7a35f1d8da4594a8fdd884d9626db
 MISC metadata.xml 643 BLAKE2B 90da8b09f30dd8bd8d4df3dcc388663e52d57ea7b2974becede9ed0c592eaacb33958d202cee33988b79364e058ef84676e995b9d8467beb1f7d89ad8b177136 SHA512 e2f0d6f286440543ed15531183671b30f0044c38685e58617d004286b596ba1b898c470dc39e2ebe95db10c83be9430f1a010539ba2b0231883fe6bf4b0b97a8
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild
new file mode 100644
index 000000000000..aac9fb107188
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 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/-/project/24244/uploads/ad3e5019fef98819ceae58b78f4cce93/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos"
+IUSE="+custom-tune openmp cpu_flags_x86_sse2"
+
+DEPEND="dev-libs/gmp:="
+RDEPEND="${DEPEND}"
+
+# xsltproc is used to produce the manppage in combination with the
+# appropriate stylesheet
+BDEPEND="dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && 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 openmp) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable custom-tune asm-redc)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 867699db58e7..f99b2eac3f2a 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,8 +1,4 @@
 AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91d1a359e058fc654c6778456174d6cee9242f7fcaf81bf1464f47f43604b9e4eb298f051c6a4daba4630ca SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431
-AUX singular-4.3.2_p16-lto.patch 825 BLAKE2B e5adfbb5febd9722330362815be23c49431a8953d17fb63669749971b8a0aba59f242a1ea17c5b06c5054146853e2f480eb74b91af4db80dac4c0101415275e7 SHA512 efd33048a125b8e3026583802ac5060947c2313c98cd4ba6046f2de62703a2923212b28a0f633ff801f58592b7deaef1f0f84c643f4131a0e672e12ff506008f
-AUX singular-4.3.2_p16-test-underlinking.patch 8292 BLAKE2B 9b63377bf203be189be2f4840f098f9b0ce72857030eb2ac8abc6d7f768b5c0e1fbc268c732b08811e8fdab77fd49c26463adadc764114dca23d4ca6eeac6225 SHA512 8fcccfdbb40904972a70ba11a3cc9f9d15852f370d842883d21a19bc7aea45feb7516037e49ff1396a9520e277d7c497c7394f339112332c6594b0205a1965c0
-DIST singular-4.3.2p16.tar.gz 20880476 BLAKE2B ce226a6867b764e593ddbf2c71220d9ea14ccdfd956046d5a94dfb768a97927ca3cf961a9ea808cb77028f2c65d989032202d3a0bde555ace945df1e987077a8 SHA512 1dae0e229e124db03e5e240c3ab2f1049c9f77cf369f701c4a2d0767ba9c23baab2d5d14271e415a3ccbf7b9a9297fcf324b8ccc2841a5156d6ee846cb409de2
 DIST singular-4.4.0p6.tar.gz 21097819 BLAKE2B ce78f63b2f90113ba92811a1e02b568328a92dc686d86fa653209c127f8895811e87ca4684dd1df5c2a54e8952cb1b0654055653e4b4734d9729a7de6f6faaa9 SHA512 b88e60f5665cfab7ccb5a2620190d08c1538f876cce24a24c7baddec40554fd0093cc47db89758f0bbf24f7ca298849a9fe700ce2070c8c52861d3bd48d2cc0d
-EBUILD singular-4.3.2_p16-r1.ebuild 2630 BLAKE2B abd50d631f7407043c5fc6a8748fb798a3548c643c5b88bf1303fa63a3da36753668cd9d8293a6659c52664d3c0e33fee5f90221ec56404a49c0f5514bf7602e SHA512 56f62d3035e33937f641e4242063f6176ab6cc4391f0575240ce06591fbb40f51efdcbd60c19be68c84fe2d2dc9295233613158e7be8f81020cf0622506bd654
 EBUILD singular-4.4.0_p6.ebuild 2492 BLAKE2B 2c74c7f2526cca6e3bf1496515d4c028c0172a43e8e85669cd094b48763e80d4afb484f045d6c7042c136e4d4e8231844feb0a3602bcd5ff3371dac36bd038ee SHA512 7eb15e33c8b36976c5641552af0f41287d7e9f23465b4e77e923e0a8a1dd041cbc5e91acc3d86920eaa33920ec8aad65d7a047634ac16bad2dd4da7c7ce3c080
 MISC metadata.xml 862 BLAKE2B a6e991149cb925158806177b1b4a76da2b747b3273b395c14455993a99f4cf83de141980303a068b9068983b8adf4da884b81e80546a3d2dd162f188dc759385 SHA512 9e40cf7b3841bcf8289f24903e392df2a812b6d815f71da41d95a81bb89f493ab1afcef749ef47960ba683dc3433d2c4488015990806dde0b560ffe3bb6ca545
diff --git a/sci-mathematics/singular/files/singular-4.3.2_p16-lto.patch b/sci-mathematics/singular/files/singular-4.3.2_p16-lto.patch
deleted file mode 100644
index a880f4ef5b12..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.2_p16-lto.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 83a4e40c59dd99ff3131cbdb57b24b456aa04b93 Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Tue, 2 Apr 2024 15:09:51 +0200
-Subject: [PATCH] countedref + https://github.com/Singular/Singular/issues/1212
-
-diff --git a/Singular/countedref.cc b/Singular/countedref.cc
-index d3b783ade7..f83d7fab62 100644
---- a/Singular/countedref.cc
-+++ b/Singular/countedref.cc
-@@ -108,7 +108,7 @@ class CountedRefData:
-   BOOLEAN put(leftv res) { return broken() || m_data.put(res);  }
- 
-   /// Extract (shallow) copy of stored data
--  LeftvShallow operator*() const { return (broken()? LeftvShallow(): (const LeftvShallow&)m_data); }
-+  LeftvShallow operator*() { return (broken()? LeftvShallow(): LeftvShallow(m_data)); }
- 
-   /// Determine active ring when ring dependency changes
-   BOOLEAN rering() {
diff --git a/sci-mathematics/singular/files/singular-4.3.2_p16-test-underlinking.patch b/sci-mathematics/singular/files/singular-4.3.2_p16-test-underlinking.patch
deleted file mode 100644
index cf8a66e3944e..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.2_p16-test-underlinking.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 23444f771ec95036f6589349da232d8b59734a20 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sat, 9 Mar 2024 14:28:03 -0500
-Subject: [PATCH] **/Makefile.am: links tests with RESOURCES_LIBS
-
-Several test programs use functions from libsingular_resources, such
-as feInitResources(). Here we ensure that those test programs are
-actually linked with libsingular_resources by adding RESOURCES_LIBS to
-the corresponding LDADD lines. In the process, and for consistency, we
-have replaced some references to libomalloc.la with OMALLOC_LIBS.
----
- Singular/Makefile.am              | 6 +++---
- kernel/GBEngine/Makefile.am       | 2 +-
- kernel/Makefile.am                | 2 +-
- kernel/combinatorics/Makefile.am  | 2 +-
- kernel/fglm/Makefile.am           | 2 +-
- kernel/groebner_walk/Makefile.am  | 2 +-
- kernel/linear_algebra/Makefile.am | 2 +-
- kernel/maps/Makefile.am           | 2 +-
- kernel/numeric/Makefile.am        | 2 +-
- kernel/oswrapper/Makefile.am      | 2 +-
- kernel/spectrum/Makefile.am       | 2 +-
- 11 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/Singular/Makefile.am b/Singular/Makefile.am
-index 6e27f805a..c68d2507d 100644
---- a/Singular/Makefile.am
-+++ b/Singular/Makefile.am
-@@ -162,7 +162,7 @@ dist_script_SCRIPTS = singularsurf singularsurf_jupyter singularsurf_win surfex
- ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
- ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${OMALLOC_LIBS} \
--${top_builddir}/resources/libsingular_resources.la
-+$(RESOURCES_LIBS)
- 
- 
- ESingular_SOURCES = emacs.cc feOptES.inc feOpt.cc
-@@ -171,7 +171,7 @@ ESingular_SOURCES = emacs.cc feOptES.inc feOpt.cc
- TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
- TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${OMALLOC_LIBS} \
--${top_builddir}/resources/libsingular_resources.la
-+$(RESOURCES_LIBS)
- 
- TSingular_SOURCES = emacs.cc feOptTS.inc feOpt.cc
- # utils.cc utils.h
-@@ -213,7 +213,7 @@ TESTS=test
- check_PROGRAMS=$(TESTS)
- 
- test_SOURCES = test.cc
--test_LDADD = ${builddir}/../omalloc/libomalloc.la libSingular.la
-+test_LDADD = $(OMALLOC_LIBS) libSingular.la $(RESOURCES_LIBS)
- 
- #########################################################
- # These files are built first
-diff --git a/kernel/GBEngine/Makefile.am b/kernel/GBEngine/Makefile.am
-index 8a3c2c5a9..e3a05483c 100644
---- a/kernel/GBEngine/Makefile.am
-+++ b/kernel/GBEngine/Makefile.am
-@@ -21,7 +21,7 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libGBEngine.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la  ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libGBEngine.la $(OMALLOC_LIBS) ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la  ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
- 
-diff --git a/kernel/Makefile.am b/kernel/Makefile.am
-index fe093a4af..f615eab51 100644
---- a/kernel/Makefile.am
-+++ b/kernel/Makefile.am
-@@ -51,7 +51,7 @@ TESTS = test
- check_PROGRAMS = $(TESTS)
- 
- test_SOURCES = test.cc
--test_LDADD   = libkernel.la ${builddir}/../omalloc/libomalloc.la ${builddir}/../Singular/libSingular.la
-+test_LDADD   = libkernel.la $(OMALLOC_LIBS) ${builddir}/../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- # These files are built first
- # BUILT_SOURCES = MOD
-diff --git a/kernel/combinatorics/Makefile.am b/kernel/combinatorics/Makefile.am
-index 31ab51968..816a99360 100644
---- a/kernel/combinatorics/Makefile.am
-+++ b/kernel/combinatorics/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libcombinatorics.la ${builddir}/../libkernelCommon.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libcombinatorics.la ${builddir}/../libkernelCommon.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/fglm/Makefile.am b/kernel/fglm/Makefile.am
-index 227e2c122..3b32dda76 100644
---- a/kernel/fglm/Makefile.am
-+++ b/kernel/fglm/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libfglm.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libfglm.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/groebner_walk/Makefile.am b/kernel/groebner_walk/Makefile.am
-index 9be32dd76..da3364489 100644
---- a/kernel/groebner_walk/Makefile.am
-+++ b/kernel/groebner_walk/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libgroebner_walk.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libgroebner_walk.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/linear_algebra/Makefile.am b/kernel/linear_algebra/Makefile.am
-index 82149611b..57fc6b5ef 100644
---- a/kernel/linear_algebra/Makefile.am
-+++ b/kernel/linear_algebra/Makefile.am
-@@ -23,6 +23,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = liblinear_algebra.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = liblinear_algebra.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/maps/Makefile.am b/kernel/maps/Makefile.am
-index 6e846ef20..afff63804 100644
---- a/kernel/maps/Makefile.am
-+++ b/kernel/maps/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libmaps.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libmaps.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/numeric/Makefile.am b/kernel/numeric/Makefile.am
-index 8fb48461e..f40e9e60a 100644
---- a/kernel/numeric/Makefile.am
-+++ b/kernel/numeric/Makefile.am
-@@ -18,6 +18,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libnumeric.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libnumeric.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/oswrapper/Makefile.am b/kernel/oswrapper/Makefile.am
-index ed4f2097a..e79f9da6a 100644
---- a/kernel/oswrapper/Makefile.am
-+++ b/kernel/oswrapper/Makefile.am
-@@ -19,6 +19,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = liboswrapper.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = liboswrapper.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/spectrum/Makefile.am b/kernel/spectrum/Makefile.am
-index 28ef269b3..6eff47819 100644
---- a/kernel/spectrum/Makefile.am
-+++ b/kernel/spectrum/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libspectrum.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libspectrum.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
--- 
-2.43.0
-
diff --git a/sci-mathematics/singular/singular-4.3.2_p16-r1.ebuild b/sci-mathematics/singular/singular-4.3.2_p16-r1.ebuild
deleted file mode 100644
index ec9fb1763617..000000000000
--- a/sci-mathematics/singular/singular-4.3.2_p16-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 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="https://www.singular.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-# Most files say "version 2 or version 3 of the License," which is not
-# quite GPL-2+, and is why we have listed GPL-2 below. But AFAIK there
-# are no GPL-2-only files.
-LICENSE="BSD GPL-2 GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv ~x86 ~x86-linux"
-IUSE="emacs examples polymake +readline"
-
-# The interactive help uses "info" from sys-apps/texinfo.
-RDEPEND="
-	dev-lang/perl
-	dev-libs/gmp:0=
-	dev-libs/ntl:=
-	sci-libs/cddlib
-	sci-mathematics/flint:=
-	sys-apps/texinfo
-	emacs? ( app-editors/emacs:* )
-	polymake? ( sci-mathematics/polymake )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-
-SITEFILE=60${PN}-gentoo.el
-
-PATCHES=(
-	"${FILESDIR}/${P}-test-underlinking.patch"
-	"${FILESDIR}/${P}-lto.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_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}"
-
-	find "${ED}" -type f -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
-}