[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/

[Michael Orlitzky]

commit:     f5a5d0813ad3e632e5e1c24e2f26a361e9285e74
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 11:15:25 2021 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun May 30 11:50:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a5d081

sci-mathematics/singular: remove outdated versions and patches.

Closes: https://bugs.gentoo.org/712004
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-mathematics/singular/Manifest                  |   4 -
 .../singular-4.0.0-fix-omalloc-ar-detection.patch  |  12 -
 .../files/singular-4.0.2-ntl8-compat.patch         |  38 ---
 .../files/singular-4.0.3-fix-destdir.patch         |  26 --
 .../files/singular-4.0.3-fix-resources-name.patch  | 307 ---------------------
 sci-mathematics/singular/metadata.xml              |   3 -
 sci-mathematics/singular/singular-4.0.2.ebuild     | 137 ---------
 sci-mathematics/singular/singular-4.0.3.ebuild     |  98 -------
 8 files changed, 625 deletions(-)

diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index a0d12ebf497..6b537a9d225 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,5 +1 @@
-DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 357a68f68cc0508e4e197427c56232da60412a8380045ac594cbe313bf6a403068d1724f637d47de44e66baf34c74fa5c4ee622721c5bbd67764e65e66c8583a SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25
-DIST singular-4.0.2.tar.gz 8635172 BLAKE2B 5f565bf14677d8414300d7a5602aa96c8cef7e863fd858083fe4561742b545d74a5fc4de95ef0c63acf4f78c66405bac7ba77a954e42b2e87a6da608e4732bcd SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d
-DIST singular-4.0.3-share.tar.gz 6633256 BLAKE2B c137b72aaa0926eb006624e03fe938678acb94a41da525de1ca4f7711985d253926788b550d2d98b8def15fb0cb60b2527c1c04566a29a28135fcb1a70246025 SHA512 5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a
-DIST singular-4.0.3.tar.gz 12615042 BLAKE2B b3c63434974bb8b5fdef86cbcbe73b76a47503b28dcae6bfc6e4210e1ab1c14224ac0f6eeefa9d8004450f6d9a26843368a9b2ea16bca68bf1215ce33e83df0d SHA512 781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8

diff --git a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
deleted file mode 100644
index 87b44234af5..00000000000
--- a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U 3 -dHrN singular-4.0.0.orig/omalloc/configure.ac singular-4.0.0/omalloc/configure.ac
---- singular-4.0.0.orig/omalloc/configure.ac	2014-03-06 18:07:49.000000000 +0100
-+++ singular-4.0.0/omalloc/configure.ac	2014-05-09 15:41:19.755097185 +0200
-@@ -117,7 +117,7 @@
- dnl check for programs
- dnl
- AC_CHECK_PROG(AR, ar, ar, :)
--if test "$ac_cv_prog_AR" != ar; then
-+if test "$ac_cv_prog_AR" = no; then
-   AC_MSG_ERROR(*** ar program not found)
- fi
- AC_CHECK_PROGS(PERL, perl, "no")

diff --git a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch b/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch
deleted file mode 100644
index d3e6b77a28e..00000000000
--- a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/factory/NTLconvert.cc b/factory/NTLconvert.cc
-index 41ce9b2..e32093d 100644
---- a/factory/NTLconvert.cc
-+++ b/factory/NTLconvert.cc
-@@ -30,6 +30,7 @@
- #include <NTL/GF2EXFactoring.h>
- #include <NTL/tools.h>
- #include <NTL/mat_ZZ.h>
-+#include <NTL/version.h>
- #include "int_int.h"
- #include <limits.h>
- #include "NTLconvert.h"
-@@ -500,8 +501,14 @@ convertZZ2CF (const ZZ & a)
-     return CanonicalForm(coeff_long);
-   }
-   else
--  {
--    long sizeofrep= ((long *) a.rep) [1];
-+  { 
-+    const long * rep =
-+#if NTL_MAJOR_VERSION <= 6
-+      static_cast<long *>( a.rep );
-+#else
-+      static_cast<long *>( a.rep.rep ); // what about NTL7?
-+#endif
-+    long sizeofrep= rep[1];
-     bool lessZero= false;
-     if (sizeofrep < 0)
-     {
-@@ -519,7 +526,7 @@ convertZZ2CF (const ZZ & a)
-       cf_stringtemp_l= sizeofrep*sizeof(mp_limb_t)*2;
-       cf_stringtemp= (unsigned char*) Alloc (cf_stringtemp_l);
-     }
--    int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) (((long *) (a.rep)) + 2), sizeofrep);
-+    int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) ((rep) + 2), sizeofrep);
- 
-     char* cf_stringtemp2;
-     if (lessZero)

