gentoo resync : 24.07.2021

7 files changed, 126 insertions, 7 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 9171dd5e88e5..d551b19bf890 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index c4c37fd617df..a957a05f9445 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -19,5 +19,5 @@ DIST maxima-5.45.1.tar.gz 39951932 BLAKE2B b6d67aebf34c12567ec5d08581dc22d13a902
 EBUILD maxima-5.42.1-r1.ebuild 4915 BLAKE2B 6a1e69a325f186ca1c75c5ea04083778a147a58bcc8f5a92a9d2e9a8a4df3a9008864772afe7ca1e55e2e28361ba5ab3398627e217e03073f1d77c8334ba27dc SHA512 f749d004d177e75cba694729bdca07b361a0cd8280d4146faf525b076a2f6042ca0027626076c0d2184b0a48cc7f03000e44bd69ec1c7bb53caf424d8ed3e25e
 EBUILD maxima-5.44.0-r10.ebuild 6372 BLAKE2B e3297b624215d728f9e2496548dd7f8120a580769a4d9a4900732b81410f6e10df28b132bb89272668ad29fbab8c95507ea9c7d0854894bff23ce3e82597ba0f SHA512 1f8d36eb61225a4a76250808964a6a6352a642c031ee129680a4f5cc6b418515c34c5c275478a4b46fcc41caffa3cc80d3111205b530b2384b313b46b481ea1b
 EBUILD maxima-5.44.0-r9.ebuild 6298 BLAKE2B 8db82bbae80fd131141e5d5b8a700972865ae187b6b72956f14d48733ed91d54527e8784da044d63ee6c48f0c0604124dbe08aad856fbfd81bb61546aabb21d5 SHA512 f166a500b8bfc04de71d0851fe25fe8e9e48e5fe274d38099d5b9277c839ecb2fa4e6ec11c6b854921691b782a1c47b03001b0ac3723d6b9e42710bafc8cac78
-EBUILD maxima-5.45.1-r1.ebuild 6368 BLAKE2B 642dbc6ec8648978b235fa7302e880935b6fbc58bc966337d6ea0684f28db567410783d19496b212cb0636ded2734b22c228da40d879c9d38f4013d10853d304 SHA512 2efd0c2a23b155cb1c18bdf36c46a8bfe2cc12ea8541b8de02d992e0a4132225c94f502625a7418d599b80b3aa70317087a6bddc02998628f19e01d85c2e106c
+EBUILD maxima-5.45.1-r2.ebuild 6374 BLAKE2B bae227125971213b20fc68eb0e6e6e1b653e07969169edc6c0157b0567e4fa64d5c9dc8233e0b03bcc0d41a19757da740bfe6a87742b5d9be0ae18a6ce53f42d SHA512 7729217e3978f9d05bbfcef32127c8f43a820ad176195032c8a6d8fe26e95e69ff0369d1c0e5fb92925ce35c7c73adc531dc7f0175fddbfb5798d79932f56d43
 MISC metadata.xml 1733 BLAKE2B 30e06c199d4c4919ea90aa5a0b3091b124b4b43fc7791d758afdb0d94069edfafe386ddd7ddbeb9aa2589a5ec3866ecabd9d71c1b41380db6212529ad376c846 SHA512 2a9ccad0ef037a65f7dae3ac3769ab0bdf54ac8789387d3bcab0e022f9dfb77b019d14dc03bd7777937076e822c837511c12fd8198e7b9bd7eb6e621e46c0be4
diff --git a/sci-mathematics/maxima/maxima-5.45.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.45.1-r2.ebuild
index 43eddc8c8b58..532a39609b73 100644
--- a/sci-mathematics/maxima/maxima-5.45.1-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.45.1-r2.ebuild
@@ -25,13 +25,13 @@ for lang in ${LANGS}; do
 done
 
 LISP_DEPEND="
-	clisp? ( dev-lisp/clisp )
+	clisp? ( dev-lisp/clisp:= )
 	clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
 	clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
 	cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
-	ecls? ( dev-lisp/ecls app-misc/rlwrap )
+	ecls? ( dev-lisp/ecls:= app-misc/rlwrap )
 	gcl? ( dev-lisp/gcl[ansi,readline] )
-	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
+	sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap )
 "
 
 # Python is used in e.g. doc/info/build_html.sh to build the docs.
diff --git a/sci-mathematics/relational/Manifest b/sci-mathematics/relational/Manifest
index 97cf2eb58bec..78313af3cf1f 100644
--- a/sci-mathematics/relational/Manifest
+++ b/sci-mathematics/relational/Manifest
@@ -1,4 +1,4 @@
 AUX relational-2.5-no-qtwebkit.patch 3307 BLAKE2B d0a1c4aa6261e5f52017b73e6d3ab8d689d328cca2ce9af1af3ee916edd52f99a6f5782b5a5abc723589d8b11ab04c088e0d80a89306a105da55eb59941d6c78 SHA512 9ac91976ec18b87647767f6cff525fa32c0e35749a04ed9d280016ee3b0346f12fd341b22e36a8fa97650058c12b858dbbcdd0c3c1964f554342bc8ef6d059c2
 DIST relational_2.5.orig.tar.gz 118776 BLAKE2B bec1a8c1a3c7973b9200f9a61e65aa144998558a9798e1e869d970ba15d2f7970be8dad865cfa779f05ee535638011851534a3be0c354d216eb35f38f135cb4d SHA512 588e35a57cf915e544d62749b76ed81927ac06fd88271f0d4d88ee5f221928c2c24e2a88165aae63c1b9b120ddaa20e15e21fe9c207eac3150b744274ae45a8a
-EBUILD relational-2.5-r2.ebuild 953 BLAKE2B 6bba4f6861a12843ee41eb2a7ddabb8bb8c1fdaa3c1636808f74c45f7b2ee8c0538ed4d3efbe5ec1ee2b292f9d47866eb058c9eef9491ee22abfc6c4b55507c6 SHA512 cfcf392622291188fb233c27c3c67b491b201f565e9b160ad4871bfdbcac4514e4e18d5e69f0db6bc604e913ed77ac931a7c749115634e4dcba1d3efd3a7a1d3
+EBUILD relational-2.5-r2.ebuild 945 BLAKE2B a54bb173d1128b3b7713e758ed0a86747a36099933745f75e97e10798266ab46225fba2810aec5bc8c5d40d4ad761778ccc73c4631491ab0d5188bb2993105a0 SHA512 dee6609f9a47111e431234f760356bfe6d62e2dcbd3a9bb7ec2d85f3c3f485cbd46349bf5bc73bb31f241a105782aebfdb46c75a553643b84dc7cc015e7eb3a5
 MISC metadata.xml 329 BLAKE2B af279e80c33a9c850fdf197cda6d3d649deccd92a4360f6524194ac549c3c02b46975067c8f5ee2dc45dc6f5e6ece260cdf8664ef9c916bdb3871b1020c685ec SHA512 27c79174fb317ea692be0a1f32fe608dc0947351875e0f0ec0acaaaa613dbac8929188522d41682f591da663a3ab934e5d362b71d9aad763248a6076f2057419
diff --git a/sci-mathematics/relational/relational-2.5-r2.ebuild b/sci-mathematics/relational/relational-2.5-r2.ebuild
index 708b76f72de9..41251c5f5f99 100644
--- a/sci-mathematics/relational/relational-2.5-r2.ebuild
+++ b/sci-mathematics/relational/relational-2.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit python-single-r1
 
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}"
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 09e146dc18c6..836101987736 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -6,6 +6,8 @@ AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511f
 AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
+DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766 SHA512 48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
 EBUILD singular-4.2.0_p1.ebuild 2258 BLAKE2B d74e8ad0c98142364ff097e5e2d8585d01ba863021178d9c5206507c2318e71c0484bf620d77bae4927722395ef9b785d6e00be0d7d7bbd91086d71a2f54e143 SHA512 a9339d04e4beb91f440caede447bd565bf1576cab72b93e44ae39ce9be6ef26e294713b39526baa8c5ff68c867cbcddb9e87c42f19c27ca6e82786e4a5b2bf12
 EBUILD singular-4.2.0_p3-r1.ebuild 2428 BLAKE2B af72aae39de23df410fe1d6dfe475c3179f6355fffe1775d4d408bec6fe80aa37022e6a9838a45014488666b56cfaa627f1fc1d007d360fbbe6987f4b3ead197 SHA512 0921b4991019b449054fb7c7c60a9bd39ec6434a19321b79f63470f2e15889945f24bc15f48e12ba16a24ff23c368a73b0b062d0150104d39aa715511766bc55
+EBUILD singular-4.2.1.ebuild 2564 BLAKE2B 8f849b934c52c6e367d70953e0f38c0043a3b0f35075858f3a19d0533e443c9fadab50ccad40d6b3ab8e8812b8b3cb2fe0b36ec9751f11e945ac2728cfc74640 SHA512 69979a38eb3e7c5b590c891595f91465cb3a2140825e0600626390aaa0f6e0a55f4a55a717938bf1923b3a8cb35df361c14a2c944101fba55274ef6cab3d6e45
 MISC metadata.xml 275 BLAKE2B aaeef273b6352edaadf69ef76545573fbe0d22a6062f9567bcb34b1fdea4e2fb140b9aa0b4d8f44a3c3e31108f34eb555dded6f5808fac84fd29a83ef184da88 SHA512 e7e449f8bf039a1fc4707c0b12706d27b237fb3e7bee5e457bc79e032a04d7b9eb2901059b007350cc3617689638b76f97fbbd672e2d0101e2071448642415a7
diff --git a/sci-mathematics/singular/singular-4.2.1.ebuild b/sci-mathematics/singular/singular-4.2.1.ebuild
new file mode 100644
index 000000000000..0f3497acf49d
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.2.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic
+
+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.2.0-doc_install-v2.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Needed to avoid segfaults in the test suite until
+	#
+	#   https://github.com/Singular/Singular/issues/1105
+	#
+	# makes its way into a release.
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	econf \
+		--with-gmp \
+		--with-ntl \
+		--with-flint \
+		--enable-gfanlib \
+		--disable-debug \
+		--disable-doc \
+		--enable-factory \
+		--enable-libfac \
+		--disable-polymake \
+		--with-libparse \
+		--disable-optimizationflags \
+		--without-python \
+		--without-pythonmodule \
+		--disable-python \
+		--disable-python-module \
+		--disable-python_module \
+		--disable-pyobject-module \
+		$(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
+}