gentoo auto-resync : 24:12:2022 - 02:00:50

8 files changed, 4 insertions, 301 deletions

diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 46f01271a63f..e08a451c39ba 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,12 +1,6 @@
 AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91d1a359e058fc654c6778456174d6cee9242f7fcaf81bf1464f47f43604b9e4eb298f051c6a4daba4630ca SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431
-AUX singular-4.0.3-gfan_linking.patch 705 BLAKE2B 9ec4dafad75885132d4f6bea65f945a5f6f383e39f3d375a70e12a86db983cc3d64e14b148db07c9577a46d2a8f534f43988d264fdb43dc61b247843af5f438d SHA512 4c2ab45f449f9c3d79165e1c9a0634fb08a9cd34dbc898e0e172409f6914ccd6e1c4e1719ccf0b36e591b4840e8cba08576ac1b57fadd08f8344b45e1af40d89
-AUX singular-4.1.3-doc_install.patch 2834 BLAKE2B d8e35169534ed9087fc1faf6029a111819d2198d5fa61134ba083920604f93a346e6f274da02361b0c03ba05fea2c4f1b23fe2af8a46d8e6705cf4ccd025751a SHA512 36d3b6f2d90479ae508c7771d4fd7724ada5f5102ece78c4d5bc113c23848973706f19a9e1467de322ecee29712dc1d915f41b491bef23529a43380ff69d84ef
-AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
-AUX singular-4.2.1-htmldoc.patch 2086 BLAKE2B 28ab2e8ef9ad2ff1343d3efd33917503c00fb74428f35b1ab0fb1475368d3760d3c915668d4fb008ccc618e2aa1c13a35f66d3a62f8c3abe93b5275f1648c8e7 SHA512 5c28c31bc51a937ddff4e52da3ed93f20516b64ac6abfc05031d09e708e557268e757c55e625abfd77c19600f64a7f284903de619c113a57194367e23148ff82
-DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
 DIST singular-4.3.1p1.tar.gz 15090370 BLAKE2B d4e40378b3892b98b1f78c3928c8a40484336ea25ea4dcd4b3a1e5f651281d2cdb06d92c9cc64427ce76e91c5bf4eaa1c3b643df174a24c188823ae808817ad9 SHA512 d27d8e042ea085e49aed6a0697056c36e78e62ea0b9d17751cdf4c556cf4f6efce3b34b411c77aef97c6d90675bea11c97651eb7009634cb8a9b630ec820a06e
 DIST singular-4.3.1p2.tar.gz 15088650 BLAKE2B 17d73518653f6348297c955214aa8d30b3ce7cdf342f1bbb6fb49b746ddc563b1f46906df92f45abd601c834c77139f7aaccadf14bf706010017564d56948ca2 SHA512 ff2282b2fcd1a5b8809297036d524838403a2b66ae87ceb566ed6ff0571843d3c4aa0f7a4abbaab8541630f4e0130b6171ea0a7b8a5296b3b10f6c5cd5088828