diff --git a/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch b/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch
deleted file mode 100644
index caeed33f1fc..00000000000
--- a/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7eac42b467723a83a951218be53785411be3dbc4 Mon Sep 17 00:00:00 2001
-From: jgmbenoit <quatermaster@×××××××.net>
-Date: Thu, 28 Apr 2016 05:47:53 +0000
-Subject: [PATCH] automake: install-data-local: missing DESTDIR prefix
-
----
- Makefile.am | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 32778f7..24dd251 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,9 +17,9 @@ dist-hook:
- 	$(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version
- 
- install-data-local:
--	-cat ${top_srcdir}/doc/doc.tbz2| (cd $(datadir)/singular;tar jxf -)
--	-mkdir $(datadir)/info
--	-mv  $(datadir)/singular/singular.hlp  $(datadir)/info/.
-+	-cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -)
-+	-mkdir $(DESTDIR)$(datadir)/info
-+	-mv  $(DESTDIR)$(datadir)/singular/singular.hlp  $(DESTDIR)$(datadir)/info/.
- 
- configheaderdir = ${includedir}/singular
- nodist_configheader_HEADERS = singularconfig.h

diff --git a/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch b/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch
deleted file mode 100644
index bcda4ced647..00000000000
--- a/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-From a3a6a07858b7e91c4c8a3c8d07e53957a8547af2 Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@×××××××××××××××××.de>
-Date: Thu, 1 Sep 2016 10:48:08 +0200
-Subject: [PATCH] change library name: libresources -> libsingular_resources
-
----
- Singular/Makefile.am               |  4 ++--
- autogen.sh                         |  1 +
- factory/configure.ac               |  8 ++++----
- gfanlib/configure.ac               |  2 +-
- libpolys/configure.ac              |  8 ++++----
- m4/options.m4                      | 10 +++++-----
- resources/Makefile.am              | 18 +++++++++---------
- resources/configure.ac             |  6 +++---
- resources/feFopen.cc               |  2 +-
- resources/feResource.cc            |  2 +-
- resources/omFindExec.c             |  2 +-
- resources/resources.pc.in          | 17 -----------------
- resources/singular_resources.pc.in | 17 +++++++++++++++++
- 13 files changed, 49 insertions(+), 48 deletions(-)
- delete mode 100644 resources/resources.pc.in
- create mode 100644 resources/singular_resources.pc.in
-
-diff --git a/Singular/Makefile.am b/Singular/Makefile.am
-index e2bcc23..be84a08 100644
---- a/Singular/Makefile.am
-+++ b/Singular/Makefile.am
-@@ -176,7 +176,7 @@ ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
- # ESingular_LDFLAGS = -static ${AM_LDFLAGS}
- ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
--${top_builddir}/resources/libresources.la
-+${top_builddir}/resources/libsingular_resources.la
- 
- 
- ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
-@@ -186,7 +186,7 @@ TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
- # TSingular_LDFLAGS = -static ${AM_LDFLAGS}
- TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
--${top_builddir}/resources/libresources.la
-+${top_builddir}/resources/libsingular_resources.la
- 
- TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
- # utils.cc utils.h
-diff --git a/autogen.sh b/autogen.sh
-index d027997..0d09c08 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -4,6 +4,7 @@ cd `dirname "$0"`
- 
- # -d --warnings=all
- autoreconf  -v -f -i
-+find . -name configure -exec sed -i "s/-g -O2/-g/g" {} \; -print
- 
- cd -
- 
-diff --git a/factory/configure.ac b/factory/configure.ac
-index 7ea255b..a9caf73 100644
---- a/factory/configure.ac
-+++ b/factory/configure.ac
-@@ -120,10 +120,10 @@ AM_CONDITIONAL(
-     [WITH_PARSER_FOR_CANONICAL_FORM],
-     [test "x$enable_streamio" = xyes])
- 
--AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] )
--AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] )
-+AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] )
-+AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] )
- 
--AC_MSG_CHECKING(whether libresources should be used)
-+AC_MSG_CHECKING(whether libsingular_resources should be used)
- if test "x$with_Singular" = xyes;
- then
-   AC_MSG_RESULT(yes)
-@@ -134,7 +134,7 @@ then
-   AC_MSG_CHECKING([  RESOURCES_LIBS?..])
-   AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
- 
--  PKG_REQUIRE="$PKG_REQUIRE resources"
-+  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
-   AC_SUBST(PKG_REQUIRE)
- else
-   AC_MSG_RESULT(no)
-diff --git a/gfanlib/configure.ac b/gfanlib/configure.ac
-index 015134c..d3d2cd7 100644
---- a/gfanlib/configure.ac
-+++ b/gfanlib/configure.ac
-@@ -2,7 +2,7 @@
- # Process this file with autoconf to produce a configure script.
- 
- AC_PREREQ([2.63])
--AC_INIT([libgfan], [0.1], [ren@×××××××××××××××××.de])
-+AC_INIT([libgfan], [0.6], [ren@×××××××××××××××××.de])
- AC_CONFIG_MACRO_DIR([../m4])
- AC_CONFIG_AUX_DIR([../build-aux])
- AC_CONFIG_SRCDIR([gfanlib.h])
-diff --git a/libpolys/configure.ac b/libpolys/configure.ac
-index 049e44d..4b2f1ae 100644
---- a/libpolys/configure.ac
-+++ b/libpolys/configure.ac
-@@ -90,10 +90,10 @@ SING_CHECK_OMALLOC()
- 
- ENABLE_RESOURCES="yes"
- 
--AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] )
--AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] )
-+AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] )
-+AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] )
- 
--AC_MSG_CHECKING(whether libresources should be used)
-+AC_MSG_CHECKING(whether libsingular_resources should be used)
- 
- if test "x$ENABLE_RESOURCES" = xyes;
- then
-@@ -105,7 +105,7 @@ then
-   AC_MSG_CHECKING([  RESOURCES_LIBS?..])
-   AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
- 
--  PKG_REQUIRE="$PKG_REQUIRE resources"
-+  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
-   AC_SUBST(PKG_REQUIRE)
- else
-   AC_MSG_RESULT(no)
-diff --git a/m4/options.m4 b/m4/options.m4
-index 31b86e4..066dc4d 100644
---- a/m4/options.m4
-+++ b/m4/options.m4
-@@ -150,19 +150,19 @@ AC_DEFUN([SING_USE_OMALLOC],
- 
- AC_DEFUN([SING_USE_RESOURCES],
- [
-- AC_ARG_ENABLE(resources,
--  [AS_HELP_STRING([--disable-resources], [do NOT use libresources within the factory])],
-+ AC_ARG_ENABLE(singular_resources,
-+  [AS_HELP_STRING([--disable-singular_resources], [do NOT use libsingular_resources within the factory])],
-   [if test "x$enableval"  = "xyes"; then
-     ENABLE_RESOURCES=yes
-    fi],
-     ENABLE_RESOURCES=yes)
- 
-- AC_MSG_CHECKING(whether to use libresources in factory and co.)
-+ AC_MSG_CHECKING(whether to use libsingular_resources in factory and co.)
-  if test "x$ENABLE_RESOURCES" = xyes; then
-   AC_MSG_RESULT(yes)
-   RESOURCES_INCLUDES="-I$ac_abs_top_srcdir "
- 
--  RESOURCES_LIBS="$ac_abs_top_builddir/resources/libresources.la"
-+  RESOURCES_LIBS="$ac_abs_top_builddir/resources/libsingular_resources.la"
- 
-   AC_SUBST(RESOURCES_INCLUDES)
-   AC_SUBST(RESOURCES_LIBS)
-@@ -171,7 +171,7 @@ AC_DEFUN([SING_USE_RESOURCES],
- 
-   ac_configure_args="$ac_configure_args $ENABLE_ARG"
- 
--  PKG_REQUIRE="$PKG_REQUIRE resources"
-+  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
-   AC_SUBST(PKG_REQUIRE)
-  else
-   AC_MSG_RESULT(no)
-diff --git a/resources/Makefile.am b/resources/Makefile.am
-index fa69ccc..934175b 100644
---- a/resources/Makefile.am
-+++ b/resources/Makefile.am
-@@ -1,24 +1,24 @@
- ACLOCAL_AMFLAGS = -I ../m4
- 
--libresources_LTLIBRARIES = libresources.la
-+libsingular_resources_LTLIBRARIES = libsingular_resources.la
- 
--libresourcesdir = $(libdir)
-+libsingular_resourcesdir = $(libdir)
- 
- 
- AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
- 
- 
- SOURCES  = omFindExec.c feResource.cc feFopen.cc
--libresources_la_SOURCES   = $(SOURCES)
-+libsingular_resources_la_SOURCES   = $(SOURCES)
- 
--libresources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
-+libsingular_resources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
- 
--libresources_includedir  =$(includedir)/resources
-+libsingular_resources_includedir  =$(includedir)/resources
- 
--libresources_include_HEADERS = omFindExec.h feResource.h feFopen.h
-+libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h
- 
--nodist_libresources_include_HEADERS = resourcesconfig.h
--DISTCLEANFILES = $(nodist_libresources_include_HEADERS)
-+nodist_libsingular_resources_include_HEADERS = singular_resourcesconfig.h
-+DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS)
- 
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = resources.pc
-+pkgconfig_DATA = singular_resources.pc
-diff --git a/resources/configure.ac b/resources/configure.ac
-index bc5f294..212a1d5 100644
---- a/resources/configure.ac
-+++ b/resources/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([resources], [4.0.3])
-+AC_INIT([singular_resources], [4.0.3])
- 
- AC_CONFIG_MACRO_DIR([../m4])
- AC_CONFIG_AUX_DIR([../build-aux])
-@@ -14,7 +14,7 @@ dnl Check if build env is sane
- AM_SANITY_CHECK
- 
- # Add pre'prefixed config
--AX_PREFIX_CONFIG_H([resourcesconfig.h],[],[_config.h])
-+AX_PREFIX_CONFIG_H([singular_resourcesconfig.h],[],[_config.h])
- 
- SING_RESET_FLAGS()
- SING_CHECK_SET_ARGS()
-@@ -70,5 +70,5 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
- AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
- 
--AC_CONFIG_FILES([resources.pc Makefile])
-+AC_CONFIG_FILES([singular_resources.pc Makefile])
- AC_OUTPUT
-diff --git a/resources/feFopen.cc b/resources/feFopen.cc
-index 98cfd44..10800a0 100644
---- a/resources/feFopen.cc
-+++ b/resources/feFopen.cc
-@@ -1,4 +1,4 @@
--#include "resourcesconfig.h"
-+#include "singular_resourcesconfig.h"
- #include "feResource.h"
- #include "feFopen.h"
- 
-diff --git a/resources/feResource.cc b/resources/feResource.cc
-index 49a6855..a3accf9 100644
---- a/resources/feResource.cc
-+++ b/resources/feResource.cc
-@@ -5,7 +5,7 @@
- * ABSTRACT: management of resources
- */
- 
--#include "resourcesconfig.h"
-+#include "singular_resourcesconfig.h"
- #include "feResource.h"
- #include "omFindExec.h"
- 
-diff --git a/resources/omFindExec.c b/resources/omFindExec.c
-index e79f2c8..1d5852a 100644
---- a/resources/omFindExec.c
-+++ b/resources/omFindExec.c
-@@ -6,7 +6,7 @@
-  *******************************************************************/
- 
- 
--#include "resourcesconfig.h"
-+#include "singular_resourcesconfig.h"
- 
- 
- #if defined(HAVE_UNISTD_H) && defined(STDC_HEADERS)
-diff --git a/resources/resources.pc.in b/resources/resources.pc.in
-deleted file mode 100644
-index d040056..0000000
---- a/resources/resources.pc.in
-+++ /dev/null
-@@ -1,17 +0,0 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--
--Name: @PACKAGE@
--Description: The Singular resources manager
--Version: @PACKAGE_VERSION@
--URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
--
--# Requires:
--# Conflicts:
--
--Cflags: -I${includedir} @SINGULAR_CFLAGS@
--Libs: -L${libdir} -l@PACKAGE@
--# Libs.private:
--
-diff --git a/resources/singular_resources.pc.in b/resources/singular_resources.pc.in
-new file mode 100644
-index 0000000..d040056
---- /dev/null
-+++ b/resources/singular_resources.pc.in
-@@ -0,0 +1,17 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE@
-+Description: The Singular resources manager
-+Version: @PACKAGE_VERSION@
-+URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
-+
-+# Requires:
-+# Conflicts:
-+
-+Cflags: -I${includedir} @SINGULAR_CFLAGS@
-+Libs: -L${libdir} -l@PACKAGE@
-+# Libs.private:
-+

diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index faab92efd93..d17eda6d58f 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -5,7 +5,4 @@
     <email>sci-mathematics@g.o</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
-  <use>
-    <flag name="boost">Compile against external boost headers (<pkg>dev-libs/boost</pkg>)</flag>
-  </use>
 </pkgmetadata>

diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
deleted file mode 100644
index c6650033710..00000000000
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch elisp-common flag-o-matic toolchain-funcs versionator
-
-MY_PN=Singular
-MY_PV=$(replace_all_version_separators '.')
-# Consistency is different...
-MY_DIR2=$(get_version_component_range 1-3 ${PV})
-MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
-# This is where the share tarball unpacks to
-MY_SHARE_DIR="${WORKDIR}"/share/
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="https://www.singular.uni-kl.de/"
-SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
-		 https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux"
-IUSE="boost doc emacs examples python +readline"
-
-RDEPEND="dev-libs/gmp:0
-	>=dev-libs/ntl-5.5.1
-	emacs? ( >=app-editors/emacs-23.1:* )
-	sci-mathematics/flint
-	sci-mathematics/4ti2
-	sci-libs/cddlib"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	boost? ( dev-libs/boost )
-	readline? ( sys-libs/readline )"
-
-SITEFILE=60${PN}-gentoo.el
-
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-pkg_setup() {
-	append-flags "-fPIC"
-	append-ldflags "-fPIC"
-	tc-export AR CC CPP CXX
-}
-
-src_prepare() {
-	# Need to do something about resources later...
-	# epatch "${FILESDIR}"/${PN}-4.0.0-gentoo.patch
-
-	# omalloc's old configure will fail if ar is not exactly 'ar'.
-	epatch "${FILESDIR}"/${PN}-4.0.0-fix-omalloc-ar-detection.patch
-
-	epatch "${FILESDIR}"/${PN}-4.0.2-ntl8-compat.patch
-
-	# autoreconf everything since otherwise it assumes autmake-1.13 is installed
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-gmp \
-		  --with-ntl \
-		  --with-flint \
-		  --enable-gfanlib \
-		  --disable-debug \
-		  --disable-doc \
-		  --enable-factory \
-		  --enable-libfac \
-		  --enable-IntegerProgramming \
-		  $(use_with python python embed) \
-		  $(use_with boost Boost) \
-		  $(use_enable emacs) \
-		  $(use_with readline) || die "configure failed"
-}
-
-src_compile() {
-	emake
-
-	if use emacs; then
-		cd "${MY_SHARE_DIR}"singular/emacs/
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-# src_install() {
-# 	dodoc README
-# 	# execs and libraries
-# 	cd "${S}"/build/bin
-# 	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL
-# 	insinto /usr/$(get_libdir)/${PN}
-# 	doins *.so
-#
-# 	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN}
-#
-# 	# stuff from the share tar ball
-# 	cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
-# 	insinto /usr/share/${PN}
-# 	doins -r LIB
-# 	if use examples; then
-# 		insinto /usr/share/doc/${PF}
-# 		doins -r examples
-# 	fi
-# 	if use doc; then
-# 		dohtml -r html/*
-# 		insinto /usr/share/${PN}
-# 		doins doc/singular.idx
-# 		cp info/${PN}.hlp info/${PN}.info &&
-# 		doinfo info/${PN}.info \
-# 			|| die "failed to install info files"
-# 	fi
-# 	if use emacs; then
-# 		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* \
-# 			|| die "elisp-install failed"
-# 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-# 	fi
-# }
-
-pkg_postinst() {
-	einfo "The authors ask you to register as a SINGULAR user."
-	einfo "Please check the license file for details."
-
-	if use emacs; then
-		echo
-		ewarn "Please note that the ESingular emacs wrapper has been"
-		ewarn "removed in favor of full fledged singular support within"
-		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
-		ewarn "and you should be good to go! See bug #193411 for more info."
-		echo
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild
deleted file mode 100644
index 3a0712e9be7..00000000000
--- a/sci-mathematics/singular/singular-4.0.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common flag-o-matic multilib prefix toolchain-funcs versionator
-
-MY_PN=Singular
-MY_PV=$(replace_all_version_separators '.')
-# Consistency is different...
-MY_DIR2=$(get_version_component_range 1-3 ${PV})
-MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
-# This is where the share tarball unpacks to
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="https://www.singular.uni-kl.de/"
-SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
-		 https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
-IUSE="boost doc emacs examples python +readline"
-
-RDEPEND="dev-libs/gmp:0
-	>=dev-libs/ntl-5.5.1
-	emacs? ( >=app-editors/emacs-23.1:* )
-	sci-mathematics/flint
-	sci-mathematics/4ti2
-	sci-libs/cddlib"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	boost? ( dev-libs/boost )
-	readline? ( sys-libs/readline )"
-
-SITEFILE=60${PN}-gentoo.el
-
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-pkg_setup() {
-	append-flags "-fPIC"
-	append-ldflags "-fPIC"
-	tc-export AR CC CPP CXX
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${P}"-fix-resources-name.patch
-	eapply "${FILESDIR}"/"${P}"-fix-destdir.patch
-	eapply_user
-	# autoreconf everything since otherwise it assumes autmake-1.13 is installed
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-gmp \
-		  --with-ntl \
-		  --with-flint \
-		  --enable-gfanlib \
-		  --disable-debug \
-		  --disable-doc \
-		  --enable-factory \
-		  --enable-libfac \
-		  --enable-IntegerProgramming \
-		  $(use_with python python embed) \
-		  $(use_with boost Boost) \
-		  $(use_enable emacs) \
-		  $(use_with readline) || die "configure failed"
-}
-
-src_compile() {
-	emake
-
-	if use emacs; then
-		cd "${S}"/emacs/
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-pkg_postinst() {
-	einfo "The authors ask you to register as a SINGULAR user."
-	einfo "Please check the license file for details."
-
-	if use emacs; then
-		echo
-		ewarn "Please note that the ESingular emacs wrapper has been"
-		ewarn "removed in favor of full fledged singular support within"
-		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
-		ewarn "and you should be good to go! See bug #193411 for more info."
-		echo
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}