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

[Michael Orlitzky]

commit:     304205feeea7c3f40ee2103d96b98ee97e20615e
Author:     François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Sat Dec 18 09:38:32 2021 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 19:06:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304205fe

sci-mathematics/singular: move to 4.2.1p3 - sync with 4.2.1-r1 options

Closes: https://github.com/gentoo/gentoo/pull/23281
Closes: https://bugs.gentoo.org/829029
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-mathematics/singular/Manifest                  |  2 +-
 ...ar-4.2.1_p2.ebuild => singular-4.2.1_p3.ebuild} | 69 ++++++++++++----------
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 7d1224ad896e..a9dfa6eea61d 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,4 +1,4 @@
 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
-DIST singular-4.2.1p2.tar.gz 15026730 BLAKE2B 91d13a367fe9e182aba865debb2cf8a14735ed26b5ce573061172b1fcf1e188c6ebc76794e0219fd2b2ef39c10117def047630737583ebed987a152d7fc1fb2a SHA512 b031f8a1f65739617e052a30ec8d2f809d3961c3cff606651570b0e47c0b8814322883bfa5d5fdda8a1263c527de39287b1666ef7a548369febad46676a7f04e
+DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168

diff --git a/sci-mathematics/singular/singular-4.2.1_p2.ebuild b/sci-mathematics/singular/singular-4.2.1_p3.ebuild
similarity index 72%
rename from sci-mathematics/singular/singular-4.2.1_p2.ebuild
rename to sci-mathematics/singular/singular-4.2.1_p3.ebuild
index 565d313d91cd..451f17e9f05a 100644
--- a/sci-mathematics/singular/singular-4.2.1_p2.ebuild
+++ b/sci-mathematics/singular/singular-4.2.1_p3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic
 
@@ -12,28 +12,30 @@ 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"
+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"
+S="${WORKDIR}/${PN}-${MY_DIR2}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
-IUSE="emacs examples +readline static-libs"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="emacs examples julia polymake +readline static-libs"
 
-RDEPEND="dev-libs/gmp:0
+RDEPEND="
+	dev-lang/perl
+	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 )"
-
+	sci-mathematics/flint
+	emacs? ( >=app-editors/emacs-23.1:* )
+	julia? ( dev-lang/julia )
+	polymake? ( sci-mathematics/polymake )
+	readline? ( sys-libs/readline )
+"
 DEPEND="${RDEPEND}"
 
 SITEFILE=60${PN}-gentoo.el
 
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.1-htmldoc.patch"
 )
@@ -52,27 +54,30 @@ src_configure() {
 	# 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) \
+	local myconf=(
+		--disable-debug
+		--disable-doc
+		--disable-optimizationflags
+		--disable-pyobject-module
+		--disable-python
+		--disable-python-module
+		--disable-python_module
+		--enable-factory
+		--enable-gfanlib
+		--enable-libfac
+		--with-flint
+		--with-gmp
+		--with-libparse
+		--with-ntl
+		--without-python
+		--without-pythonmodule
+		$(use_enable emacs)
+		$(use_enable julia)
+		$(use_enable polymake polymake-module)
+		$(use_enable static-libs static)
 		$(use_with readline)
+	)
+	econf "${myconf[@]}"
 }
 
 src_compile() {