gentoo resync : 31.05.2021

6 files changed, 117 insertions, 383 deletions

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 87b44234af5f..000000000000
--- 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 d3e6b77a28e9..000000000000
--- 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 caeed33f1fc3..000000000000
--- 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@rezozer.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 bcda4ced6472..000000000000
--- 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@mathematik.uni-kl.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@mathematik.uni-kl.de])
-+AC_INIT([libgfan], [0.6], [ren@mathematik.uni-kl.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/files/singular-4.2.0-doc_install.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
new file mode 100644
index 000000000000..b0656d9fb676
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
@@ -0,0 +1,79 @@
+From 74ec250d3d89d0125c409b3340aca50a00b067ad Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 30 May 2021 08:28:41 -0400
+Subject: [PATCH 3/3] autotools: support docdir and htmldir.
+
+Instead of hard-coding the "doc" and "html" subdirectories,
+allow them to be ./configured.
+---
+ Makefile.am             | 8 ++++----
+ configure.ac            | 5 +++++
+ resources/configure.ac  | 4 ++++
+ resources/feResource.cc | 2 +-
+ 4 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index fbea51d..c5d78a7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,10 +16,10 @@ bin_SCRIPTS = libsingular-config
+ 
+ install-data-local:
+ 	if test -e $(srcdir)/doc/doc.tbz2; then\
+-	  (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
+-	   mkdir $(DESTDIR)$(datadir)/info;\
+-	   mkdir $(DESTDIR)$(datadir)/doc;\
+-	   mv  $(DESTDIR)$(datadir)/singular/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
++	   mkdir -p $(DESTDIR)$(docdir);\
++	   (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(docdir); tar -jx --no-same-owner -f -));\
++	   mv  $(DESTDIR)$(docdir)/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
++	   @INSTALL_DATA@ doc/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
+ 	fi
+ 
+ uninstall-local:
+diff --git a/configure.ac b/configure.ac
+index 490a45f..997db6c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,6 +228,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ AC_SUBST(DATA_DIR, "$config_datadir")
+ 
++AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
++AX_NORMALIZE_PATH([config_docdir],['/'])
++AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
++AC_SUBST(DOC_DIR, "$config_docdir")
++
+ SING_SHOW_FLAGS([Compiler/linker flags: ])
+ 
+ 
+diff --git a/resources/configure.ac b/resources/configure.ac
+index 0dc468f..da68144 100644
+--- a/resources/configure.ac
++++ b/resources/configure.ac
+@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
+ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ 
++AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
++AX_NORMALIZE_PATH([config_htmldir],['/'])
++AC_DEFINE_UNQUOTED([HTML_DIR],"$config_datadir",[htmldir])
++
+ AC_CONFIG_FILES([singular_resources.pc Makefile])
+ AC_OUTPUT
+diff --git a/resources/feResource.cc b/resources/feResource.cc
+index 3d75bc9..7e4fc8c 100644
+--- a/resources/feResource.cc
++++ b/resources/feResource.cc
+@@ -85,7 +85,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
+   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
+   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%D/info/singular.hlp", (char *)""},
+   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%D/singular/singular.idx",  (char *)""},
+-  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%D/singular/html",              (char *)""},
++  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    HTML_DIR,              (char *)""},
+   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "https://www.singular.uni-kl.de/Manual/",    (char *)""},
+   {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
+   {"Path",      'p',    feResPath,  NULL,                   "%b;%P;$PATH",             (char *)""},
+-- 
+2.31.1
+
diff --git a/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch b/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch
new file mode 100644
index 000000000000..267bf19361ad
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch
@@ -0,0 +1,38 @@
+From 705149b86a80dd8b53fa8c1717872e9b2e9dbbcb Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 30 May 2021 08:10:10 -0400
+Subject: [PATCH 1/3] gfanlib/Makefile.am: use LIBADD for additional libraries.
+
+The $GMP_LIBS and $CDDGMPLDFLAGS variables were being added to
+libgfan_la_LDFLAGS, which isn't quite correct. Since both contain
+library (-l) flags, they belong in _LIBADD rather than _LDFLAGS:
+
+  https://www.gnu.org/software/automake/manual/html_node/Libtool-Flags.html
+
+This commit moves them to a new libgfan_la_LIBADD variable.
+---
+ gfanlib/Makefile.am | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gfanlib/Makefile.am b/gfanlib/Makefile.am
+index cec8d8f..96e1893 100644
+--- a/gfanlib/Makefile.am
++++ b/gfanlib/Makefile.am
+@@ -18,9 +18,13 @@ AM_CXXFLAGS = @CXX11_FLAG@
+ 
+ SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
+ libgfan_la_SOURCES = $(SOURCES)
+-libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS)
++libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS)
+ libgfan_la_CPPFLAGS= $(GMP_CPPFLAGS) $(CDDGMPCPPFLAGS)
+ 
++# Despite the naming convention, $CDDGMPLDFLAGS contains "-lcddgmp"
++# and the rest of the $GMP_LIBS flags.
++libgfan_la_LIBADD = $(CDDGMPLDFLAGS) $(GMP_LIBS)
++
+ noinst_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h  gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h  gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h
+ 
+ DISTCLEANFILES =  config.h
+-- 
+2.31.1
+