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

15 files changed, 8 insertions, 507 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index be709b351b16..8d04f350f0e7 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index 7b4c491ef072..685131a728b3 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,9 +1,6 @@
 AUX giac-1.6.0-pari-2.11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b05151b126cf74a5bccf5036e1fd3aa97f12fd91808fab7fe23a3194e6a4a7a9f12be5b69a5dfda5aedec8a0117c SHA512 56102439f05f0e27bda49f1e9803bbba7921c87eab383fc2f068ccca6ef598f11e35d00f5a737076a6a41df08ef9065e567cb84030ba6ea928520f371d51b9ed
 AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88ecbc71dc450ef714f6da323128d9c945ada9d658c73647987f84638498aa4d3bbef49062424ab63b53c76defc127902 SHA512 14bfcb04e5a23933cfa4635789bf02f6d6e6a528c167504678b3d2ecb38f135d0c05583712005fe53afd7696cc9ebee5dc3ab90cac056d75bd43be786075b011
-AUX giac-1.7.0.13-xcas-desktop.patch 890 BLAKE2B 31e33a52fdcb70c610edf21f046d112df3702e1d4f635cd4956bbe17d928839c9a0a87cb5ba5d6aeff94213b482ce22bd497d1d258aaa8abd6d8fc0116031f15 SHA512 269c733edc899051fc3de23021c322a3099499dfeb559ab1cada0964258a91a9735e620b480560226e5a3b492f2f5654062ee9c2c5479ae9789b012e7a5055ca
 AUX giac-1.9.0.21-pari-2.15.patch 298 BLAKE2B 99329cfd473ec3b580caf8f9700501e8b5dca9143cd04d883729880109d4e1962d19dce19aaf51e5d26ab09dc399a45a3a052847837f53a60c1b21087ebeabb8 SHA512 f9335dd47ee43ca10b784c8302422efcd5a835b1fe13fa134f5d36e453327e96624e77e086710f9d556352b1d62e6e693b3308fe8af329492e11d68cc9451b5b
-DIST giac_1.7.0-13.tar.gz 86447065 BLAKE2B 4d91e83608f7ec376d133c2784ffce99447a9dd78b5c8582b81a0aae0b8ac59eec4db3ee4a8bcb39202c777c300178a181f2dc2ac74ab445ddba2f3efa0ecb1b SHA512 99fff7ce5117fd8c106601ead03679805d529fe12d5372cdd4ae54824aa6fdcbdaaa1a62ea1153391a1a65af8970e38fca7d95ca9983755ff06053f1d8b6d65a
 DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
-EBUILD giac-1.7.0.13-r1.ebuild 4266 BLAKE2B 642482f7e1dc0230d0e6255cfbfa22a5a5e5d3e64d978621db449fa7bc4706c53336d7cf40a4d1b9a6e5a75efa130d805d327a0e064cefc09696676445a00e7c SHA512 4b5a6b891131090c9c991697b9a6f123073bb1163da02eaae29d213f7b76bc271bd300ec382a35e262a934e6d0f6815c71fddee14772de80e55fc88a423961c8
-EBUILD giac-1.9.0.29-r1.ebuild 4543 BLAKE2B 7c226e159912c54129f6720a41fa0cf15c57dc1ffbc16404217d5a44b11a52965f5595146a8e02f7245a753cd6f42272b5d5f6caa15d671e82c39a8f50f6b587 SHA512 33b74fef82b7c221cfc79dfb5026bd4420832096d53cf67d461b23b563da90d091c025871f02863f2a32710018d7138a3fb397e8849c692a17ab272949b28db9
+EBUILD giac-1.9.0.29-r1.ebuild 4542 BLAKE2B dce03818ac9af080b4416b6546563e4be99617b220c4661a540f77e0127760582cfe0a3df8c6a2f94da676b8a0e9fa967be59748184b86eb8934481c607d7500 SHA512 6915110b6964d2e79d7da01cee85ee3b51b944f9879e5659447f0cba5d74bda8c4113ee9290203510fdb57ad1ba60eae52639b134ed74eec01b04a97d75cf066
 MISC metadata.xml 1315 BLAKE2B a461d359b33617422f5863466bdbec9ddf56db03467b992c887bce9967d434913489602fd684edc893303078f89cf94d01b44cfdc0ccff33db9b42c5e686cfa8 SHA512 eaeb480010c9dbdfd75516e45e97e3226d2b2812c44e217b318c5a1d86dc40820bac0de69686d7b502775b14a6f1ed3bc11d2372b891c46a37080b4e84da9a1c
diff --git a/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch b/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch
deleted file mode 100644
index bc542b0a615c..000000000000
--- a/sci-mathematics/giac/files/giac-1.7.0.13-xcas-desktop.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 51fa4502039ec09d4a9e1d6b2fa73e5a1f789f94 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 15 Jun 2021 08:31:06 -0400
-Subject: [PATCH 1/1] xcas.desktop: fix "Version" field.
-
-The "Version" field in a desktop file refers to the version of the
-specification, not the version of the software it launches:
-
-  https://specifications.freedesktop.org/desktop-entry-spec
-
-This issue has already been fixed upstream:
-
-  https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2716
-
-and will be part of the next release.
----
- xcas.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xcas.desktop b/xcas.desktop
-index 9e1b648..fad99cd 100644
---- a/xcas.desktop
-+++ b/xcas.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=1.7
-+Version=1.0
- Keywords=computer algebra system;CAS;
- Keywords[fr]=calcul formel;CAS;
- Name=Xcas
--- 
-2.31.1
-
diff --git a/sci-mathematics/giac/giac-1.7.0.13-r1.ebuild b/sci-mathematics/giac/giac-1.7.0.13-r1.ebuild
deleted file mode 100644
index 301046562c6f..000000000000
--- a/sci-mathematics/giac/giac-1.7.0.13-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	app-alternatives/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
-	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
-	"${FILESDIR}/${PN}-1.7.0.13-xcas-desktop.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
-	econf \
-		--enable-gmpxx \
-		--disable-samplerate \
-		--disable-micropy \
-		--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/giac/giac-1.9.0.29-r1.ebuild b/sci-mathematics/giac/giac-1.9.0.29-r1.ebuild
index 5c24d8828a7a..f4967f08420e 100644
--- a/sci-mathematics/giac/giac-1.9.0.29-r1.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.29-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/s
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LANGS="el en es pt"
 IUSE="ao doc +ecm examples gc +glpk gui test"
 for X in ${LANGS} ; do
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 02b92c8a6844..e6eeac049db6 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,6 +1,6 @@
 AUX polymake-4.6-perl-5.36.patch 659 BLAKE2B 4013b45b4edc79654fcfe77ffa17530ddaca8513eaf76fc338dae7fbcd1cf83f07f7b5ccaf2117051ae3f9fc951caa676b36fa06413988c271e0a5f01da28233 SHA512 0bf9f512c6b7439bf1660560d25a502f1fa16b7f0136f04f1c1c8812c1b1c5ab0ab5133e149777243985ca37e159d8a3de355b443441126328565063faa2ba8e
 DIST polymake-4.6-minimal.tar.bz2 5634651 BLAKE2B 6ee24fa6e70fdf746ea298d78e21e17fe38c5837ae2d3153e53656b4b003555b06897f463220b59474eed1111135dfa61c080d08d6363391afca51011f331122 SHA512 90f04c67bf297fb1b9f5a51d1654ff12385860b1fc80278a8b47f65970f11a1e0f33ede8a839b54a12422e772c8b76302ff78cc467712a2486f6e76ce0d5ab20
 DIST polymake-4.8-minimal.tar.bz2 7283871 BLAKE2B 0f54282e0b07e357a6e746cb4c4b579c65a6eb6b942c541047a0213529191404a36666ac38279351ffef944fddb2cd299fcbe7ac6d9873368fb00ec221bc81e5 SHA512 d3ce7426fa78194254271274849aadb1b7f1afe176c16f79da7e5569ec30004e20a46d3c3a09d45ecb3210d73c850427920ca8a36f93c7f7d9420827fe2a3a00
-EBUILD polymake-4.6-r1.ebuild 4118 BLAKE2B 14869c72b1aaa1c91534c24aba3d67136bb0794216af88dc22205c5699054f50d8592a114fccdf13adc48ddb7c3d0d631bee2d95bbf24b03d92c2ddff8d48539 SHA512 c33fa14a0e6220e8493df1b29dc15679dcc569a0870b253db09da95b1a74e04f9a2736384c0f82a62b67b8ac76cb8618e5b7c8774401db6a0663005daf534238
+EBUILD polymake-4.6-r1.ebuild 4117 BLAKE2B 082513548c437c62044209bb1f75bce4131cd4202e7c49aec776e35d8cbd83fba477c43958d96baecf7d3d2b8a94e2cf1b45ba9aa08e0250153a4ba932c80fbd SHA512 b4639b6d3fbf9d265956dbc3c62cf3262c64502945ef25fd1a8d85402d279182498970909c1a770eccd1e2bf1e71d17151ba521c720f3fae8452b27744858c36
 EBUILD polymake-4.8.ebuild 4071 BLAKE2B 733089ff39cb4b1504b8e8f6beb9c1af4942352dd60aa552921cc1563c6107f9f19b6bcca08b8145bdbbb23de35fa1092cfbad22b929e59b4572b61553668bff SHA512 feab36a0305e639b1ca4e35baf908bdfc38143f36f7b0aeec4b119711d31a1f6a6fc1171232a346dee3d7e212954272f09523c15fb93bb7af799bec9f1e0baad
 MISC metadata.xml 1762 BLAKE2B 249af503c9e7e99118c87e4cd71c151cc962502972e80c4ba4f66ae3805c9f6c47601ecadef5e6e1b5c67a7e7779155f2524bace8d6f2f4fb260f2f4dce1b257 SHA512 fc887d14710c9529a9738a14ae8f6a41adae80c273354aa5bcd0a14ad695de09ff562e775a5d40582b23e3b6b1fd4e34a277fa9a6ff7131f19ad4f5cc98d6374
diff --git a/sci-mathematics/polymake/polymake-4.6-r1.ebuild b/sci-mathematics/polymake/polymake-4.6-r1.ebuild
index b5f07d56bf84..acc8c5d1207b 100644
--- a/sci-mathematics/polymake/polymake-4.6-r1.ebuild
+++ b/sci-mathematics/polymake/polymake-4.6-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://polymake.org/"
 # closer look at how (or even if) the corresponding code is being used.
 LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular"
 
 REQUIRED_USE="^^ ( bliss nauty )"
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"