gentoo auto-resync : 12:10:2023 - 12:14:42

4 files changed, 4 insertions, 137 deletions

diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index 6e97bc6258b1..6c85df3989f6 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,6 +1,3 @@
-AUX fricas-sbcl-2.3.2.patch 656 BLAKE2B 2b4e2ade98651f221461991464d70eb0e0ec3d534c0f9e0b98f790506acf94a2cc7eae9d8b20ab704c1dba156301b2703b9a5d1b78296f4f1eafa9d2cda091ea SHA512 e5134750092b4efd517311b1734d39cd4c2617e390d5228df7e393a2b95b1ccbd68119d5fb3e9322ddc6a346d5741ac41db8912306ea8b97960482fdb04c2c23
-DIST fricas-1.3.8-full.tar.bz2 10878913 BLAKE2B 214eecd430a2b758a10d985f512f3c79f6b12de35bc29e8f0a3fd296fe871b2e9a6b362060cbeec317dc355bd3c661fcab44087feeaa092fe6afcdebd0fb94a8 SHA512 330554f9dc36b47451195e3dee88fe26a80ab2bf9b6750d651cd53c5ba16b9c9736176936c7c69e699685be25aa62b6a099ed7340913e946a4f5e53579835dbb
 DIST fricas-1.3.9-full.tar.bz2 10949173 BLAKE2B c535d2a384fa55db53b6901d3ba5d1cc8eca35ccf67a2664f934da427a808b5adc7a5522b935f5dcff89795c0ca5816818d9cf37399b6f9bdc63cfe4d622a7c3 SHA512 9cfcb8bad52550a46216509154d5c06dac23625bc14d504a1febbea7ff771fd3172f91c2824df51375b8d85adc19959a5cbbfa2b77a0095ca37e8a4d4b8cc405
-EBUILD fricas-1.3.8-r1.ebuild 2462 BLAKE2B a94415e5062d3c76c774c77bedfd64740481a58503451561faf46b02a8464613ac8b2cb3676fc8a775f7eee985c30826d1c96ddb772fa4572509e59e6afcbc2f SHA512 f93fb3011319789db931c343ae319a7fc2ee1db4d9700c30743ed8e2195bbc4527c0755e53f98b25359c533263b32b2a03e74fe0f7580f99d1f9fa0b32a8ae9f
-EBUILD fricas-1.3.9.ebuild 2420 BLAKE2B b9c25cbc1c8fa1c8a14d8994b5e3db462d0c58747c3e33b2456a531c72c833e5c440af8bc6265b0d595cddb98d8859992d2c06d893864268d86fa31e78bc2290 SHA512 732c6fb3544f39a37d60be7ac7e71536b1d416babc53addd99a88b52f6aa699fb5a9185bbd0fd8ee76cf2daf0792808d43d9e9eab06daef2bd682e33e54ed79c
+EBUILD fricas-1.3.9-r1.ebuild 2474 BLAKE2B e6f86a8f209b3fefb4dd94ca0b89cf67f3d8fdeaccd52b0606f3c86747ed3f4d21310e77f7f177b93575876fdc7ca0d17fa3068789b8e90cb20f81c42cb4f06a SHA512 48f2e2acccf8808ba776468a7c64c1f1f18518ee53bd3d59e5e8d49fcc41071938319883c0b6b1dec44134fbae81e1379c8d5bc997955313790edb044cac7938
 MISC metadata.xml 1115 BLAKE2B dc1fcf98b2fb9df013ab256c4f81952ac5808f2761ae66479106482260b5328d337755fcb5208fa67ff7448c368d5db32a0c6c12537eaaa64d22a16cf32962ee SHA512 686316e67d08d27e48be2e544657c27ca20b8303b097b2154d18a2873ce39fe27c33be61a1922a3e61f89fadc9f4f6d204c9f591e670bcbf46ff2c71200f6660
diff --git a/sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch b/sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch
deleted file mode 100644
index f5dd949abaa2..000000000000
--- a/sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/lisp/fricas-package.lisp b/src/lisp/fricas-package.lisp
-index c0dfc4ef5..37e1afc1e 100644
---- a/src/lisp/fricas-package.lisp
-+++ b/src/lisp/fricas-package.lisp
-@@ -34,7 +34,12 @@
- #+gcl
- (shadow "QUIT")
- 
--(do-symbols (x "FRICAS-LISP") (export (list x)))
-+;;; We use uninterned symbols because at this point we do not
-+;;; want to add symbols to FRICAS-LISP
-+(let ((#1=#:ls nil))
-+    (do-symbols (#2=#:el "FRICAS-LISP") (setf #1# (cons #2# #1#)))
-+    (mapcar (lambda (#3=#:x) (export (list #3#))) #1#)
-+)
- 
- (export '(quit chdir |getEnv| |getCLArgs| |load_quietly| get-current-directory
-           trim-directory-name pad-directory-name
diff --git a/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild b/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild
deleted file mode 100644
index de065478169c..000000000000
--- a/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit elisp-common
-
-DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
-HOMEPAGE="http://fricas.sourceforge.net/
-	https://github.com/fricas/fricas
-	https://fricas.github.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl gcl ecl clisp clozurecl )
-# Version restrictions, . means no restrictions
-REST=(  .    .     .   .   .     . )
-# command name: . means just ${LISP}
-COMS=(  .    lisp  .   .   .     ccl )
-
-IUSE="${LISPS[*]} X emacs gmp"
-RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gmp? ( dev-libs/gmp:= )"
-
-# Generating lisp deps
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	LISP=${LISPS[$n]}
-	if [ "${REST[$n]}" = "." ]; then
-		DEP="dev-lisp/${LISP}"
-	else
-		DEP="${REST[$n]}"
-	fi
-	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
-done
-if [ "${REST[0]}" = "." ]; then
-	DEP="dev-lisp/${LISPS[0]}"
-else
-	DEP="${REST[0]}"
-fi
-RDEPEND="${RDEPEND} ${DEP}:="
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	RDEPEND="${RDEPEND} )"
-done
-
-DEPEND="${RDEPEND}"
-
-# necessary for clisp and gcl
-RESTRICT="strip"
-
-PATCHES=( "${FILESDIR}"/${PN}-sbcl-2.3.2.patch )
-
-src_configure() {
-	local LISP n GMP
-	LISP=sbcl
-	n=${#LISPS[*]}
-	for ((n--; n > 0; n--)); do
-		if use ${LISPS[$n]}; then
-			LISP=${COMS[$n]}
-			if [ "${LISP}" = "." ]; then
-				LISP=${LISPS[$n]}
-			fi
-		fi
-	done
-	einfo "Using lisp: ${LISP}"
-
-	# bug #650788
-	if [[ ${LISP} = sbcl || ${LISP} = ccl ]]
-	then GMP=$(use_with gmp)
-	else GMP=''
-	fi
-
-	# aldor is not yet in portage
-	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP}
-}
-
-src_compile() {
-	# bug #300132
-	emake -j1
-}
-
-src_test() {
-	emake -j1 all-input
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc README.rst FAQ
-
-	if use emacs; then
-		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
-			-i "${D}"/usr/bin/efricas \
-			|| die "sed efricas failed"
-		elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el
-		elisp-make-site-file 64${PN}-gentoo.el
-	else
-		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
-	fi
-	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/fricas/fricas-1.3.9.ebuild b/sci-mathematics/fricas/fricas-1.3.9-r1.ebuild
index f64df558213a..0cb3f278366a 100644
--- a/sci-mathematics/fricas/fricas-1.3.9.ebuild
+++ b/sci-mathematics/fricas/fricas-1.3.9-r1.ebuild
@@ -15,11 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl gcl ecl clisp clozurecl )
+LISPS=( sbcl                   cmucl gcl ecl clisp clozurecl )
 # Version restrictions, . means no restrictions
-REST=(  .    .     .   .   .     . )
+REST=(  '<dev-lisp/sbcl-2.3.9' .     .   .   .     . )
 # command name: . means just ${LISP}
-COMS=(  .    lisp  .   .   .     ccl )
+COMS=(  .                      lisp  .   .   .     ccl )
 
 IUSE="${LISPS[*]} X emacs gmp"
 RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )