gentoo resync : 20.03.2022

4 files changed, 5 insertions, 131 deletions

diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 259d431ff9fa..6deb3b7a23dd 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -11,7 +11,6 @@ DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d
 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168
 EBUILD singular-4.2.0_p1.ebuild 2259 BLAKE2B 2237245fe2550f398a20a14ae599bcc668288aa6312925cee725e2571dc53f8f62f88bdff0cdf8cd303c72baaf2861a2c560ce54978da720e93cbe459769b7d1 SHA512 2a6b8e478f32ff9e3df96e0188cd137b16d9be1a8c18c9f5367a81b96dc8b0cc01d34771246001eee9e8ec9832f8832539e921879ec56fe8a51ebb42c0d29389
 EBUILD singular-4.2.0_p3-r1.ebuild 2428 BLAKE2B af72aae39de23df410fe1d6dfe475c3179f6355fffe1775d4d408bec6fe80aa37022e6a9838a45014488666b56cfaa627f1fc1d007d360fbbe6987f4b3ead197 SHA512 0921b4991019b449054fb7c7c60a9bd39ec6434a19321b79f63470f2e15889945f24bc15f48e12ba16a24ff23c368a73b0b062d0150104d39aa715511766bc55
-EBUILD singular-4.2.1-r1.ebuild 2679 BLAKE2B 8e24286895a237762fc61ed6cfa7ec723ba9d06f25eb6ef8d228747f7658c487c6c29dc9c6fe93c4864d3e9ceaf61d3edbc023c326f83556095f6e62082220ba SHA512 dcc37fe96e0c3a50661c81eeb9ff7fc31aa5dba023712c5c922cdf3529410b854039a9644ffa7bfe4b9d7951b797a60ce7faa9477bfb0e8743f8f8edaab2c448
 EBUILD singular-4.2.1.ebuild 2571 BLAKE2B 7ccf61735ce3bfd5472b646dceb77239430d44bff9816ea2c1a5cd1cd4807c0138ec2396a193c98b7c3b456a36ee72c6351ff95f949f3afa318b5955a14a014b SHA512 1aad8be5aee15235c8f4a865ec8e3e19c3cac61ae6c8db39e7a7f614119fa2dfc1869a7ce9cc6fb896a5ffb455c65e90b2fc91cf98d5b0a3e193941deadc807c
-EBUILD singular-4.2.1_p3.ebuild 2684 BLAKE2B 8d47db8a86f331a0fa6a907254338f05d807137a014b6be5578b9cf8152d51e1b1d2c9981b158e68d07b5ce8156dbfad2641dbd0fde237e78aaad4bd47ab7d4c SHA512 21d6e8c8c9a7467bbad0f6ea70696cc5b6c1eb25bd28a5362ade8e0e7926b13d02f4851e585fd98786066ba4dad475c688462e5607f8631b2fa7400a5ce121ec
-MISC metadata.xml 580 BLAKE2B 25a2f7adf99e9469811f49d1493b274298d2219874aca83e0569a8ca079514659338543a2dd002d5038b2c9b3cdae44772021e2bc1b0340c6237974744ade4a5 SHA512 385646f40f3a741faae6db06eacff9837608cd5860bbeadbbdfd7e0ff847f0a214a5b8373ea549f6463e0e29931b018af36c86394aa894dba10d1e691ada3902
+EBUILD singular-4.2.1_p3-r1.ebuild 2628 BLAKE2B 5ff968e3c06d722d2f1c0c872ea4c541e9e5e90bda4e8af8e54ba38aba21464ed8f7cfea727883de0ed34831f12c780ed45dd2a038856a19d142200d0073688e SHA512 8d0e74684f138c08288ac642ad0450a364c5b0deb6f805680289408d54fee563cadd32a81297a48e8148679b537903190e8abba069a60e38e06cb8bc10b6ee75
+MISC metadata.xml 510 BLAKE2B 54fa3549c356ab3cb45b859dda337a25959bee37acf1210704b79de849e5b9861b9f0d85639d11db461995074ca00c91fb0dce8459231ef42f76257c8f0a6e51 SHA512 d2f4ec93fe340097a9a09845fffcd4a385434fb267350bb8dce9eae9248487b87cb3b68e0e1e05a1c78ad956a48548f47663a2f4db84af0d68ade02327df1268
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index 5d46057110ae..0477525e4c04 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -6,7 +6,6 @@
     <name>Gentoo Mathematics Project</name>
   </maintainer>
   <use>
-    <flag name="julia">Enables interface for Singular to julia</flag>
     <flag name="polymake">Enable the interface to TOPCOM</flag>
   </use>
   <upstream>
diff --git a/sci-mathematics/singular/singular-4.2.1-r1.ebuild b/sci-mathematics/singular/singular-4.2.1-r1.ebuild
deleted file mode 100644
index 96abef3a90a3..000000000000
--- a/sci-mathematics/singular/singular-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/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 ~x86 ~x86-linux"
-IUSE="emacs examples julia polymake +readline static-libs"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/gmp:0
-	dev-libs/ntl:=
-	sci-libs/cddlib
-	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
-
-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)
-
-	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() {
-	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.2.1_p3.ebuild b/sci-mathematics/singular/singular-4.2.1_p3-r1.ebuild
index d08d33360a78..640dfeb3b453 100644
--- a/sci-mathematics/singular/singular-4.2.1_p3.ebuild
+++ b/sci-mathematics/singular/singular-4.2.1_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,8 +18,8 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
-IUSE="emacs examples julia polymake +readline static-libs"
+KEYWORDS="amd64 ~ppc ~riscv ~x86 ~x86-linux"
+IUSE="emacs examples polymake +readline static-libs"
 
 RDEPEND="
 	dev-lang/perl
@@ -28,7 +28,6 @@ RDEPEND="
 	sci-libs/cddlib
 	sci-mathematics/flint
 	emacs? ( >=app-editors/emacs-23.1:* )
-	julia? ( dev-lang/julia )
 	polymake? ( sci-mathematics/polymake )
 	readline? ( sys-libs/readline )
 "
@@ -72,7 +71,6 @@ src_configure() {
 		--without-python
 		--without-pythonmodule
 		$(use_enable emacs)
-		$(use_enable julia)
 		$(use_enable polymake polymake-module)
 		$(use_enable static-libs static)
 		$(use_with readline)