* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/fricas/files/, sci-mathematics/fricas/
@ 2023-10-12 5:56 Andrey Grozin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2023-10-12 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 4962c844af760b3889682f744fbe76a4507cf1ba
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 05:55:14 2023 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 05:55:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4962c844
sci-mathematics/fricas: remove old versions
Bug: https://bugs.gentoo.org/915586
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-mathematics/fricas/Manifest | 1 -
.../fricas/files/fricas-sbcl-2.3.2.patch | 18 ----
sci-mathematics/fricas/fricas-1.3.8-r1.ebuild | 112 ---------------------
sci-mathematics/fricas/fricas-1.3.9.ebuild | 111 --------------------
4 files changed, 242 deletions(-)
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index dde68418c933..1a64dd549538 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,2 +1 @@
-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
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.ebuild
deleted file mode 100644
index f64df558213a..000000000000
--- a/sci-mathematics/fricas/fricas-1.3.9.ebuild
+++ /dev/null
@@ -1,111 +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="https://fricas.sourceforge.net/
- https://github.com/fricas/fricas
- https://fricas.github.io/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${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"
-
-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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/fricas/files/, sci-mathematics/fricas/
@ 2023-10-15 8:27 Andrey Grozin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2023-10-15 8:27 UTC (permalink / raw
To: gentoo-commits
commit: cc71105828670c0a9d7314c938dfc806fac4a95c
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 08:26:51 2023 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 08:27:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc711058
sci-mathematics/fricas: now compiles with sbcl-2.3.9
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
.../fricas/files/fricas-sbcl-2.3.9.patch | 61 +++++++++++
sci-mathematics/fricas/fricas-1.3.9-r2.ebuild | 113 +++++++++++++++++++++
2 files changed, 174 insertions(+)
diff --git a/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch b/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch
new file mode 100644
index 000000000000..6f7440afecf5
--- /dev/null
+++ b/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch
@@ -0,0 +1,61 @@
+diff --git a/src/lisp/num_gmp.lisp b/src/lisp/num_gmp.lisp
+index b58001e..9538e3c 100644
+--- a/src/lisp/num_gmp.lisp
++++ b/src/lisp/num_gmp.lisp
+@@ -549,6 +549,20 @@
+ ;;; (gmp-bignum-isqrt (expt 10 50))
+ ;;; (gmp-bignum-isqrt (expt 2 127))
+ #+:sbcl
++
++(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-bignum-isqrt (x)
+ (let* ((len-x (sb-bignum::%bignum-length x))
+ (len-res (ceiling (+ 1 len-x) 2))
+@@ -652,8 +666,8 @@
+ (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 +711,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 +749,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-r2.ebuild b/sci-mathematics/fricas/fricas-1.3.9-r2.ebuild
new file mode 100644
index 000000000000..07f9242ca06b
--- /dev/null
+++ b/sci-mathematics/fricas/fricas-1.3.9-r2.ebuild
@@ -0,0 +1,113 @@
+# 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="https://fricas.sourceforge.net/
+ https://github.com/fricas/fricas
+ https://fricas.github.io/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${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}"
+
+PATCHES=( "${FILESDIR}"/${PN}-sbcl-2.3.9.patch )
+
+# necessary for clisp and gcl
+RESTRICT="strip"
+
+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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/fricas/files/, sci-mathematics/fricas/
@ 2023-10-19 12:43 Andrey Grozin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2023-10-19 12:43 UTC (permalink / raw
To: gentoo-commits
commit: b341492e256badccb690eafe93d34df68c9049a5
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 12:42:48 2023 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 12:42:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b341492e
sci-mathematics/fricas: fix building with clozurecl
Bug: https://bugs.gentoo.org/915647
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
.../fricas/files/fricas-sbcl-2.3.9.patch | 22 +++---
sci-mathematics/fricas/fricas-1.3.9-r3.ebuild | 85 ++++++++++++++++++++++
2 files changed, 95 insertions(+), 12 deletions(-)
diff --git a/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch b/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch
index 6f7440afecf5..f3a28ed57457 100644
--- a/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch
+++ b/sci-mathematics/fricas/files/fricas-sbcl-2.3.9.patch
@@ -1,12 +1,11 @@
diff --git a/src/lisp/num_gmp.lisp b/src/lisp/num_gmp.lisp
-index b58001e..9538e3c 100644
+index b58001e0b..f4a022ad4 100644
--- a/src/lisp/num_gmp.lisp
+++ b/src/lisp/num_gmp.lisp
-@@ -549,6 +549,20 @@
- ;;; (gmp-bignum-isqrt (expt 10 50))
- ;;; (gmp-bignum-isqrt (expt 2 127))
- #+:sbcl
-+
+@@ -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")))
@@ -20,10 +19,9 @@ index b58001e..9538e3c 100644
+ )
+)
+
- (defun gmp-bignum-isqrt (x)
- (let* ((len-x (sb-bignum::%bignum-length x))
- (len-res (ceiling (+ 1 len-x) 2))
-@@ -652,8 +666,8 @@
+ (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)))
@@ -34,7 +32,7 @@ index b58001e..9538e3c 100644
(len-a (sb-bignum::%bignum-length a))
(len-b (sb-bignum::%bignum-length b))
(len-res (+ len-a len-b))
-@@ -697,10 +711,10 @@
+@@ -697,10 +710,10 @@
(let* (
(nx (if (sb-bignum::%bignum-0-or-plusp x (sb-bignum::%bignum-length x))
(sb-bignum::copy-bignum x)
@@ -47,7 +45,7 @@ index b58001e..9538e3c 100644
(xl (sb-bignum::%bignum-length nx))
(yl (sb-bignum::%bignum-length ny))
(rl (if (< xl yl) xl yl))
-@@ -735,9 +749,9 @@
+@@ -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
diff --git a/sci-mathematics/fricas/fricas-1.3.9-r3.ebuild b/sci-mathematics/fricas/fricas-1.3.9-r3.ebuild
new file mode 100644
index 000000000000..6515c133f0ca
--- /dev/null
+++ b/sci-mathematics/fricas/fricas-1.3.9-r3.ebuild
@@ -0,0 +1,85 @@
+# 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="https://fricas.sourceforge.net/
+ https://github.com/fricas/fricas
+ https://fricas.github.io/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-full.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+sbcl cmucl gcl ecl clisp clozurecl X emacs gmp"
+REQUIRED_USE="^^ ( sbcl cmucl gcl ecl clisp clozurecl )
+ gmp? ( ^^ ( sbcl clozurecl ) )"
+RDEPEND="sbcl? ( dev-lisp/sbcl:= )
+ cmucl? ( dev-lisp/cmucl:= )
+ gcl? ( dev-lisp/gcl:= )
+ ecl? ( dev-lisp/ecl:= )
+ clisp? ( dev-lisp/clisp:= )
+ clozurecl? ( dev-lisp/clozurecl:= )
+ 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 )
+
+# necessary for clisp and gcl
+RESTRICT="strip"
+
+src_configure() {
+ local LISP GMP
+ use sbcl && LISP=sbcl
+ use cmucl && LISP=lisp
+ use gcl && LISP=gcl
+ use ecl && LISP=ecl
+ use clisp && LISP=clisp
+ use clozurecl && LISP=ccl
+
+ if use sbcl || use clozurecl
+ 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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/fricas/files/, sci-mathematics/fricas/
@ 2024-06-30 12:44 Andrey Grozin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2024-06-30 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 05bbbf5c83766df67a9d4a98129014b2138a51b7
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 12:44:21 2024 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 12:44:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05bbbf5c
sci-mathematics/fricas: remove old version
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-mathematics/fricas/Manifest | 1 -
.../fricas/files/fricas-sbcl-2.3.9.patch | 59 ---------------
sci-mathematics/fricas/fricas-1.3.9-r3.ebuild | 85 ----------------------
3 files changed, 145 deletions(-)
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index 5ab55abf98ec..6c0959685da2 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,3 +1,2 @@
DIST fricas-1.3.10-full.tar.bz2 10971513 BLAKE2B 0ea96cf1076dcd23f53ebdcd3ebf5c6e605915ce332093b83d62a5ed482d32f14833857e270865a4031d7bfc033d961c69007e936260e7d85e632b091d969e0d SHA512 de23c34a1e47b0a4ab2f85e1154e6fa5b0905427718e8c0ad4fe298bf6ebbb1abcc02426e528b7b34d15aebfc2ca1b06f73e39a24ec741d2d5c70f9b48b02665
DIST fricas-1.3.11-full.tar.bz2 10937641 BLAKE2B 52bb467468de83dfbb8a61717356d74c605efe1174168c35af50d15232c8441457415ca2c88fd19356caec9f9ee29af556104f421dc0479f3ae635144432be7a SHA512 6166661866829764fdf02e84c08f3afd8f631a40c8c5340648640b4fa388641c703021f5006e135ac32e671786b1a75bc290039e929ef322c60a0ba0cb0212ac
-DIST fricas-1.3.9-full.tar.bz2 10949173 BLAKE2B c535d2a384fa55db53b6901d3ba5d1cc8eca35ccf67a2664f934da427a808b5adc7a5522b935f5dcff89795c0ca5816818d9cf37399b6f9bdc63cfe4d622a7c3 SHA512 9cfcb8bad52550a46216509154d5c06dac23625bc14d504a1febbea7ff771fd3172f91c2824df51375b8d85adc19959a5cbbfa2b77a0095ca37e8a4d4b8cc405
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.9-r3.ebuild
deleted file mode 100644
index 0fc1aceea768..000000000000
--- a/sci-mathematics/fricas/fricas-1.3.9-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 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="https://fricas.sourceforge.net/
- https://github.com/fricas/fricas
- https://fricas.github.io/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}-full.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+sbcl cmucl gcl ecl clisp clozurecl X emacs gmp"
-REQUIRED_USE="^^ ( sbcl cmucl gcl ecl clisp clozurecl )
- gmp? ( ^^ ( sbcl clozurecl ) )"
-RDEPEND="sbcl? ( dev-lisp/sbcl:= )
- cmucl? ( dev-lisp/cmucl:= )
- gcl? ( dev-lisp/gcl:= )
- ecl? ( dev-lisp/ecl:= )
- clisp? ( dev-lisp/clisp:= )
- clozurecl? ( dev-lisp/clozurecl:= )
- 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 )
-
-# necessary for clisp and gcl
-RESTRICT="strip"
-
-src_configure() {
- local LISP GMP
- use sbcl && LISP=sbcl
- use cmucl && LISP=lisp
- use gcl && LISP=gcl
- use ecl && LISP=ecl
- use clisp && LISP=clisp
- use clozurecl && LISP=ccl
-
- if use sbcl || use clozurecl
- 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/fricas/files/, sci-mathematics/fricas/
@ 2024-06-30 17:15 Andrey Grozin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2024-06-30 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 41f7c373a42716a70839935fc9a4c8361aa6d5bd
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 17:14:45 2024 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 17:14:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f7c373
sci-mathematics/fricas: add USE flag doc
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
.../fricas/files/fricas-1.3.11-doc.patch | 12 +++
sci-mathematics/fricas/fricas-1.3.11-r1.ebuild | 94 ++++++++++++++++++++++
2 files changed, 106 insertions(+)
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/fricas-1.3.11-r1.ebuild b/sci-mathematics/fricas/fricas-1.3.11-r1.ebuild
new file mode 100644
index 000000000000..41d8808bf5a8
--- /dev/null
+++ b/sci-mathematics/fricas/fricas-1.3.11-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VIRTUALX_REQUIRED="doc"
+inherit virtualx elisp-common
+
+DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
+HOMEPAGE="https://fricas.sourceforge.net/
+ https://github.com/fricas/fricas
+ https://fricas.github.io/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}-full.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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:= )
+ cmucl? ( dev-lisp/cmucl:= )
+ gcl? ( dev-lisp/gcl:= )
+ ecl? ( dev-lisp/ecl:= )
+ clisp? ( dev-lisp/clisp:= )
+ clozurecl? ( dev-lisp/clozurecl:= )
+ X? ( x11-libs/libXpm x11-libs/libICE )
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gmp? ( dev-libs/gmp:= )"
+DEPEND="${RDEPEND}"
+
+# necessary for clisp and gcl
+RESTRICT="strip"
+
+PATCHES=( "${FILESDIR}"/${P}-doc.patch )
+
+src_configure() {
+ local LISP GMP
+ use sbcl && LISP="sbcl --dynamic-space-size 4096"
+ use cmucl && LISP=lisp
+ use gcl && LISP=gcl
+ use ecl && LISP=ecl
+ use clisp && LISP=clisp
+ use clozurecl && LISP=ccl
+
+ if use sbcl || use clozurecl
+ 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() {
+ default
+ if use doc; then
+ pushd src/doc > /dev/null || die "pushd src/doc failed"
+ virtx emake book
+ popd > /dev/null
+ fi
+}
+
+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"
+
+ if use doc; then
+ dodoc src/doc/book.pdf
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-30 17:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-19 12:43 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/fricas/files/, sci-mathematics/fricas/ Andrey Grozin
-- strict thread matches above, loose matches on Subject: below --
2024-06-30 17:15 Andrey Grozin
2024-06-30 12:44 Andrey Grozin
2023-10-15 8:27 Andrey Grozin
2023-10-12 5:56 Andrey Grozin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox