gentoo auto-resync : 01:07:2024 - 08:00:50

5 files changed, 39 insertions, 71 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index dcf40203eca5..a472c90ce3b6 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index 705c9cfb3a60..455bbbf9f50e 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,6 +1,6 @@
-AUX fricas-sbcl-2.3.9.patch 2339 BLAKE2B 484f46de176e5148d7a628551f70fe786f62716c30b20ec2db744e554fb06ceda8a9bc89e8ade987a34f9b92856492590497634886d46ab2917bb4b81a1905c1 SHA512 d16dc7bb46006bd50cf12b7758f58d22902a853a20b8febac2d96f151fe841181831f05a12f5fe88eb213ae9d71d8fe560ba078f214a7bfa961f7aa60ff74dcf
+AUX fricas-1.3.11-doc.patch 621 BLAKE2B 1e31762044f274ca1959bf822a57ba86b5dc4b9ceb8e0d78a70e45c57eb82f740fa1faa30c98557e98b099e80fdcbc8808ccf7abb01da25d3c82c7a4547f524a SHA512 d7e7133eaa90fbd8cbcdccacc82e7e1a12e1215f0af91ef1878c1e1b9f91cd340cadedacfa71cde78ee96ffc87c546a0e1a364e801c4adfa706bd997e754449b
 DIST fricas-1.3.10-full.tar.bz2 10971513 BLAKE2B 0ea96cf1076dcd23f53ebdcd3ebf5c6e605915ce332093b83d62a5ed482d32f14833857e270865a4031d7bfc033d961c69007e936260e7d85e632b091d969e0d SHA512 de23c34a1e47b0a4ab2f85e1154e6fa5b0905427718e8c0ad4fe298bf6ebbb1abcc02426e528b7b34d15aebfc2ca1b06f73e39a24ec741d2d5c70f9b48b02665
-DIST fricas-1.3.9-full.tar.bz2 10949173 BLAKE2B c535d2a384fa55db53b6901d3ba5d1cc8eca35ccf67a2664f934da427a808b5adc7a5522b935f5dcff89795c0ca5816818d9cf37399b6f9bdc63cfe4d622a7c3 SHA512 9cfcb8bad52550a46216509154d5c06dac23625bc14d504a1febbea7ff771fd3172f91c2824df51375b8d85adc19959a5cbbfa2b77a0095ca37e8a4d4b8cc405
+DIST fricas-1.3.11-full.tar.bz2 10937641 BLAKE2B 52bb467468de83dfbb8a61717356d74c605efe1174168c35af50d15232c8441457415ca2c88fd19356caec9f9ee29af556104f421dc0479f3ae635144432be7a SHA512 6166661866829764fdf02e84c08f3afd8f631a40c8c5340648640b4fa388641c703021f5006e135ac32e671786b1a75bc290039e929ef322c60a0ba0cb0212ac
 EBUILD fricas-1.3.10.ebuild 1936 BLAKE2B a2f13425f913969b6529574b630ac941569aa855636aad264ae03742bcc10f7d6296e46e09a944036075a6cf71c95eb07e82cec3df90f05d8c9008ae93dcf1ae SHA512 3265cd2127ca54df7118743a34dbe23ee32b8829a68083703ded4404c2aa691d58eaf9617eb8354d2a06fea4b43dba89f9f7268b3e39828ae6d7adf8cb8081f7
-EBUILD fricas-1.3.9-r3.ebuild 2001 BLAKE2B c67aff92ef892cdc51987cd26956ebba59cca9a014c03ebab954b0ff87ee5bf1b784bdf5f477561013cbd9a72dc870e596040404ec815d80adf92517c58c1bce SHA512 565b9b1eff76bf41be4d7689e6cbce2332142d562a7fb7117520cc64a29dfd22b6cc543f5295bf872a80420103bee024824ffb43b776592969b172ab21b2c320
+EBUILD fricas-1.3.11-r2.ebuild 2393 BLAKE2B 5a2e5c7b3e0929efb38c0f7d80cea0ffb83f609e256279a829acb821e7d0e0dd48ef9c67861fdde6a71022d2b5e9a76fe1129bdd36b076e841d5a7e0e8584911 SHA512 ba0fa17760289cbc915f0199f11fa9958ead7e857de45758f1216aed9efe016d35cf2f67b086152320bb166ffb4b504e92ae49150a656b393ca505fe65f637a8
 MISC metadata.xml 1115 BLAKE2B dc1fcf98b2fb9df013ab256c4f81952ac5808f2761ae66479106482260b5328d337755fcb5208fa67ff7448c368d5db32a0c6c12537eaaa64d22a16cf32962ee SHA512 686316e67d08d27e48be2e544657c27ca20b8303b097b2154d18a2873ce39fe27c33be61a1922a3e61f89fadc9f4f6d204c9f591e670bcbf46ff2c71200f6660
diff --git a/sci-mathematics/fricas/files/fricas-1.3.11-doc.patch b/sci-mathematics/fricas/files/fricas-1.3.11-doc.patch
new file mode 100644
index 000000000000..fa38eef84dcc
--- /dev/null
+++ b/sci-mathematics/fricas/files/fricas-1.3.11-doc.patch
@@ -0,0 +1,12 @@
+diff '--color=auto' -r -U3 fricas-1.3.11.orig/src/doc/Makefile.in fricas-1.3.11/src/doc/Makefile.in
+--- fricas-1.3.11.orig/src/doc/Makefile.in	2024-06-30 04:17:46.000000000 +0700
++++ fricas-1.3.11/src/doc/Makefile.in	2024-06-30 22:46:39.519468947 +0700
+@@ -666,7 +666,7 @@
+ tmp/vp-knot3.input: knot3.input ${INPUT_EXTRA_INPUT}
+ 	cp $< $@
+ 
+-${HTEX_VIEWPORTS_STAMP}: tmp/stamp-%: tmp/vp-%.input
++${HTEX_VIEWPORTS_STAMP}: tmp/stamp-%: tmp/vp-%.input ${INPUT_EXTRA_INPUT}
+ 	unset DAASE; FRICAS=${FRICAS}; export FRICAS; \
+ 		echo ")read $<" | FRICAS_INITFILE='' ${XVFB} \
+ 		  ${FRICAS}/bin/fricas -noht -noclef > /dev/null
diff --git a/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch b/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch
deleted file mode 100644
index f3a28ed57457..000000000000
--- a/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/src/lisp/num_gmp.lisp b/src/lisp/num_gmp.lisp
-index b58001e0b..f4a022ad4 100644
---- a/src/lisp/num_gmp.lisp
-+++ b/src/lisp/num_gmp.lisp
-@@ -646,14 +646,27 @@
-     (setf (symbol-function 'orig-isqrt)
-           (symbol-function 'common-lisp:isqrt)))
-
-+(defmacro negate_bignum(x)
-+    (let ((sym2
-+          (find-symbol "NEGATE-BIGNUM-NOT-FULLY-NORMALIZED" "SB-BIGNUM")))
-+        (if sym2
-+            `(,sym2 ,x)
-+            ;;; 'read-from-string' looks silly, but here we want error
-+            ;;;  if NEGATE-BIGNUM is absent from SB-BIGNUM
-+            (let ((sym1 (read-from-string "SB-BIGNUM::NEGATE-BIGNUM")))
-+                 `(,sym1 ,x nil))
-+        )
-+    )
-+)
-+
- (defun gmp-multiply-bignums0 (a b)
-   ;;; (declare (type bignum-type a b))
-   (let* ((a-plusp (sb-bignum::%bignum-0-or-plusp a
-                   (sb-bignum::%bignum-length a)))
-          (b-plusp (sb-bignum::%bignum-0-or-plusp b
-                   (sb-bignum::%bignum-length b)))
--         (a (if a-plusp a (sb-bignum::negate-bignum a)))
--         (b (if b-plusp b (sb-bignum::negate-bignum b)))
-+         (a (if a-plusp a (negate_bignum a)))
-+         (b (if b-plusp b (negate_bignum b)))
-          (len-a (sb-bignum::%bignum-length a))
-          (len-b (sb-bignum::%bignum-length b))
-          (len-res (+ len-a len-b))
-@@ -697,10 +710,10 @@
-   (let* (
-     (nx (if (sb-bignum::%bignum-0-or-plusp x (sb-bignum::%bignum-length x))
-             (sb-bignum::copy-bignum x)
--            (sb-bignum::negate-bignum x nil)))
-+            (negate_bignum x)))
-     (ny (if (sb-bignum::%bignum-0-or-plusp y (sb-bignum::%bignum-length y))
-             (sb-bignum::copy-bignum y)
--            (sb-bignum::negate-bignum y nil)))
-+            (negate_bignum y)))
-     (xl (sb-bignum::%bignum-length nx))
-     (yl (sb-bignum::%bignum-length ny))
-     (rl (if (< xl yl) xl yl))
-@@ -735,9 +748,9 @@
-     (x-plusp (sb-bignum::%bignum-0-or-plusp x (sb-bignum::%bignum-length x)))
-     (y-plusp (sb-bignum::%bignum-0-or-plusp y (sb-bignum::%bignum-length y)))
-     (nx (if x-plusp x
--           (sb-bignum::negate-bignum x nil)))
-+           (negate_bignum x)))
-     (ny (if y-plusp y
--           (sb-bignum::negate-bignum y nil)))
-+           (negate_bignum y)))
-     (len-x (sb-bignum::%bignum-length nx))
-     (len-y (sb-bignum::%bignum-length ny))
-     (q nil)
diff --git a/sci-mathematics/fricas/fricas-1.3.9-r3.ebuild b/sci-mathematics/fricas/fricas-1.3.11-r2.ebuild
index 0fc1aceea768..f661206cab77 100644
--- a/sci-mathematics/fricas/fricas-1.3.9-r3.ebuild
+++ b/sci-mathematics/fricas/fricas-1.3.11-r2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit elisp-common
+VIRTUALX_REQUIRED="doc"
+inherit virtualx elisp-common
 
 DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
 HOMEPAGE="https://fricas.sourceforge.net/
@@ -14,7 +15,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="+sbcl cmucl gcl ecl clisp clozurecl X emacs gmp"
+IUSE="+sbcl cmucl gcl ecl clisp clozurecl X emacs gmp doc"
 REQUIRED_USE="^^ ( sbcl cmucl gcl ecl clisp clozurecl )
 	gmp? ( ^^ ( sbcl clozurecl ) )"
 RDEPEND="sbcl? ( dev-lisp/sbcl:= )
@@ -26,16 +27,22 @@ RDEPEND="sbcl? ( dev-lisp/sbcl:= )
 	X? ( x11-libs/libXpm x11-libs/libICE )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	gmp? ( dev-libs/gmp:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-sbcl-2.3.9.patch )
+DEPEND="${RDEPEND}
+	doc? ( dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
+		dev-tex/pgf )"
 
 # necessary for clisp and gcl
 RESTRICT="strip"
 
+PATCHES=( "${FILESDIR}"/${P}-doc.patch )
+
 src_configure() {
 	local LISP GMP
-	use sbcl && LISP=sbcl
+	use sbcl && LISP="sbcl --dynamic-space-size 4096"
 	use cmucl && LISP=lisp
 	use gcl && LISP=gcl
 	use ecl && LISP=ecl
@@ -48,12 +55,16 @@ src_configure() {
 	fi
 
 	# aldor is not yet in portage
-	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP}
+	econf --disable-aldor --with-lisp="${LISP}" $(use_with X x) ${GMP}
 }
 
 src_compile() {
-	# bug #300132
-	emake -j1
+	default
+	if use doc; then
+		pushd src/doc > /dev/null || die "pushd src/doc failed"
+		virtx emake book
+		popd > /dev/null
+	fi
 }
 
 src_test() {
@@ -74,6 +85,10 @@ src_install() {
 		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
 	fi
 	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
+
+	if use doc; then
+		dodoc src/doc/book.pdf
+	fi
 }
 
 pkg_postinst() {