-EBUILD singular-4.2.0_p1.ebuild 2259 BLAKE2B 2237245fe2550f398a20a14ae599bcc668288aa6312925cee725e2571dc53f8f62f88bdff0cdf8cd303c72baaf2861a2c560ce54978da720e93cbe459769b7d1 SHA512 2a6b8e478f32ff9e3df96e0188cd137b16d9be1a8c18c9f5367a81b96dc8b0cc01d34771246001eee9e8ec9832f8832539e921879ec56fe8a51ebb42c0d29389
-EBUILD singular-4.3.1_p1.ebuild 2295 BLAKE2B 399f910678833dd16cc93039c18733c46f98e05cf95c0e2a1165d4669b75558dedfebf57703cec0f518c029d84a5e1c9a2f029dc5f9c125b4ac4924fa3c61221 SHA512 c9a986a5ac4063c574f9fbe6ef4ca3e38a1840bf2bd2e1c4b77e0ad85676d1c2eb3d586125af818dce7ab665c635908da9ffc1a7e4fbaa034498556cd4df17dc
-EBUILD singular-4.3.1_p2.ebuild 2296 BLAKE2B 4c1cacc1976fa42355106d381764b0ce6bb7ac78d0c540b83b634036456af4c8dc7404fc73bf0187c39a8c3eeeb94f451590afd687fd512e3aba3056a5b35ead SHA512 9e944311c909a6cfeee4a5efc97714b2c5f9c3c3ec2104435685cde4bdaa527ffcf3ea7db9cbacea59fe7c4afe6023c1059261b29143be97391111b213704acf
+EBUILD singular-4.3.1_p1.ebuild 2294 BLAKE2B 1147387c35f31d8bef97c67ec8d4596952494c85d8dd0c427981c7d491200fb3eb02658f3f63fde4e8323e1cc0f9ccbb467ae73ba17bbba12a05831b12f35348 SHA512 2d0c8047da3d2940f7ada1f68f314b7499a497dce09d7166f866f62bd67ab315df7bca5e90af07f897839ceb288651dd6be347a1ecceaa8ce6177f9a30df72d9
+EBUILD singular-4.3.1_p2.ebuild 2300 BLAKE2B d55b7cf13d0fbdd2d61f52237b709ffa470b955e256563b525a30929eeed12fe321b9f7935616d300d3e313e07bdebe62995c34b9586391cff70304f42915297 SHA512 dd7be599866c801ed2303319061f325f8052a8041b280d0815902cdc9f75fc88be5d1187ff4c4785716bd62eff8e480adf4c5a1bacfdab2711f05471e47a50b9
 MISC metadata.xml 782 BLAKE2B 7f10704c78b5a55cff9d07ffc3456a57aba4001ffd337dfbbb712e32608446ab9ae8039d14143939ad41710dcc6d4725992db2c80bcd1678397e563fefa929b4 SHA512 3c4904a4a8f63ff073745409caf9a9a68aa5d46861b8e8d77a538716a7a6a099d87137d604e52a3b8ce4ab81b7333f95389cd888ccbabe52017b6e8b1e4a77d0
diff --git a/sci-mathematics/singular/files/singular-4.0.3-gfan_linking.patch b/sci-mathematics/singular/files/singular-4.0.3-gfan_linking.patch
deleted file mode 100644
index f228d980ffcf..000000000000
--- a/sci-mathematics/singular/files/singular-4.0.3-gfan_linking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gfanlib/Makefile.am b/gfanlib/Makefile.am
-index 2039af0..a1b7dce 100644
---- a/gfanlib/Makefile.am
-+++ b/gfanlib/Makefile.am
-@@ -20,6 +20,8 @@ libgfan_la_SOURCES = $(SOURCES)
- libgfan_includedir =$(includedir)/gfanlib
- libgfan_include_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
- 
-+libgfan_la_LIBADD = $(CDDGMPLDFLAGS)
-+
- DISTCLEANFILES =  config.h
- 
- moduledir = $(libexecdir)/singular/MOD
diff --git a/sci-mathematics/singular/files/singular-4.1.3-doc_install.patch b/sci-mathematics/singular/files/singular-4.1.3-doc_install.patch
deleted file mode 100644
index 10e831bea701..000000000000
--- a/sci-mathematics/singular/files/singular-4.1.3-doc_install.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index c21b6ba..ea61758 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -14,10 +14,11 @@ dist-hook:
- 
- install-data-local:
- 	if test -e $(srcdir)/doc/doc.tbz2; then\
--	  (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -));\
- 	   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 2d53a55..d43b5fe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -248,6 +248,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 cf6720f..ac5f2d0 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 *)""},
diff --git a/sci-mathematics/singular/files/singular-4.2.0-no-static.patch b/sci-mathematics/singular/files/singular-4.2.0-no-static.patch
deleted file mode 100644
index 5509c58bd6b6..000000000000
--- a/sci-mathematics/singular/files/singular-4.2.0-no-static.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From ef9d66230f9697caaa77dbfc275650412d0d9c0d Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 22 Mar 2021 09:02:58 -0400
-Subject: [PATCH 1/1] Singular/Makefile.am: drop -static linker flags.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are a few hard-coded "-static" flags in the Makefile.am for
-Singular that are causing weird problems for shared builds. The
-visible symptom on Gentoo was a few insecure rpaths being stripped
-from the "Singular" executable, but François Bissey was able to track
-down the root cause, namely the "-static" that is causing libtool to
-act weird.
-
-In retrospect, this problem was also reported on Stack Overflow at,
-
-  https://stackoverflow.com/questions/17905121
-
-The Gentoo bug is,
-
-  https://bugs.gentoo.org/712004
-
-If we experience no problems with this patch, it will be sent upstream.
----
- Singular/Makefile.am | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Singular/Makefile.am b/Singular/Makefile.am
-index 7fe43bffb..1e440765d 100644
---- a/Singular/Makefile.am
-+++ b/Singular/Makefile.am
-@@ -153,7 +153,7 @@ Singular_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
- 
- Singular_LDADD = libSingular.la ${OMALLOC_LIBS} ${BUILTIN_FLAGS}
- 
--Singular_LDFLAGS = -static ${AM_LDFLAGS} ${BUILTIN_FLAGS}
-+Singular_LDFLAGS = ${AM_LDFLAGS} ${BUILTIN_FLAGS}
- 
- Singulard_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
- 
-@@ -166,7 +166,6 @@ dist_script_SCRIPTS = singularsurf singularsurf_jupyter singularsurf_win surfex
- 
- #### ESingular
- 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 ${OMALLOC_LIBS} \
- ${top_builddir}/resources/libsingular_resources.la
-@@ -176,7 +175,6 @@ ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
- 
- #### same for TSingular
- 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 ${OMALLOC_LIBS} \
- ${top_builddir}/resources/libsingular_resources.la
-@@ -191,7 +189,7 @@ libparse_CPPFLAGS = ${AM_CPPFLAGS} -DSTANDALONE_PARSER
- libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc  utils.h
- 
- libparse_LDADD =
--libparse_LDFLAGS = -static ${AM_LDFLAGS}
-+libparse_LDFLAGS = ${AM_LDFLAGS}
- 
- #########################################################
- # the Singular library (*.lib files)
--- 
-2.26.2
-
diff --git a/sci-mathematics/singular/files/singular-4.2.1-htmldoc.patch b/sci-mathematics/singular/files/singular-4.2.1-htmldoc.patch
deleted file mode 100644
index 7eedee90dcf2..000000000000
--- a/sci-mathematics/singular/files/singular-4.2.1-htmldoc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 6b75a34..5e932b8 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 bde2baa..9f9c966 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 0eaa6fa..3309386 100644
---- a/resources/feResource.cc
-+++ b/resources/feResource.cc
-@@ -78,7 +78,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
-   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
-   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%D/info/singular.info", (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 *)""},
diff --git a/sci-mathematics/singular/singular-4.2.0_p1.ebuild b/sci-mathematics/singular/singular-4.2.0_p1.ebuild
deleted file mode 100644
index 6dd751e0a4ff..000000000000
--- a/sci-mathematics/singular/singular-4.2.0_p1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/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.0.3-gfan_linking.patch"
-	"${FILESDIR}/${PN}-4.1.3-doc_install.patch"
-	"${FILESDIR}/${PN}-4.2.0-no-static.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-gmp \
-		--with-ntl="${EPREFIX}"/usr \
-		--with-flint \
-		--enable-gfanlib \
-		--disable-debug \
-		--disable-doc \
-		--enable-factory \
-		--enable-libfac \
-		--enable-IntegerProgramming \
-		--disable-polymake \
-		$(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.1_p1.ebuild b/sci-mathematics/singular/singular-4.3.1_p1.ebuild
index 6adf2820277d..580a93422a2e 100644
--- a/sci-mathematics/singular/singular-4.3.1_p1.ebuild
+++ b/sci-mathematics/singular/singular-4.3.1_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv x86 ~x86-linux"
 IUSE="emacs examples polymake +readline static-libs"
 
 RDEPEND="
diff --git a/sci-mathematics/singular/singular-4.3.1_p2.ebuild b/sci-mathematics/singular/singular-4.3.1_p2.ebuild
index fb5b4a7f3ed2..810f2e71b223 100644
--- a/sci-mathematics/singular/singular-4.3.1_p2.ebuild
+++ b/sci-mathematics/singular/singular-4.3.1_p2.ebuild
@@ -13,7 +13,7 @@ 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"
+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}"
 
 LICENSE="BSD GPL-2 GPL-3"