* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2015-08-29 14:09 Andrey Grozin
0 siblings, 0 replies; 20+ messages in thread
From: Andrey Grozin @ 2015-08-29 14:09 UTC (permalink / raw
To: gentoo-commits
commit: f36e2c4a38ca026c643ef30fa8c02388831c2e28
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 14:03:56 2015 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 14:04:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36e2c4a
sci-mathematics/maxima: cleaning old version
Package-Manager: portage-2.2.20.1
sci-mathematics/maxima/Manifest | 1 -
sci-mathematics/maxima/files/ecls-0.patch | 27 ----
.../maxima/files/maxima-5.26.0-ecls-12.2.1.patch | 8 -
.../maxima/files/maxima-5.26.0-wish.patch | 28 ----
sci-mathematics/maxima/files/maxima-5.26.0.patch | 37 -----
.../maxima-5.27.0-inhibit-sys_usr-inits.patch | 24 ---
.../maxima/files/maxima-5.27.0-wish.patch | 28 ----
sci-mathematics/maxima/files/maxima-5.27.0.patch | 37 -----
.../maxima/files/maxima-5.28.0-sbcl.patch | 8 -
.../maxima/files/maxima-5.28.0-wish.patch | 28 ----
sci-mathematics/maxima/files/maxima-5.28.0.patch | 51 ------
.../maxima/files/maxima-5.29.1-sbcl.patch | 8 -
.../maxima/files/maxima-5.29.1-wish.patch | 28 ----
sci-mathematics/maxima/files/maxima-5.29.1.patch | 51 ------
sci-mathematics/maxima/files/maxima-ccl.patch | 8 -
.../maxima/files/maxima-ecl-ldflags.patch | 27 ----
sci-mathematics/maxima/files/maxima-imaxima.patch | 5 -
.../maxima/files/maxima-no-init-files.patch | 31 ----
sci-mathematics/maxima/files/maxima-rmaxima.patch | 25 ---
.../maxima/files/maxima-xdg-utils.patch | 35 -----
sci-mathematics/maxima/maxima-5.18.1.ebuild | 175 ---------------------
21 files changed, 670 deletions(-)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index d9727d8..221c53c 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,3 +1,2 @@
-DIST maxima-5.18.1.tar.gz 20440947 SHA256 eef1f70503755ec8fb311a13731044e6fff17e6fd9534eb6bea68a12964d94bf
DIST maxima-5.34.1.tar.gz 29469851 SHA256 20ca416ca912c8d3d99299f2ef45342a1beb2f077cf501c6a647de46bfdb89b7 SHA512 24a9ce0d2bfb0fa107460bbeec561869f9d3f2ce2623e39ab16b810dbf2712981bbf98ceee9c30f4e70fdec7f918a7743b5fb8cf26b67313e1d367dd8f2a1823 WHIRLPOOL 0f59cfe14391686a543027bb5cab8669439d0e36b016924872662f61e36cf05663480f8a3f942d7deccbe39ec7f45ed77deeb8a3c84241189ac0f1993537c47a
DIST maxima-5.36.1.tar.gz 29615673 SHA256 400bf83000b84d280d75e200e078582fe44f23220824562cc06c589d8a993974 SHA512 10e090230ab408777a1145ad90daef6bf237ba38ae31a654ba4d464e7a27e1f48baac5202ce8fb39e4c04ec9a6c9916ac83a58bd071b676ea5a989ea7db87d4c WHIRLPOOL ee7738085ae9e5b156b89afbf724b3ae5ef70b74550bee43cf3ab763f569d5ac51ea9c0e5aad67070f4b71f480b079aad8e4fd44ded34525a1f84cbeeb2d28b0
diff --git a/sci-mathematics/maxima/files/ecls-0.patch b/sci-mathematics/maxima/files/ecls-0.patch
deleted file mode 100644
index df45dee..0000000
--- a/sci-mathematics/maxima/files/ecls-0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in
---- maxima-5.30.0.orig/src/maxima.in 2012-12-04 12:54:50.000000000 +0700
-+++ maxima-5.30.0/src/maxima.in 2013-04-13 12:57:12.037579805 +0700
-@@ -191,3 +191,3 @@
- elif [ "$MAXIMA_LISP" = "ecl" ]; then
-- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -norc -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-
-diff -r -U1 maxima-5.30.0.orig/src/maxima.system maxima-5.30.0/src/maxima.system
---- maxima-5.30.0.orig/src/maxima.system 2013-03-23 08:32:08.000000000 +0700
-+++ maxima-5.30.0/src/maxima.system 2013-04-13 12:59:54.086730845 +0700
-@@ -61,2 +61,10 @@
- #+ecl
-+(defun split-ld-flags-for-ecl (string &aux space)
-+ (setf string (string-trim '(#\Space) string))
-+ (if (setf space (position #\Space string))
-+ (cons (subseq string 0 space)
-+ (split-ld-flags-for-ecl (subseq string (1+ space))))
-+ (cons string nil)))
-+
-+#+ecl
- (defun build-maxima-lib ()
-@@ -81,3 +89,3 @@
- (find-package "MAXIMA")))))
-- (if (and x (not (string= x ""))) (list x)))
-+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
- :epilogue-code '(progn (require :defsystem)
diff --git a/sci-mathematics/maxima/files/maxima-5.26.0-ecls-12.2.1.patch b/sci-mathematics/maxima/files/maxima-5.26.0-ecls-12.2.1.patch
deleted file mode 100644
index 4fde880..0000000
--- a/sci-mathematics/maxima/files/maxima-5.26.0-ecls-12.2.1.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 maxima-5.26.0.orig/src/numerical/slatec/xerprn.lisp maxima-5.26.0/src/numerical/slatec/xerprn.lisp
---- maxima-5.26.0.orig/src/numerical/slatec/xerprn.lisp 2011-08-01 11:39:52.000000000 +0700
-+++ maxima-5.26.0/src/numerical/slatec/xerprn.lisp 2012-02-13 18:49:21.000000000 +0700
-@@ -20,3 +20,3 @@
- (let* ((newlin "$$"))
-- (declare (type (simple-array character (2)) newlin) (ignorable newlin))
-+ (declare (ignorable newlin))
- (defun xerprn (prefix npref messg nwrap)
diff --git a/sci-mathematics/maxima/files/maxima-5.26.0-wish.patch b/sci-mathematics/maxima/files/maxima-5.26.0-wish.patch
deleted file mode 100644
index 6fcb0d9..0000000
--- a/sci-mathematics/maxima/files/maxima-5.26.0-wish.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
---- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
-+++ maxima-5.23.1//configure.in 2011-01-16 21:00:16.000000000 +0600
-@@ -777,6 +777,11 @@
- [ --with-wish=<prog> Use <prog> for Tk wish shell (default wish)],
-- [WISH="${withval}"],
-- [WISH="wish"])
-+ [],
-+ [with_wish="wish"])
-+case "${with_wish}" in
-+ no) WISH="none" ;;
-+ yes) WISH="wish" ;;
-+ *) WISH="${with_wish}" ;;
-+esac
- AC_SUBST(WISH)
--
-+AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno)
-
-diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am
---- maxima-5.23.1.orig//interfaces/Makefile.am 2004-04-28 23:34:59.000000000 +0700
-+++ maxima-5.23.1//interfaces/Makefile.am 2011-01-16 20:41:38.000000000 +0600
-@@ -1,2 +1,6 @@
-+if WANT_TK
- SUBDIRS = emacs xmaxima
-+else
-+SUBDIRS = emacs
-+endif
- EXTRA_DIST = bin/xmaxima.iss
diff --git a/sci-mathematics/maxima/files/maxima-5.26.0.patch b/sci-mathematics/maxima/files/maxima-5.26.0.patch
deleted file mode 100644
index 6309653..0000000
--- a/sci-mathematics/maxima/files/maxima-5.26.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
---- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
-+++ maxima-5.23.1//configure.in 2011-01-16 19:50:55.000000000 +0600
-@@ -294,3 +294,3 @@
- dnl n.b. openmcl_default_name is hardcoded in "with" message
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- AC_ARG_ENABLE(openmcl,
-diff -r -U1 maxima-5.23.1.orig//src/maxima.in maxima-5.23.1//src/maxima.in
---- maxima-5.23.1.orig//src/maxima.in 2010-12-05 08:06:03.000000000 +0600
-+++ maxima-5.23.1//src/maxima.in 2011-01-16 20:07:27.000000000 +0600
-@@ -137,5 +137,5 @@
- if [ "$layout_autotools" = "true" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -147,5 +147,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -155,3 +155,3 @@
- else
-- exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -177,3 +177,3 @@
- elif [ "$MAXIMA_LISP" = "sbcl" ]; then
-- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
diff --git a/sci-mathematics/maxima/files/maxima-5.27.0-inhibit-sys_usr-inits.patch b/sci-mathematics/maxima/files/maxima-5.27.0-inhibit-sys_usr-inits.patch
deleted file mode 100644
index a86a4ed..0000000
--- a/sci-mathematics/maxima/files/maxima-5.27.0-inhibit-sys_usr-inits.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr maxima-5.27.0.org/src/Makefile.am maxima-5.27.0/src/Makefile.am
---- maxima-5.27.0.org/src/Makefile.am 2012-05-07 08:04:23.000000000 -0400
-+++ maxima-5.27.0/src/Makefile.am 2012-05-07 08:04:56.000000000 -0400
-@@ -176,7 +176,7 @@
-
-
- if SBCL
--EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
-+EXECUTESBCL = $(SBCL_NAME) --sysinit /dev/null --userinit /dev/null --eval
- all-local: sharefiles.mk binary-sbcl/maxima.core
- install-exec-local: install-sbcl
- uninstall-hook: uninstall-sbcl
-diff -uNr maxima-5.27.0.org/src/Makefile.in maxima-5.27.0/src/Makefile.in
---- maxima-5.27.0.org/src/Makefile.in 2012-05-07 08:04:23.000000000 -0400
-+++ maxima-5.27.0/src/Makefile.in 2012-05-07 08:05:14.000000000 -0400
-@@ -240,7 +240,7 @@
- @CMUCL_TRUE@INITINTL = (when (find-package "INTL") (set (find-symbol "*DEFAULT-DOMAIN*" "INTL") "maxima"))
- @SCL_TRUE@EXECUTESCL = $(SCL_NAME) -noinit -batch
- @ACL_TRUE@EXECUTEACL = $(ACL_NAME) -batch
--@SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
-+@SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --sysinit /dev/null --userinit /dev/null --eval
- @GCL_TRUE@EXECUTEGCL = $(GCL_NAME) -batch -eval
- @OPENMCL_TRUE@EXECUTEOPENMCL = $(OPENMCL_NAME) -e
- @ECL_TRUE@EXECUTEECL = $(ECL_NAME) -norc
diff --git a/sci-mathematics/maxima/files/maxima-5.27.0-wish.patch b/sci-mathematics/maxima/files/maxima-5.27.0-wish.patch
deleted file mode 100644
index 6fcb0d9..0000000
--- a/sci-mathematics/maxima/files/maxima-5.27.0-wish.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
---- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
-+++ maxima-5.23.1//configure.in 2011-01-16 21:00:16.000000000 +0600
-@@ -777,6 +777,11 @@
- [ --with-wish=<prog> Use <prog> for Tk wish shell (default wish)],
-- [WISH="${withval}"],
-- [WISH="wish"])
-+ [],
-+ [with_wish="wish"])
-+case "${with_wish}" in
-+ no) WISH="none" ;;
-+ yes) WISH="wish" ;;
-+ *) WISH="${with_wish}" ;;
-+esac
- AC_SUBST(WISH)
--
-+AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno)
-
-diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am
---- maxima-5.23.1.orig//interfaces/Makefile.am 2004-04-28 23:34:59.000000000 +0700
-+++ maxima-5.23.1//interfaces/Makefile.am 2011-01-16 20:41:38.000000000 +0600
-@@ -1,2 +1,6 @@
-+if WANT_TK
- SUBDIRS = emacs xmaxima
-+else
-+SUBDIRS = emacs
-+endif
- EXTRA_DIST = bin/xmaxima.iss
diff --git a/sci-mathematics/maxima/files/maxima-5.27.0.patch b/sci-mathematics/maxima/files/maxima-5.27.0.patch
deleted file mode 100644
index 6309653..0000000
--- a/sci-mathematics/maxima/files/maxima-5.27.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
---- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
-+++ maxima-5.23.1//configure.in 2011-01-16 19:50:55.000000000 +0600
-@@ -294,3 +294,3 @@
- dnl n.b. openmcl_default_name is hardcoded in "with" message
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- AC_ARG_ENABLE(openmcl,
-diff -r -U1 maxima-5.23.1.orig//src/maxima.in maxima-5.23.1//src/maxima.in
---- maxima-5.23.1.orig//src/maxima.in 2010-12-05 08:06:03.000000000 +0600
-+++ maxima-5.23.1//src/maxima.in 2011-01-16 20:07:27.000000000 +0600
-@@ -137,5 +137,5 @@
- if [ "$layout_autotools" = "true" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -147,5 +147,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -155,3 +155,3 @@
- else
-- exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -177,3 +177,3 @@
- elif [ "$MAXIMA_LISP" = "sbcl" ]; then
-- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
diff --git a/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch b/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch
deleted file mode 100644
index 66a583e..0000000
--- a/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 maxima-5.28.0.orig/src/Makefile.am maxima-5.28.0/src/Makefile.am
---- maxima-5.28.0.orig/src/Makefile.am 2012-06-15 12:21:34.000000000 +0700
-+++ maxima-5.28.0/src/Makefile.am 2012-08-25 09:32:26.000000000 +0700
-@@ -199,3 +199,3 @@
- if SBCL
--EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --eval
-+EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --no-sysinit --no-userinit --eval
- all-local: sharefiles.mk $(SBCL_MAXIMA)
diff --git a/sci-mathematics/maxima/files/maxima-5.28.0-wish.patch b/sci-mathematics/maxima/files/maxima-5.28.0-wish.patch
deleted file mode 100644
index 6fcb0d9..0000000
--- a/sci-mathematics/maxima/files/maxima-5.28.0-wish.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
---- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
-+++ maxima-5.23.1//configure.in 2011-01-16 21:00:16.000000000 +0600
-@@ -777,6 +777,11 @@
- [ --with-wish=<prog> Use <prog> for Tk wish shell (default wish)],
-- [WISH="${withval}"],
-- [WISH="wish"])
-+ [],
-+ [with_wish="wish"])
-+case "${with_wish}" in
-+ no) WISH="none" ;;
-+ yes) WISH="wish" ;;
-+ *) WISH="${with_wish}" ;;
-+esac
- AC_SUBST(WISH)
--
-+AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno)
-
-diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am
---- maxima-5.23.1.orig//interfaces/Makefile.am 2004-04-28 23:34:59.000000000 +0700
-+++ maxima-5.23.1//interfaces/Makefile.am 2011-01-16 20:41:38.000000000 +0600
-@@ -1,2 +1,6 @@
-+if WANT_TK
- SUBDIRS = emacs xmaxima
-+else
-+SUBDIRS = emacs
-+endif
- EXTRA_DIST = bin/xmaxima.iss
diff --git a/sci-mathematics/maxima/files/maxima-5.28.0.patch b/sci-mathematics/maxima/files/maxima-5.28.0.patch
deleted file mode 100644
index c8bd419..0000000
--- a/sci-mathematics/maxima/files/maxima-5.28.0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -r -U1 maxima-5.28.0.orig/src/maxima.in maxima-5.28.0/src/maxima.in
---- maxima-5.28.0.orig/src/maxima.in 2012-06-15 12:21:34.000000000 +0700
-+++ maxima-5.28.0/src/maxima.in 2012-08-15 21:46:37.000000000 +0700
-@@ -138,5 +138,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -144,5 +144,5 @@
- if [ -x "$maxima_image_base" ]; then
-- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -155,5 +155,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -161,5 +161,5 @@
- if [ -x "$maxima_image_base" ]; then
-- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -183,5 +183,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -196,5 +196,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
diff --git a/sci-mathematics/maxima/files/maxima-5.29.1-sbcl.patch b/sci-mathematics/maxima/files/maxima-5.29.1-sbcl.patch
deleted file mode 100644
index 66a583e..0000000
--- a/sci-mathematics/maxima/files/maxima-5.29.1-sbcl.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 maxima-5.28.0.orig/src/Makefile.am maxima-5.28.0/src/Makefile.am
---- maxima-5.28.0.orig/src/Makefile.am 2012-06-15 12:21:34.000000000 +0700
-+++ maxima-5.28.0/src/Makefile.am 2012-08-25 09:32:26.000000000 +0700
-@@ -199,3 +199,3 @@
- if SBCL
--EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --eval
-+EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --no-sysinit --no-userinit --eval
- all-local: sharefiles.mk $(SBCL_MAXIMA)
diff --git a/sci-mathematics/maxima/files/maxima-5.29.1-wish.patch b/sci-mathematics/maxima/files/maxima-5.29.1-wish.patch
deleted file mode 100644
index 6fcb0d9..0000000
--- a/sci-mathematics/maxima/files/maxima-5.29.1-wish.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
---- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
-+++ maxima-5.23.1//configure.in 2011-01-16 21:00:16.000000000 +0600
-@@ -777,6 +777,11 @@
- [ --with-wish=<prog> Use <prog> for Tk wish shell (default wish)],
-- [WISH="${withval}"],
-- [WISH="wish"])
-+ [],
-+ [with_wish="wish"])
-+case "${with_wish}" in
-+ no) WISH="none" ;;
-+ yes) WISH="wish" ;;
-+ *) WISH="${with_wish}" ;;
-+esac
- AC_SUBST(WISH)
--
-+AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno)
-
-diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am
---- maxima-5.23.1.orig//interfaces/Makefile.am 2004-04-28 23:34:59.000000000 +0700
-+++ maxima-5.23.1//interfaces/Makefile.am 2011-01-16 20:41:38.000000000 +0600
-@@ -1,2 +1,6 @@
-+if WANT_TK
- SUBDIRS = emacs xmaxima
-+else
-+SUBDIRS = emacs
-+endif
- EXTRA_DIST = bin/xmaxima.iss
diff --git a/sci-mathematics/maxima/files/maxima-5.29.1.patch b/sci-mathematics/maxima/files/maxima-5.29.1.patch
deleted file mode 100644
index c8bd419..0000000
--- a/sci-mathematics/maxima/files/maxima-5.29.1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -r -U1 maxima-5.28.0.orig/src/maxima.in maxima-5.28.0/src/maxima.in
---- maxima-5.28.0.orig/src/maxima.in 2012-06-15 12:21:34.000000000 +0700
-+++ maxima-5.28.0/src/maxima.in 2012-08-15 21:46:37.000000000 +0700
-@@ -138,5 +138,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -144,5 +144,5 @@
- if [ -x "$maxima_image_base" ]; then
-- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -155,5 +155,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -161,5 +161,5 @@
- if [ -x "$maxima_image_base" ]; then
-- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -183,5 +183,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -196,5 +196,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
diff --git a/sci-mathematics/maxima/files/maxima-ccl.patch b/sci-mathematics/maxima/files/maxima-ccl.patch
deleted file mode 100644
index 6e74674..0000000
--- a/sci-mathematics/maxima/files/maxima-ccl.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 maxima-5.28.0.orig/configure.in maxima-5.28.0/configure.in
---- maxima-5.28.0.orig/configure.in 2012-08-12 23:17:53.000000000 +0700
-+++ maxima-5.28.0/configure.in 2012-08-15 21:47:42.000000000 +0700
-@@ -350,3 +350,3 @@
- dnl n.b. openmcl_default_name is hardcoded in "with" message
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- AC_ARG_ENABLE(openmcl,
diff --git a/sci-mathematics/maxima/files/maxima-ecl-ldflags.patch b/sci-mathematics/maxima/files/maxima-ecl-ldflags.patch
deleted file mode 100644
index e71486f..0000000
--- a/sci-mathematics/maxima/files/maxima-ecl-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -p -up maxima-5.20.1/src/maxima.system.orig maxima-5.20.1/src/maxima.system
---- maxima-5.20.1/src/maxima.system.orig 2010-03-04 17:25:38.708483072 -0300
-+++ maxima-5.20.1/src/maxima.system 2010-03-04 17:27:27.150481620 -0300
-@@ -44,6 +44,14 @@
- (c:build-fasl output :lisp-files (list object-output)))))
-
- #+ecl
-+(defun split-ld-flags-for-ecl (string &aux space)
-+ (setf string (string-trim '(#\Space) string))
-+ (if (setf space (position #\Space string))
-+ (cons (subseq string 0 space)
-+ (split-ld-flags-for-ecl (subseq string (1+ space))))
-+ (cons string nil)))
-+
-+#+ecl
- (defun build-maxima-lib ()
- (labels ((list-all-objects (module)
- (if (eql (mk::component-type module) :file)
-@@ -66,7 +74,7 @@
- :ld-flags
- (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
- (find-package "MAXIMA")))))
-- (if (and x (not (string= x ""))) (list x)))
-+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
- :epilogue-code '(progn (require :defsystem)
- (cl-user::run)))))))
-
diff --git a/sci-mathematics/maxima/files/maxima-imaxima.patch b/sci-mathematics/maxima/files/maxima-imaxima.patch
deleted file mode 100644
index fe607b2..0000000
--- a/sci-mathematics/maxima/files/maxima-imaxima.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- interfaces/emacs/Makefile.am.orig 2010-02-01 22:11:44.809941160 +1300
-+++ interfaces/emacs/Makefile.am 2010-02-01 22:12:06.608062346 +1300
-@@ -1 +1 @@
--SUBDIRS = emaxima misc imaxima
-+SUBDIRS = emaxima misc
diff --git a/sci-mathematics/maxima/files/maxima-no-init-files.patch b/sci-mathematics/maxima/files/maxima-no-init-files.patch
deleted file mode 100644
index 2e49a2b..0000000
--- a/sci-mathematics/maxima/files/maxima-no-init-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/maxima.in.orig 2008-02-07 11:53:43.006379528 +0000
-+++ src/maxima.in 2008-02-07 11:55:02.278897011 +0000
-@@ -111,15 +111,15 @@
- fi
- if [ "$MAXIMA_LISP" = "clisp" ]; then
- if [ "$layout_autotools" = "true" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CLISP_NAME@" -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CLISP_NAME@" -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
- elif [ "$MAXIMA_LISP" = "cmucl" ]; then
- if [ "$layout_autotools" = "true" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CMUCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CMUCL_NAME@" -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
- elif [ "$MAXIMA_LISP" = "scl" ]; then
- if [ "$layout_autotools" = "true" ]; then
-@@ -138,7 +138,7 @@
- # in the function get-application-args in command-line.lisp
- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- elif [ "$MAXIMA_LISP" = "sbcl" ]; then
-- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
- echo "$0: lisp=\"$MAXIMA_LISP\" not known. Use --list-avail to see possible options." >&2
- exit 1
diff --git a/sci-mathematics/maxima/files/maxima-rmaxima.patch b/sci-mathematics/maxima/files/maxima-rmaxima.patch
deleted file mode 100644
index 712cbda..0000000
--- a/sci-mathematics/maxima/files/maxima-rmaxima.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r -U2 maxima-5.28.0.orig/src/Makefile.am maxima-5.28.0/src/Makefile.am
---- maxima-5.28.0.orig/src/Makefile.am 2012-06-15 12:21:34.000000000 +0700
-+++ maxima-5.28.0/src/Makefile.am 2012-10-30 22:22:29.000000000 +0700
-@@ -4,5 +4,21 @@
- bin_SCRIPTS = maxima maxima-command.ico maxima.bat set_lang.vbs
- else
-+if SBCL
- bin_SCRIPTS = maxima rmaxima
-+else
-+if CMUCL
-+bin_SCRIPTS = maxima rmaxima
-+else
-+if ECL
-+bin_SCRIPTS = maxima rmaxima
-+else
-+if OPENMCL
-+bin_SCRIPTS = maxima rmaxima
-+else
-+bin_SCRIPTS = maxima
-+endif
-+endif
-+endif
-+endif
- endif
-
diff --git a/sci-mathematics/maxima/files/maxima-xdg-utils.patch b/sci-mathematics/maxima/files/maxima-xdg-utils.patch
deleted file mode 100644
index 876fe6f..0000000
--- a/sci-mathematics/maxima/files/maxima-xdg-utils.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- interfaces/emacs/misc/bookmode.el.orig 2008-02-07 12:42:18.008472937 +0000
-+++ interfaces/emacs/misc/bookmode.el 2008-02-07 12:43:02.531010132 +0000
-@@ -680,7 +680,7 @@
-
- (and tem
- (list (concat "View "(nth 1 tem))
-- 'call-process "ghostview" nil nil nil
-+ 'call-process "xdg-open" nil nil nil
- (expand-file-name(nth 1 tem))
- ))
- (list "Cancel")
-@@ -705,7 +705,7 @@
- (concat
- (cond ((looking-at "%PS") "")
- (t "gzip -dc | "))
-- "ghostview -")
-+ "xdg-open -")
-
- )))
-
---- interfaces/xmaxima/Tkmaxima/Constants.tcl.orig 2008-02-07 12:42:47.294141832 +0000
-+++ interfaces/xmaxima/Tkmaxima/Constants.tcl 2008-02-07 12:43:02.539010587 +0000
-@@ -143,9 +143,9 @@
- image/gif netmath
- image/png netmath
- image/jpeg netmath
-- application/postscript "ghostview -safer %s"
-- application/pdf "acroread %s"
-- application/x-dvi "xdvi %s"
-+ application/postscript "xdg-open -safer %s"
-+ application/pdf "xdg-open %s"
-+ application/x-dvi "xdg-open %s"
- }
- set maxima_priv(imagecounter) 0
-
diff --git a/sci-mathematics/maxima/maxima-5.18.1.ebuild b/sci-mathematics/maxima/maxima-5.18.1.ebuild
deleted file mode 100644
index 367765c..0000000
--- a/sci-mathematics/maxima/maxima-5.18.1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=2
-inherit eutils elisp-common
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-# Supported lisps with readline
-SUPP_RL="gcl clisp"
-# Supported lisps without readline
-SUPP_NORL="cmucl sbcl"
-SUPP_LISPS="${SUPP_RL} ${SUPP_NORL}"
-# Default lisp if none selected
-DEF_LISP="sbcl"
-
-IUSE="latex emacs tk nls unicode xemacs X ${SUPP_LISPS} ${IUSE}"
-
-# Languages
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
- IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND="X? ( x11-misc/xdg-utils
- sci-visualization/gnuplot[gd]
- tk? ( dev-lang/tk:0 ) )
- latex? ( virtual/latex-base )
- emacs? ( virtual/emacs
- latex? ( app-emacs/auctex ) )
- xemacs? ( app-editors/xemacs
- latex? ( app-emacs/auctex ) )"
-
-PDEPEND="emacs? ( app-emacs/imaxima )"
-
-# create lisp dependencies
-for LISP in ${SUPP_LISPS}; do
- if [ "${LISP}" = "gcl" ]
- then
- RDEPEND="${RDEPEND} gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] )"
- else
- RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )"
- fi
- DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-DEF_DEP="${DEF_DEP} dev-lisp/${DEF_LISP}"
-for LISP in ${SUPP_NORL}; do
- RDEPEND="${RDEPEND} ${LISP}? ( app-misc/rlwrap )"
- [[ ${LISP} = ${DEF_LISP} ]] && \
- DEF_DEP="${DEF_DEP} app-misc/rlwrap"
-done
-for LISP in ${SUPP_LISPS}; do
- DEF_DEP="${DEF_DEP} )"
-done
-
-RDEPEND="${RDEPEND}
- ${DEF_DEP}"
-
-DEPEND="${RDEPEND}
- sys-apps/texinfo"
-
-TEXMF=/usr/share/texmf-site
-
-pkg_setup() {
- LISPS=""
-
- for LISP in ${SUPP_LISPS}; do
- use ${LISP} && LISPS="${LISPS} ${LISP}"
- done
-
- RL=""
-
- for LISP in ${SUPP_NORL}; do
- use ${LISP} && RL="yes"
- done
-
- if [ -z "${LISPS}" ]; then
- ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default"
- LISPS="${DEF_LISP}"
- RL="yes"
- fi
-}
-
-src_prepare() {
- # use xdg-open to view ps, pdf
- epatch "${FILESDIR}"/${PN}-xdg-utils.patch
- epatch "${FILESDIR}"/${PN}-no-init-files.patch
- # remove rmaxima if neither cmucl nor sbcl
- if [ -z "${RL}" ]; then
- sed -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
- -i "${S}"/src/Makefile.in \
- || die "sed for rmaxima failed"
- fi
- # don't install imaxima, since we have a separate package for it
- sed -i -e '/^SUBDIRS/s/imaxima//' interfaces/emacs/Makefile.in \
- || die "sed for imaxima failed"
-}
-
-src_configure() {
- local myconf=""
- for LISP in ${LISPS}; do
- myconf="${myconf} --enable-${LISP}"
- done
-
- # remove xmaxima if no tk
- if use tk; then
- myconf="${myconf} --with-wish=wish"
- else
- myconf="${myconf} --with-wish=none"
- sed -i \
- -e '/^SUBDIRS/s/xmaxima//' \
- interfaces/Makefile.in || die "sed for tk failed"
- fi
-
- # enable existing translated doc
- if use nls; then
- for lang in ${LANGS}; do
- if use "linguas_${lang}"; then
- myconf="${myconf} --enable-lang-${lang}"
- use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
- fi
- done
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- einstall emacsdir="${D}${SITELISP}/${PN}" || die "einstall failed"
-
- use tk && make_desktop_entry xmaxima xmaxima \
- /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
- "Science;Math;Education"
-
- if use latex; then
- insinto ${TEXMF}/tex/latex/emaxima
- doins interfaces/emacs/emaxima/emaxima.sty
- fi
-
- # do not use dodoc because interfaces can't read compressed files
- # read COPYING before attempt to remove it from dodoc
- insinto /usr/share/${PN}/${PV}/doc
- doins AUTHORS COPYING README README.lisps || die
- dodir /usr/share/doc
- dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
- fi
-}
-
-pkg_preinst() {
- # some lisps do not read compress info files (bug #176411)
- for infofile in "${D}"/usr/share/info/*.bz2 ; do
- bunzip2 "${infofile}"
- done
- for infofile in "${D}"/usr/share/info/*.gz ; do
- gunzip "${infofile}"
- done
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use latex && mktexlsr
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2015-09-03 14:26 Andrey Grozin
0 siblings, 0 replies; 20+ messages in thread
From: Andrey Grozin @ 2015-09-03 14:26 UTC (permalink / raw
To: gentoo-commits
commit: b5c632a81fc9457bd1af77f07c87961deb888bb2
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 14:22:01 2015 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 14:22:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c632a8
sci-mathematics/maxima: version bump
Package-Manager: portage-2.2.20.1
sci-mathematics/maxima/Manifest | 1 +
sci-mathematics/maxima/files/clisp-1.patch | 19 +++
sci-mathematics/maxima/files/clozurecl-2.patch | 27 ++++
sci-mathematics/maxima/files/cmucl-1.patch | 19 +++
sci-mathematics/maxima/files/ecls-2.patch | 35 +++++
sci-mathematics/maxima/files/sbcl-1.patch | 18 +++
sci-mathematics/maxima/maxima-5.37.1.ebuild | 190 +++++++++++++++++++++++++
7 files changed, 309 insertions(+)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 221c53c..edee4ea 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,2 +1,3 @@
DIST maxima-5.34.1.tar.gz 29469851 SHA256 20ca416ca912c8d3d99299f2ef45342a1beb2f077cf501c6a647de46bfdb89b7 SHA512 24a9ce0d2bfb0fa107460bbeec561869f9d3f2ce2623e39ab16b810dbf2712981bbf98ceee9c30f4e70fdec7f918a7743b5fb8cf26b67313e1d367dd8f2a1823 WHIRLPOOL 0f59cfe14391686a543027bb5cab8669439d0e36b016924872662f61e36cf05663480f8a3f942d7deccbe39ec7f45ed77deeb8a3c84241189ac0f1993537c47a
DIST maxima-5.36.1.tar.gz 29615673 SHA256 400bf83000b84d280d75e200e078582fe44f23220824562cc06c589d8a993974 SHA512 10e090230ab408777a1145ad90daef6bf237ba38ae31a654ba4d464e7a27e1f48baac5202ce8fb39e4c04ec9a6c9916ac83a58bd071b676ea5a989ea7db87d4c WHIRLPOOL ee7738085ae9e5b156b89afbf724b3ae5ef70b74550bee43cf3ab763f569d5ac51ea9c0e5aad67070f4b71f480b079aad8e4fd44ded34525a1f84cbeeb2d28b0
+DIST maxima-5.37.1.tar.gz 29952404 SHA256 511477cbdf4645a6abd49596d59ed449ec8e012f90b59b1ddffc783c697bf744 SHA512 523f2768e18e7e368dee63f5f6350afc87c3f5a51ef317b1bf3d9c662c1326a40a5035c09c44ed2e1388d31b5450802b802088e95dc7a3e10343bc55daefd878 WHIRLPOOL 0d7fad832a145d38fc0106540ba17d270da64495b2c739c215c07fcefeba2ecb769e609a2e7c1dd516e58b8e128776f5365bf10273c5031f5750b5c250d78bc2
diff --git a/sci-mathematics/maxima/files/clisp-1.patch b/sci-mathematics/maxima/files/clisp-1.patch
new file mode 100644
index 0000000..9dc8dfd
--- /dev/null
+++ b/sci-mathematics/maxima/files/clisp-1.patch
@@ -0,0 +1,19 @@
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in 2015-09-03 16:08:22.467930422 +0600
+@@ -135,5 +135,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q "" -- "$@"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$@"
+ else
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$@"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$@"
+ fi
+@@ -141,5 +141,5 @@
+ if [ -x "$maxima_image_base" ]; then
+- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q "" -- "$@"
++ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$@"
+ else
+- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$@"
++ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$@"
+ fi
diff --git a/sci-mathematics/maxima/files/clozurecl-2.patch b/sci-mathematics/maxima/files/clozurecl-2.patch
new file mode 100644
index 0000000..5c5189c
--- /dev/null
+++ b/sci-mathematics/maxima/files/clozurecl-2.patch
@@ -0,0 +1,27 @@
+diff -r -U1 maxima-5.37.1.orig/configure.ac maxima-5.37.1/configure.ac
+--- maxima-5.37.1.orig/configure.ac 2015-09-01 02:28:02.000000000 +0600
++++ maxima-5.37.1/configure.ac 2015-09-03 18:11:54.335618720 +0600
+@@ -386,3 +386,3 @@
+ dnl n.b. openmcl_default_name is hardcoded in "with" message
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ AC_ARG_ENABLE(openmcl,
+diff -r -U1 maxima-5.37.1.orig/src/Makefile.am maxima-5.37.1/src/Makefile.am
+--- maxima-5.37.1.orig/src/Makefile.am 2015-08-11 02:44:21.000000000 +0600
++++ maxima-5.37.1/src/Makefile.am 2015-09-03 17:26:12.849734012 +0600
+@@ -338,3 +338,3 @@
+
+-EXECUTEOPENMCL = $(OPENMCL_NAME) -e
++EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e
+ BUILT_FILES += $(OPENMCL_MAXIMA)
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in 2015-09-03 17:22:31.841743306 +0600
+@@ -182,5 +182,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+ else
+- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+ fi
diff --git a/sci-mathematics/maxima/files/cmucl-1.patch b/sci-mathematics/maxima/files/cmucl-1.patch
new file mode 100644
index 0000000..c87a6c9
--- /dev/null
+++ b/sci-mathematics/maxima/files/cmucl-1.patch
@@ -0,0 +1,19 @@
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in 2015-09-03 16:29:30.751877085 +0600
+@@ -152,5 +152,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$@"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$@"
+ else
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$@"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$@"
+ fi
+@@ -158,5 +158,5 @@
+ if [ -x "$maxima_image_base" ]; then
+- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -- "$@"
++ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$@"
+ else
+- exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$@"
++ exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$@"
+ fi
diff --git a/sci-mathematics/maxima/files/ecls-2.patch b/sci-mathematics/maxima/files/ecls-2.patch
new file mode 100644
index 0000000..d9af8c3
--- /dev/null
+++ b/sci-mathematics/maxima/files/ecls-2.patch
@@ -0,0 +1,35 @@
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in 2015-09-03 16:33:30.913866985 +0600
+@@ -188,3 +188,3 @@
+ elif [ "$MAXIMA_LISP" = "ecl" ]; then
+- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -- "$@"
++ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -norc -- "$@"
+
+diff -r -U1 maxima-5.37.1.orig/src/maxima.system maxima-5.37.1/src/maxima.system
+--- maxima-5.37.1.orig/src/maxima.system 2015-09-01 02:26:13.000000000 +0600
++++ maxima-5.37.1/src/maxima.system 2015-09-03 16:42:47.071843596 +0600
+@@ -61,2 +61,10 @@
+ #+ecl
++(defun split-ld-flags-for-ecl (string &aux space)
++ (setf string (string-trim '(#\Space) string))
++ (if (setf space (position #\Space string))
++ (cons (subseq string 0 space)
++ (split-ld-flags-for-ecl (subseq string (1+ space))))
++ (cons string nil)))
++
++#+ecl
+ (defun build-maxima-lib ()
+@@ -77,2 +85,7 @@
+ files)))
++ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
++ :ld-flags
++ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
++ (find-package "MAXIMA")))))
++ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))))
+ (c::build-program "binary-ecl/maxima" :lisp-files obj
+@@ -81,3 +94,3 @@
+ (find-package "MAXIMA")))))
+- (if (and x (not (string= x ""))) (list x)))
++ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
+ :epilogue-code '(progn (require :defsystem)
diff --git a/sci-mathematics/maxima/files/sbcl-1.patch b/sci-mathematics/maxima/files/sbcl-1.patch
new file mode 100644
index 0000000..8899f09
--- /dev/null
+++ b/sci-mathematics/maxima/files/sbcl-1.patch
@@ -0,0 +1,18 @@
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in 2015-09-03 16:22:57.340893630 +0600
+@@ -193,5 +193,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$@"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$@"
+ else
+- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$@"
++ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$@"
+ fi
+diff -r -U1 maxima-5.37.1.orig/src/server.lisp maxima-5.37.1/src/server.lisp
+--- maxima-5.37.1.orig/src/server.lisp 2015-04-10 01:41:59.000000000 +0600
++++ maxima-5.37.1/src/server.lisp 2015-09-03 16:23:47.100891537 +0600
+@@ -10,3 +10,2 @@
+ (eval-when (:compile-toplevel :load-toplevel :execute)
+- #+sbcl (require 'asdf) ;not needed here for a recent SBCL
+ #+sbcl (require 'sb-posix)
diff --git a/sci-mathematics/maxima/maxima-5.37.1.ebuild b/sci-mathematics/maxima/maxima-5.37.1.ebuild
new file mode 100644
index 0000000..a0988d8
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.37.1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=( . . y . . y )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( . . . ecl ccl . )
+# patch file version; . - no patch
+PATCH_V=( 1 1 . 2 2 1 )
+
+IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
+
+# Languages
+LANGS="es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} linguas_${lang}"
+done
+
+RDEPEND="X? ( x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ tk? ( dev-lang/tk:0 ) )
+ latex? ( virtual/latex-base )
+ emacs? ( virtual/emacs
+ latex? ( app-emacs/auctex ) )
+ xemacs? ( app-editors/xemacs
+ latex? ( app-emacs/auctex ) )"
+
+PDEPEND="emacs? ( app-emacs/imaxima )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP="dev-lisp/${LISP}:="
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ if (( ${n} > 0 )); then
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+ fi
+done
+
+# default lisp
+if use arm; then
+ DEF_LISP=2 # gcl
+else
+ DEF_LISP=0 # sbcl
+fi
+
+DEF_DEP="${DEF_DEP} `depends ${DEF_LISP}`"
+
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+ NLISPS=${DEF_LISP}
+ fi
+}
+
+src_prepare() {
+ local n PATCHES v
+ PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 )
+
+ n=${#PATCHES[*]}
+ for ((n--; n >= 0; n--)); do
+ epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
+ done
+
+ n=${#LISPS[*]}
+ for ((n--; n >= 0; n--)); do
+ v=${PATCH_V[${n}]}
+ if [ "${v}" != "." ]; then
+ epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+ fi
+ done
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+ CONF=${LISPS[${n}]}
+ fi
+ CONFS="${CONFS} --enable-${CONF}"
+ done
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "linguas_${lang}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN}
+}
+
+src_install() {
+ docompress -x /usr/share/info
+ emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+ use tk && make_desktop_entry xmaxima xmaxima \
+ /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+ "Science;Math;Education"
+
+ if use latex; then
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+ fi
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README.lisps || die
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
+ fi
+
+ # if we use ecls, build an ecls library for maxima
+ if use ecls; then
+ ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ use latex && mktexlsr
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use latex && mktexlsr
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2015-09-03 18:46 Andrey Grozin
0 siblings, 0 replies; 20+ messages in thread
From: Andrey Grozin @ 2015-09-03 18:46 UTC (permalink / raw
To: gentoo-commits
commit: b4984251d983fd2bab88c967a452a5b251937a87
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 18:42:17 2015 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 18:42:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4984251
sci-mathematics/maxima: fixing a bug in clozurecl maxima
Package-Manager: portage-2.2.20.1
sci-mathematics/maxima/files/db-0.patch | 20 +++
sci-mathematics/maxima/maxima-5.37.1-r1.ebuild | 190 +++++++++++++++++++++++++
2 files changed, 210 insertions(+)
diff --git a/sci-mathematics/maxima/files/db-0.patch b/sci-mathematics/maxima/files/db-0.patch
new file mode 100644
index 0000000..d6cc186
--- /dev/null
+++ b/sci-mathematics/maxima/files/db-0.patch
@@ -0,0 +1,20 @@
+diff -r -U2 maxima-5.37.1.orig/src/db.lisp maxima-5.37.1/src/db.lisp
+--- maxima-5.37.1.orig/src/db.lisp 2015-08-11 01:01:13.000000000 +0600
++++ maxima-5.37.1/src/db.lisp 2015-09-04 00:21:43.596685564 +0600
+@@ -389,10 +389,14 @@
+
+ (defmfun isp (pat)
+- (let ((isp 'unknown))
++ (let ((isp 'unknown) #+ccl (err t))
+ (ignore-errors
+ (setq isp
+ (cond ((truep pat))
+ ((falsep pat) nil)
+- (t 'unknown))))
++ (t 'unknown)))
++ (setq err nil))
++ #+ccl
++ (when err
++ (setq +labs nil))
+ isp))
+
diff --git a/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
new file mode 100644
index 0000000..8f2f164
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=( . . y . . y )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( . . . ecl ccl . )
+# patch file version; . - no patch
+PATCH_V=( 1 1 . 2 2 1 )
+
+IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
+
+# Languages
+LANGS="es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} linguas_${lang}"
+done
+
+RDEPEND="X? ( x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ tk? ( dev-lang/tk:0 ) )
+ latex? ( virtual/latex-base )
+ emacs? ( virtual/emacs
+ latex? ( app-emacs/auctex ) )
+ xemacs? ( app-editors/xemacs
+ latex? ( app-emacs/auctex ) )"
+
+PDEPEND="emacs? ( app-emacs/imaxima )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP="dev-lisp/${LISP}:="
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ if (( ${n} > 0 )); then
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+ fi
+done
+
+# default lisp
+if use arm; then
+ DEF_LISP=2 # gcl
+else
+ DEF_LISP=0 # sbcl
+fi
+
+DEF_DEP="${DEF_DEP} `depends ${DEF_LISP}`"
+
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+ NLISPS=${DEF_LISP}
+ fi
+}
+
+src_prepare() {
+ local n PATCHES v
+ PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 db-0 )
+
+ n=${#PATCHES[*]}
+ for ((n--; n >= 0; n--)); do
+ epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
+ done
+
+ n=${#LISPS[*]}
+ for ((n--; n >= 0; n--)); do
+ v=${PATCH_V[${n}]}
+ if [ "${v}" != "." ]; then
+ epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+ fi
+ done
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+ CONF=${LISPS[${n}]}
+ fi
+ CONFS="${CONFS} --enable-${CONF}"
+ done
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "linguas_${lang}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN}
+}
+
+src_install() {
+ docompress -x /usr/share/info
+ emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+ use tk && make_desktop_entry xmaxima xmaxima \
+ /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+ "Science;Math;Education"
+
+ if use latex; then
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+ fi
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README.lisps || die
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
+ fi
+
+ # if we use ecls, build an ecls library for maxima
+ if use ecls; then
+ ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ use latex && mktexlsr
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use latex && mktexlsr
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2015-12-21 21:08 Ulrich Müller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Müller @ 2015-12-21 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 727022b39e84bcb80ee0b63a1fd3424c83b90b79
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 21:00:34 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 21:08:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727022b3
sci-mathematics/maxima: Install imaxima.
With USE=emacs, install imaxima and byte-compile the elisp files.
This obsoletes app-emacs/imaxima, so block against it.
With USE=-emacs, remove any emacs files installed by the build system.
Bug: 448242
Package-Manager: portage-2.2.26
sci-mathematics/maxima/files/50maxima-gentoo-1.el | 13 ++
sci-mathematics/maxima/maxima-5.37.3-r2.ebuild | 200 ++++++++++++++++++++++
2 files changed, 213 insertions(+)
diff --git a/sci-mathematics/maxima/files/50maxima-gentoo-1.el b/sci-mathematics/maxima/files/50maxima-gentoo-1.el
new file mode 100644
index 0000000..be14dbf
--- /dev/null
+++ b/sci-mathematics/maxima/files/50maxima-gentoo-1.el
@@ -0,0 +1,13 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'maxima-mode "maxima" "Maxima mode" t)
+(autoload 'maxima "maxima" "Maxima interactive" t)
+(autoload 'dbl "dbl" "Make a debugger to run lisp, maxima and or gdb in" t)
+(add-to-list 'auto-mode-alist '("\\.ma?[cx]\\'" . maxima-mode))
+
+;; emaxima mode
+(autoload 'emaxima-mode "emaxima" "EMaxima" t)
+(add-hook 'emaxima-mode-hook 'emaxima-mark-file-as-emaxima)
+
+;; imaxima
+(autoload 'imaxima "imaxima" "Image support for Maxima." t)
+(autoload 'imath-mode "imath" "Interactive Math minor mode." t)
diff --git a/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild b/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild
new file mode 100644
index 0000000..3afffbf
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=( . . y . . y )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( . . . ecl ccl . )
+# patch file version; . - no patch
+PATCH_V=( 1 1 . 2 2 1 )
+
+IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
+
+# Languages
+LANGS="es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} linguas_${lang}"
+done
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+RDEPEND="!app-emacs/imaxima
+ X? ( x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ tk? ( dev-lang/tk:0 ) )
+ latex? ( virtual/latex-base )
+ emacs? ( virtual/emacs
+ latex? ( app-emacs/auctex
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-latexrecommended ) )
+ xemacs? ( app-editors/xemacs
+ latex? ( app-xemacs/auctex ) )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP="dev-lisp/${LISP}:="
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+
+# default lisp
+DEF_LISP=0 # sbcl
+ARM_LISP=2 # gcl
+DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+ NLISPS=${DEF_LISP}
+ fi
+}
+
+src_prepare() {
+ local n PATCHES v
+ PATCHES=( rmaxima-0 wish-1 xdg-utils-0 db-0 )
+
+ n=${#PATCHES[*]}
+ for ((n--; n >= 0; n--)); do
+ epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
+ done
+
+ n=${#LISPS[*]}
+ for ((n--; n >= 0; n--)); do
+ v=${PATCH_V[${n}]}
+ if [ "${v}" != "." ]; then
+ epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+ fi
+ done
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+ CONF=${LISPS[${n}]}
+ fi
+ CONFS="${CONFS} --enable-${CONF}"
+ done
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "linguas_${lang}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN}
+}
+
+src_compile() {
+ emake
+ use emacs && elisp-compile interfaces/emacs/{emaxima,imaxima}/*.el
+}
+
+src_install() {
+ docompress -x /usr/share/info
+ emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+ use tk && make_desktop_entry xmaxima xmaxima \
+ /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+ "Science;Math;Education"
+
+ rm -f "${ED}"/${SITELISP}/${PN}/emaxima.sty
+
+ if use latex; then
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+ fi
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README.lisps
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+ if use emacs; then
+ elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+ insinto /usr/share/${PN}/${PV}/doc/imaxima
+ doins interfaces/emacs/imaxima/README
+ doins -r interfaces/emacs/imaxima/imath-example
+ else
+ # remove any emacs files installed by the build system
+ rm -rf "${ED}"/usr/share/emacs
+ fi
+
+ # if we use ecls, build an ecls library for maxima
+ if use ecls; then
+ ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ use latex && mktexlsr
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use latex && mktexlsr
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2015-12-21 21:08 Ulrich Müller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Müller @ 2015-12-21 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 71971e5abe53b50b83e1617634cd79fe8a49842b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 21:04:13 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 21:08:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71971e5a
sci-mathematics/maxima: Rename emacs site-init file.
Use similar naming scheme as for the patch files.
Package-Manager: portage-2.2.26
.../maxima/files/{50maxima-gentoo.el => 50maxima-gentoo-0.el} | 3 ---
sci-mathematics/maxima/maxima-5.34.1.ebuild | 2 +-
sci-mathematics/maxima/maxima-5.37.3-r1.ebuild | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/sci-mathematics/maxima/files/50maxima-gentoo.el b/sci-mathematics/maxima/files/50maxima-gentoo-0.el
similarity index 91%
rename from sci-mathematics/maxima/files/50maxima-gentoo.el
rename to sci-mathematics/maxima/files/50maxima-gentoo-0.el
index 20c7399..ace2f4f 100644
--- a/sci-mathematics/maxima/files/50maxima-gentoo.el
+++ b/sci-mathematics/maxima/files/50maxima-gentoo-0.el
@@ -1,6 +1,3 @@
-
-;;; maxima site-lisp configuration
-
(add-to-list 'load-path "@SITELISP@")
(autoload 'maxima-mode "maxima" "Maxima mode" t)
(autoload 'maxima "maxima" "Maxima interactive" t)
diff --git a/sci-mathematics/maxima/maxima-5.34.1.ebuild b/sci-mathematics/maxima/maxima-5.34.1.ebuild
index b679a8a..fa91b3d 100644
--- a/sci-mathematics/maxima/maxima-5.34.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.34.1.ebuild
@@ -168,7 +168,7 @@ src_install() {
dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
if use emacs; then
- elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-0.el || die
fi
# if we use ecls, build an ecls library for maxima
diff --git a/sci-mathematics/maxima/maxima-5.37.3-r1.ebuild b/sci-mathematics/maxima/maxima-5.37.3-r1.ebuild
index 85e2150..e71ebf0 100644
--- a/sci-mathematics/maxima/maxima-5.37.3-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.37.3-r1.ebuild
@@ -162,7 +162,7 @@ src_install() {
dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
if use emacs; then
- elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-0.el || die
fi
# if we use ecls, build an ecls library for maxima
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2015-12-23 8:20 Ulrich Müller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Müller @ 2015-12-23 8:20 UTC (permalink / raw
To: gentoo-commits
commit: e88abf1da79f111c81842732f9dcb824d336573b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 08:13:20 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 08:20:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88abf1d
sci-mathematics/maxima: Update Emacs support.
Consolidate "emacs" and "latex" USE flags. Remove the non-functional
"xemacs" flag. Add a configure option to disable Emacs support in the
upstream build system.
Bug: 448242
Package-Manager: portage-2.2.26
sci-mathematics/maxima/files/emacs-0.patch | 32 +++++++++++++++
sci-mathematics/maxima/files/wish-2.patch | 26 ++++++++++++
...ma-5.37.3-r2.ebuild => maxima-5.37.3-r3.ebuild} | 46 +++++++++++-----------
3 files changed, 81 insertions(+), 23 deletions(-)
diff --git a/sci-mathematics/maxima/files/emacs-0.patch b/sci-mathematics/maxima/files/emacs-0.patch
new file mode 100644
index 0000000..8c84149
--- /dev/null
+++ b/sci-mathematics/maxima/files/emacs-0.patch
@@ -0,0 +1,32 @@
+--- maxima-5.37.3.orig/configure.ac
++++ maxima-5.37.3/configure.ac
+@@ -513,6 +513,17 @@
+ fi
+ fi
+
++AC_ARG_ENABLE(emacs,
++ [ --enable-emacs Emacs support],
++ [case "${enableval}" in
++ yes) enable_emacs=true ;;
++ no) enable_emacs=false ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-emacs) ;;
++ esac],
++ [enable_emacs=true])
++
++AM_CONDITIONAL(WANT_EMACS, test x$enable_emacs = xtrue)
++
+ dnl xgettext
+ AC_ARG_ENABLE(gettext,
+ [ --enable-gettext Locale support],
+--- maxima-5.37.3.orig/interfaces/Makefile.am
++++ maxima-5.37.3/interfaces/Makefile.am
+@@ -1,5 +1,8 @@
++if WANT_EMACS
++ MAYBE_EMACS = emacs
++endif
+ if WANT_TK
+ MAYBE_XMAXIMA = xmaxima
+ endif
+-SUBDIRS = emacs $(MAYBE_XMAXIMA)
++SUBDIRS = $(MAYBE_EMACS) $(MAYBE_XMAXIMA)
+ EXTRA_DIST = bin/xmaxima.iss
diff --git a/sci-mathematics/maxima/files/wish-2.patch b/sci-mathematics/maxima/files/wish-2.patch
new file mode 100644
index 0000000..5942733
--- /dev/null
+++ b/sci-mathematics/maxima/files/wish-2.patch
@@ -0,0 +1,26 @@
+--- maxima-5.37.3.orig/configure.ac
++++ maxima-5.37.3/configure.ac
+@@ -991,6 +991,11 @@
+ [ --with-wish=<prog> Use <prog> for Tk wish shell (default wish)],
+- [WISH="${withval}"],
+- [WISH="wish"])
++ [],
++ [with_wish="wish"])
++case "${with_wish}" in
++ no) WISH="none" ;;
++ yes) WISH="wish" ;;
++ *) WISH="${with_wish}" ;;
++esac
+ AC_SUBST(WISH)
+-
++AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno)
+
+--- maxima-5.37.3.orig/interfaces/Makefile.am
++++ maxima-5.37.3/interfaces/Makefile.am
+@@ -1,2 +1,5 @@
+-SUBDIRS = emacs xmaxima
++if WANT_TK
++ MAYBE_XMAXIMA = xmaxima
++endif
++SUBDIRS = emacs $(MAYBE_XMAXIMA)
+ EXTRA_DIST = bin/xmaxima.iss
diff --git a/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild b/sci-mathematics/maxima/maxima-5.37.3-r3.ebuild
similarity index 86%
rename from sci-mathematics/maxima/maxima-5.37.3-r2.ebuild
rename to sci-mathematics/maxima/maxima-5.37.3-r3.ebuild
index 3afffbf..7c1c8e6 100644
--- a/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.37.3-r3.ebuild
@@ -23,7 +23,7 @@ CONF_FLAG=( . . . ecl ccl . )
# patch file version; . - no patch
PATCH_V=( 1 1 . 2 2 1 )
-IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
+IUSE="emacs tk nls unicode X ${LISPS[*]}"
# Languages
LANGS="es pt pt_BR"
@@ -36,13 +36,11 @@ RDEPEND="!app-emacs/imaxima
X? ( x11-misc/xdg-utils
sci-visualization/gnuplot[gd]
tk? ( dev-lang/tk:0 ) )
- latex? ( virtual/latex-base )
emacs? ( virtual/emacs
- latex? ( app-emacs/auctex
- app-text/ghostscript-gpl
- dev-texlive/texlive-latexrecommended ) )
- xemacs? ( app-editors/xemacs
- latex? ( app-xemacs/auctex ) )"
+ virtual/latex-base
+ app-emacs/auctex
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-latexrecommended )"
# generating lisp dependencies
depends() {
@@ -97,7 +95,7 @@ pkg_setup() {
src_prepare() {
local n PATCHES v
- PATCHES=( rmaxima-0 wish-1 xdg-utils-0 db-0 )
+ PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-0 db-0 )
n=${#PATCHES[*]}
for ((n--; n >= 0; n--)); do
@@ -140,7 +138,10 @@ src_configure() {
done
fi
- econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN}
+ econf ${CONFS} \
+ $(use_with tk wish) \
+ $(use_enable emacs) \
+ --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
}
src_compile() {
@@ -156,13 +157,6 @@ src_install() {
/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
"Science;Math;Education"
- rm -f "${ED}"/${SITELISP}/${PN}/emaxima.sty
-
- if use latex; then
- insinto ${TEXMF}/tex/latex/emaxima
- doins interfaces/emacs/emaxima/emaxima.sty
- fi
-
# do not use dodoc because interfaces can't read compressed files
# read COPYING before attempt to remove it from dodoc
insinto /usr/share/${PN}/${PV}/doc
@@ -173,12 +167,14 @@ src_install() {
if use emacs; then
elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+ rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+
insinto /usr/share/${PN}/${PV}/doc/imaxima
doins interfaces/emacs/imaxima/README
doins -r interfaces/emacs/imaxima/imath-example
- else
- # remove any emacs files installed by the build system
- rm -rf "${ED}"/usr/share/emacs
fi
# if we use ecls, build an ecls library for maxima
@@ -190,11 +186,15 @@ src_install() {
}
pkg_postinst() {
- use emacs && elisp-site-regen
- use latex && mktexlsr
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
}
pkg_postrm() {
- use emacs && elisp-site-regen
- use latex && mktexlsr
+ if use emacs; then
+ lisp-site-regen
+ mktexlsr
+ fi
}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2016-04-03 8:37 Andrey Grozin
0 siblings, 0 replies; 20+ messages in thread
From: Andrey Grozin @ 2016-04-03 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 0c29cc6f7cc68ea14415b8626480f197fe10386b
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 3 08:27:01 2016 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Apr 3 08:27:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c29cc6f
sci-mathematics/maxima: bump to 5.38.0
Package-Manager: portage-2.2.28
sci-mathematics/maxima/Manifest | 1 +
sci-mathematics/maxima/files/sbcl-2.patch | 13 ++
sci-mathematics/maxima/maxima-5.38.0.ebuild | 209 ++++++++++++++++++++++++++++
3 files changed, 223 insertions(+)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 321acdc..55912ef 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,2 +1,3 @@
DIST maxima-5.34.1.tar.gz 29469851 SHA256 20ca416ca912c8d3d99299f2ef45342a1beb2f077cf501c6a647de46bfdb89b7 SHA512 24a9ce0d2bfb0fa107460bbeec561869f9d3f2ce2623e39ab16b810dbf2712981bbf98ceee9c30f4e70fdec7f918a7743b5fb8cf26b67313e1d367dd8f2a1823 WHIRLPOOL 0f59cfe14391686a543027bb5cab8669439d0e36b016924872662f61e36cf05663480f8a3f942d7deccbe39ec7f45ed77deeb8a3c84241189ac0f1993537c47a
DIST maxima-5.37.3.tar.gz 29964644 SHA256 8bd5dcd672f37ea752385475fc64f8c87dfa29bbe34766cbcb87b1f63dfb5934 SHA512 a337afdc779abc88297e7dadf8af949da881c91a237e85ed654046c98692f2446c0b2ddb8c81b637cb7a35dd3b712832aadc5dedcaa8b681496dae4835c9d0f1 WHIRLPOOL d24eeb7f39f88b9f542e28db28b8f249b1badc059fe744a83209b102b8f776131e4b2f91c28949f4f6de8323f163cb0a6be9bafc3c0ef058a73e9b543622e976
+DIST maxima-5.38.0.tar.gz 38502746 SHA256 f7343fcf503e9bb0ad8ad8f149b71f01f9bb9c72b57ad03f5a9d210c74d4fc6b SHA512 c7cbb777f01c540bad95200a7a7a4a60d17d1f9afe03647a8af78e40a3403be771e8cb305bcac4d636e2247a9994f22071b4ece2df91408d9ecfc29159ef6c58 WHIRLPOOL f2cb2b7fef60b750b120daea38403bcefdc81d825121d2ad2428784bb2dc8c18beaacc927de5dbfa29db3c139edf5d20e17e36dd620a8636600a06210943dab4
diff --git a/sci-mathematics/maxima/files/sbcl-2.patch b/sci-mathematics/maxima/files/sbcl-2.patch
new file mode 100644
index 0000000..9fedc74
--- /dev/null
+++ b/sci-mathematics/maxima/files/sbcl-2.patch
@@ -0,0 +1,13 @@
+diff -r -U2 maxima-5.38.0.orig/src/maxima.in maxima-5.38.0/src/maxima.in
+--- maxima-5.38.0.orig/src/maxima.in 2016-04-02 23:42:45.000000000 +0200
++++ maxima-5.38.0/src/maxima.in 2016-04-03 09:07:46.317809312 +0200
+@@ -195,7 +195,7 @@
+ # switch --dynamic-space-size in order to do so.
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$@"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$@"
+ else
+- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$@"
++ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$@"
+ fi
+
diff --git a/sci-mathematics/maxima/maxima-5.38.0.ebuild b/sci-mathematics/maxima/maxima-5.38.0.ebuild
new file mode 100644
index 0000000..6a4afe8
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.38.0.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=( . . y . . y )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( . . . ecl ccl . )
+# patch file version; . - no patch
+PATCH_V=( 2 1 . 2 2 1 )
+
+IUSE="emacs tk nls unicode X ${LISPS[*]}"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} linguas_${lang}"
+done
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+RDEPEND="!app-emacs/imaxima
+ X? ( x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ tk? ( dev-lang/tk:0 ) )
+ emacs? ( virtual/emacs
+ virtual/latex-base
+ app-emacs/auctex
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-latexrecommended )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP="dev-lisp/${LISP}:="
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+
+# default lisp
+DEF_LISP=0 # sbcl
+ARM_LISP=2 # gcl
+DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ use arm && DEF_LISP=${ARM_LISP}
+ ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+ NLISPS=${DEF_LISP}
+ fi
+}
+
+src_prepare() {
+ local n PATCHES v
+ PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-0 )
+
+ n=${#PATCHES[*]}
+ for ((n--; n >= 0; n--)); do
+ epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
+ done
+
+ n=${#LISPS[*]}
+ for ((n--; n >= 0; n--)); do
+ v=${PATCH_V[${n}]}
+ if [ "${v}" != "." ]; then
+ epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+ fi
+ done
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+ CONF=${LISPS[${n}]}
+ fi
+ CONFS="${CONFS} --enable-${CONF}"
+ done
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "linguas_${lang}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ econf ${CONFS} \
+ $(use_with tk wish) \
+ $(use_enable emacs) \
+ --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+ emake
+ if use emacs; then
+ pushd interfaces/emacs/emaxima > /dev/null
+ elisp-compile *.el
+ popd > /dev/null
+ pushd interfaces/emacs/imaxima > /dev/null
+ BYTECOMPFLAGS="-L . -L ../emaxima"
+ elisp-compile *.el
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ docompress -x /usr/share/info
+ emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+ use tk && make_desktop_entry xmaxima xmaxima \
+ /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+ "Science;Math;Education"
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README.lisps
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+ if use emacs; then
+ elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+ rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+
+ insinto /usr/share/${PN}/${PV}/doc/imaxima
+ doins interfaces/emacs/imaxima/README
+ doins -r interfaces/emacs/imaxima/imath-example
+ fi
+
+ # if we use ecls, build an ecls library for maxima
+ if use ecls; then
+ ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
+
+pkg_postrm() {
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2017-01-13 20:35 Ulrich Müller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Müller @ 2017-01-13 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 15e36e1852ee097c668f686a033f4ed22695f4d5
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 19:29:55 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 20:35:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e36e18
sci-mathematics/maxima: Remove old.
maxima-5.34.1 is the last reverse dependency blocking removal of
app-emacs/imaxima.
Bug: 448242
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-mathematics/maxima/Manifest | 1 -
sci-mathematics/maxima/files/50maxima-gentoo-0.el | 9 --
sci-mathematics/maxima/files/clisp-0.patch | 19 ---
sci-mathematics/maxima/files/clozurecl-0.patch | 27 ----
sci-mathematics/maxima/files/cmucl-0.patch | 27 ----
sci-mathematics/maxima/files/ecls-1.patch | 37 -----
sci-mathematics/maxima/files/imaxima-0.patch | 5 -
sci-mathematics/maxima/files/sbcl-0.patch | 26 ---
sci-mathematics/maxima/files/wish-0.patch | 28 ----
sci-mathematics/maxima/maxima-5.34.1.ebuild | 186 ----------------------
10 files changed, 365 deletions(-)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 9f316ad..bd89940 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,4 +1,3 @@
-DIST maxima-5.34.1.tar.gz 29469851 SHA256 20ca416ca912c8d3d99299f2ef45342a1beb2f077cf501c6a647de46bfdb89b7 SHA512 24a9ce0d2bfb0fa107460bbeec561869f9d3f2ce2623e39ab16b810dbf2712981bbf98ceee9c30f4e70fdec7f918a7743b5fb8cf26b67313e1d367dd8f2a1823 WHIRLPOOL 0f59cfe14391686a543027bb5cab8669439d0e36b016924872662f61e36cf05663480f8a3f942d7deccbe39ec7f45ed77deeb8a3c84241189ac0f1993537c47a
DIST maxima-5.37.3.tar.gz 29964644 SHA256 8bd5dcd672f37ea752385475fc64f8c87dfa29bbe34766cbcb87b1f63dfb5934 SHA512 a337afdc779abc88297e7dadf8af949da881c91a237e85ed654046c98692f2446c0b2ddb8c81b637cb7a35dd3b712832aadc5dedcaa8b681496dae4835c9d0f1 WHIRLPOOL d24eeb7f39f88b9f542e28db28b8f249b1badc059fe744a83209b102b8f776131e4b2f91c28949f4f6de8323f163cb0a6be9bafc3c0ef058a73e9b543622e976
DIST maxima-5.38.1.tar.gz 38641257 SHA256 0e866536ab5847ec045ba013570f80f36206ca6ce07a5d13987010bcb321c6dc SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9 WHIRLPOOL 443ab032e784e4e2c37274dc3b1635acd9ede08af7863793f93b2f8fdc10e9cce8d4b1a5e98df9a6486fe97e082fb4030fbb3208939ab627f7ca333de7c224b8
DIST maxima-5.39.0.tar.gz 38652090 SHA256 f58ff98013fcaa37d8661b941672c38db58f982f082d6cfcca1f1b5fac7d71b3 SHA512 393ade47fc3832ee44df7bf0c3bd2e501755167ec0f02d50d5876e7cf54fe682f2ebf2511290fa498d174e55961451e61ea5c1c5f6e5f9e6d04ad73d45a5d2a9 WHIRLPOOL 35c7e4acf7933c11562ade2ce30b9c3865a052fc13f9880502165313aae66925aff44cc9d70666001d0378ef14b2e0bf6bc2faeb258b6d50e558b9e043cd972c
diff --git a/sci-mathematics/maxima/files/50maxima-gentoo-0.el b/sci-mathematics/maxima/files/50maxima-gentoo-0.el
deleted file mode 100644
index ace2f4f..00000000
--- a/sci-mathematics/maxima/files/50maxima-gentoo-0.el
+++ /dev/null
@@ -1,9 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'maxima-mode "maxima" "Maxima mode" t)
-(autoload 'maxima "maxima" "Maxima interactive" t)
-(autoload 'dbl "dbl" "Make a debugger to run lisp, maxima and or gdb in" t)
-(add-to-list 'auto-mode-alist '("\\.ma?[cx]\\'" . maxima-mode))
-
-;; emaxima mode
-(autoload 'emaxima-mode "emaxima" "EMaxima" t)
-(add-hook 'emaxima-mode-hook 'emaxima-mark-file-as-emaxima)
diff --git a/sci-mathematics/maxima/files/clisp-0.patch b/sci-mathematics/maxima/files/clisp-0.patch
deleted file mode 100644
index 7e65c40..00000000
--- a/sci-mathematics/maxima/files/clisp-0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in
---- maxima-5.30.0.orig/src/maxima.in 2012-12-04 12:54:50.000000000 +0700
-+++ maxima-5.30.0/src/maxima.in 2013-04-13 13:07:03.094128196 +0700
-@@ -138,5 +138,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -144,5 +144,5 @@
- if [ -x "$maxima_image_base" ]; then
-- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
diff --git a/sci-mathematics/maxima/files/clozurecl-0.patch b/sci-mathematics/maxima/files/clozurecl-0.patch
deleted file mode 100644
index d5afe95..00000000
--- a/sci-mathematics/maxima/files/clozurecl-0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -r -U1 maxima-5.30.0.orig/configure.in maxima-5.30.0/configure.in
---- maxima-5.30.0.orig/configure.in 2013-04-03 02:13:30.000000000 +0700
-+++ maxima-5.30.0/configure.in 2013-04-13 12:42:16.645751903 +0700
-@@ -351,3 +351,3 @@
- dnl n.b. openmcl_default_name is hardcoded in "with" message
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- AC_ARG_ENABLE(openmcl,
-diff -r -U1 maxima-5.30.0.orig/src/Makefile.am maxima-5.30.0/src/Makefile.am
---- maxima-5.30.0.orig/src/Makefile.am 2013-03-23 08:32:07.000000000 +0700
-+++ maxima-5.30.0/src/Makefile.am 2013-04-13 12:49:34.911159093 +0700
-@@ -304,3 +304,3 @@
- if OPENMCL
--EXECUTEOPENMCL = $(OPENMCL_NAME) -e
-+EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e
- all-local: sharefiles.mk $(OPENMCL_MAXIMA)
-diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in
---- maxima-5.30.0.orig/src/maxima.in 2012-12-04 12:54:50.000000000 +0700
-+++ maxima-5.30.0/src/maxima.in 2013-04-13 12:46:59.247013957 +0700
-@@ -185,5 +185,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
diff --git a/sci-mathematics/maxima/files/cmucl-0.patch b/sci-mathematics/maxima/files/cmucl-0.patch
deleted file mode 100644
index 73ebd34..00000000
--- a/sci-mathematics/maxima/files/cmucl-0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -r -U1 maxima-5.30.0.orig/src/Makefile.am maxima-5.30.0/src/Makefile.am
---- maxima-5.30.0.orig/src/Makefile.am 2013-03-23 08:32:07.000000000 +0700
-+++ maxima-5.30.0/src/Makefile.am 2013-04-13 13:12:37.521437190 +0700
-@@ -77,3 +77,3 @@
- if CMUCL
--EXECUTECMUCL = $(CMUCL_NAME) -noinit -batch
-+EXECUTECMUCL = $(CMUCL_NAME) -nositeinit -noinit -batch
- # Newer versions of CMUCL have an INTL package that is compatible with
-diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in
---- maxima-5.30.0.orig/src/maxima.in 2012-12-04 12:54:50.000000000 +0700
-+++ maxima-5.30.0/src/maxima.in 2013-04-13 13:11:26.647371277 +0700
-@@ -155,5 +155,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-@@ -161,5 +161,5 @@
- if [ -x "$maxima_image_base" ]; then
-- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
diff --git a/sci-mathematics/maxima/files/ecls-1.patch b/sci-mathematics/maxima/files/ecls-1.patch
deleted file mode 100644
index 36e9af1..00000000
--- a/sci-mathematics/maxima/files/ecls-1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in
---- maxima-5.30.0.orig/src/maxima.in 2012-12-04 12:54:50.000000000 +0700
-+++ maxima-5.30.0/src/maxima.in 2013-04-13 12:57:12.037579805 +0700
-@@ -191,3 +191,3 @@
- elif [ "$MAXIMA_LISP" = "ecl" ]; then
-- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -norc -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-
-diff -r -U1 maxima-5.30.0.orig/src/maxima.system maxima-5.30.0/src/maxima.system
---- maxima-5.30.0.orig/src/maxima.system 2013-03-23 08:32:08.000000000 +0700
-+++ maxima-5.30.0/src/maxima.system 2013-04-13 12:59:54.086730845 +0700
-@@ -61,2 +61,10 @@
- #+ecl
-+(defun split-ld-flags-for-ecl (string &aux space)
-+ (setf string (string-trim '(#\Space) string))
-+ (if (setf space (position #\Space string))
-+ (cons (subseq string 0 space)
-+ (split-ld-flags-for-ecl (subseq string (1+ space))))
-+ (cons string nil)))
-+
-+#+ecl
- (defun build-maxima-lib ()
-@@ -77,7 +85,12 @@
- files)))
-+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
-+ :ld-flags
-+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
-+ (find-package "MAXIMA")))))
-+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))))
- (c::build-program "binary-ecl/maxima" :lisp-files obj
- :ld-flags
- (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
- (find-package "MAXIMA")))))
-- (if (and x (not (string= x ""))) (list x)))
-+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
- :epilogue-code '(progn (require :defsystem)
-
diff --git a/sci-mathematics/maxima/files/imaxima-0.patch b/sci-mathematics/maxima/files/imaxima-0.patch
deleted file mode 100644
index fe607b2..00000000
--- a/sci-mathematics/maxima/files/imaxima-0.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- interfaces/emacs/Makefile.am.orig 2010-02-01 22:11:44.809941160 +1300
-+++ interfaces/emacs/Makefile.am 2010-02-01 22:12:06.608062346 +1300
-@@ -1 +1 @@
--SUBDIRS = emaxima misc imaxima
-+SUBDIRS = emaxima misc
diff --git a/sci-mathematics/maxima/files/sbcl-0.patch b/sci-mathematics/maxima/files/sbcl-0.patch
deleted file mode 100644
index 5c2bdf7..00000000
--- a/sci-mathematics/maxima/files/sbcl-0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -r -U1 maxima-5.30.0.orig/src/Makefile.am maxima-5.30.0/src/Makefile.am
---- maxima-5.30.0.orig/src/Makefile.am 2013-03-23 08:32:07.000000000 +0700
-+++ maxima-5.30.0/src/Makefile.am 2013-04-13 14:36:39.977014432 +0700
-@@ -199,3 +199,3 @@
- if SBCL
--EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --eval
-+EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --no-sysinit --no-userinit --eval
- all-local: sharefiles.mk $(SBCL_MAXIMA)
-diff -r -U1 maxima-5.30.0.orig/src/maxima.in maxima-5.30.0/src/maxima.in
---- maxima-5.30.0.orig/src/maxima.in 2012-12-04 12:54:50.000000000 +0700
-+++ maxima-5.30.0/src/maxima.in 2013-04-13 14:36:39.977014432 +0700
-@@ -196,5 +196,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- else
-- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
-+ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- fi
-diff -r -U1 maxima-5.30.0.orig/src/server.lisp maxima-5.30.0/src/server.lisp
---- maxima-5.30.0.orig/src/server.lisp 2012-11-19 04:40:51.000000000 +0700
-+++ maxima-5.30.0/src/server.lisp 2013-04-13 14:37:19.937051659 +0700
-@@ -10,3 +10,2 @@
- (eval-when (:compile-toplevel :load-toplevel :execute)
-- #+sbcl (require 'asdf) ;not needed here for a recent SBCL
- #+sbcl (require 'sb-posix)
diff --git a/sci-mathematics/maxima/files/wish-0.patch b/sci-mathematics/maxima/files/wish-0.patch
deleted file mode 100644
index 6fcb0d9..00000000
--- a/sci-mathematics/maxima/files/wish-0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
---- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
-+++ maxima-5.23.1//configure.in 2011-01-16 21:00:16.000000000 +0600
-@@ -777,6 +777,11 @@
- [ --with-wish=<prog> Use <prog> for Tk wish shell (default wish)],
-- [WISH="${withval}"],
-- [WISH="wish"])
-+ [],
-+ [with_wish="wish"])
-+case "${with_wish}" in
-+ no) WISH="none" ;;
-+ yes) WISH="wish" ;;
-+ *) WISH="${with_wish}" ;;
-+esac
- AC_SUBST(WISH)
--
-+AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno)
-
-diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am
---- maxima-5.23.1.orig//interfaces/Makefile.am 2004-04-28 23:34:59.000000000 +0700
-+++ maxima-5.23.1//interfaces/Makefile.am 2011-01-16 20:41:38.000000000 +0600
-@@ -1,2 +1,6 @@
-+if WANT_TK
- SUBDIRS = emacs xmaxima
-+else
-+SUBDIRS = emacs
-+endif
- EXTRA_DIST = bin/xmaxima.iss
diff --git a/sci-mathematics/maxima/maxima-5.34.1.ebuild b/sci-mathematics/maxima/maxima-5.34.1.ebuild
deleted file mode 100644
index 4843446..00000000
--- a/sci-mathematics/maxima/maxima-5.34.1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Supported lisps
-LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
-# <lisp> supports readline: . - no, y - yes
-SUPP_RL=( . . y . . y )
-# . - just --enable-<lisp>, <flag> - --enable-<flag>
-CONF_FLAG=( . . . ecl ccl . )
-# patch file version; . - no patch
-PATCH_V=( 0 0 . 1 0 0 )
-
-IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
-
-# Languages
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
- IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND="X? ( x11-misc/xdg-utils
- sci-visualization/gnuplot[gd]
- tk? ( dev-lang/tk:0 ) )
- latex? ( virtual/latex-base )
- emacs? ( virtual/emacs
- latex? ( app-emacs/auctex ) )
- xemacs? ( app-editors/xemacs
- latex? ( app-emacs/auctex ) )"
-
-PDEPEND="emacs? ( app-emacs/imaxima )"
-
-# generating lisp dependencies
-depends() {
- local LISP DEP
- LISP=${LISPS[$1]}
- DEP="dev-lisp/${LISP}:="
- if [ "${SUPP_RL[$1]}" = "." ]; then
- DEP="${DEP} app-misc/rlwrap"
- fi
- echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
- LISP=${LISPS[${n}]}
- RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
- if (( ${n} > 0 )); then
- DEF_DEP="${DEF_DEP} !${LISP}? ( "
- fi
-done
-
-# default lisp
-DEF_LISP=0 # sbcl
-
-DEF_DEP="${DEF_DEP} `depends ${DEF_LISP}`"
-
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
- DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
- ${DEF_DEP}"
-
-DEPEND="${RDEPEND}
- sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
- local n=${#LISPS[*]}
-
- for ((n--; n >= 0; n--)); do
- use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
- done
-
- if [ -z "${NLISPS}" ]; then
- ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
- NLISPS=${DEF_LISP}
- fi
-}
-
-src_prepare() {
- local n PATCHES v
- PATCHES=( imaxima-0 rmaxima-0 wish-0 xdg-utils-0 )
-
- n=${#PATCHES[*]}
- for ((n--; n >= 0; n--)); do
- epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
- done
-
- n=${#LISPS[*]}
- for ((n--; n >= 0; n--)); do
- v=${PATCH_V[${n}]}
- if [ "${v}" != "." ]; then
- epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
- fi
- done
-
- # bug #343331
- rm share/Makefile.in || die
- rm src/Makefile.in || die
- touch src/*.mk
- touch src/Makefile.am
- eautoreconf
-}
-
-src_configure() {
- local CONFS CONF n lang
- for n in ${NLISPS}; do
- CONF=${CONF_FLAG[${n}]}
- if [ ${CONF} = . ]; then
- CONF=${LISPS[${n}]}
- fi
- CONFS="${CONFS} --enable-${CONF}"
- done
-
- # enable existing translated doc
- if use nls; then
- for lang in ${LANGS}; do
- if use "linguas_${lang}"; then
- CONFS="${CONFS} --enable-lang-${lang}"
- use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
- fi
- done
- fi
-
- econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN}
-}
-
-src_install() {
- docompress -x /usr/share/info
- emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
- use tk && make_desktop_entry xmaxima xmaxima \
- /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
- "Science;Math;Education"
-
- if use latex; then
- insinto ${TEXMF}/tex/latex/emaxima
- doins interfaces/emacs/emaxima/emaxima.sty
- fi
-
- # do not use dodoc because interfaces can't read compressed files
- # read COPYING before attempt to remove it from dodoc
- insinto /usr/share/${PN}/${PV}/doc
- doins AUTHORS COPYING README README.lisps || die
- dodir /usr/share/doc
- dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-0.el || die
- fi
-
- # if we use ecls, build an ecls library for maxima
- if use ecls; then
- ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
- insinto "${ECLLIB#${EPREFIX}}"
- doins src/binary-ecl/maxima.fas
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use latex && mktexlsr
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use latex && mktexlsr
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2018-09-05 15:26 Andrey Grozin
0 siblings, 0 replies; 20+ messages in thread
From: Andrey Grozin @ 2018-09-05 15:26 UTC (permalink / raw
To: gentoo-commits
commit: 0547f4e74b206aa4fc02746df0e929a3b8777d19
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 5 15:26:17 2018 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Wed Sep 5 15:26:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0547f4e7
sci-mathematics/maxima: be compatible with emacs-27
add the upstream patch
bump to eapi 6
Closes: https://bugs.gentoo.org/664848
Package-Manager: Portage-2.3.41, Repoman-2.3.9
sci-mathematics/maxima/files/emacs-27.patch | 10 ++
sci-mathematics/maxima/files/xdg-utils-1.patch | 31 ++++
sci-mathematics/maxima/maxima-5.41.0-r2.ebuild | 212 +++++++++++++++++++++++++
3 files changed, 253 insertions(+)
diff --git a/sci-mathematics/maxima/files/emacs-27.patch b/sci-mathematics/maxima/files/emacs-27.patch
new file mode 100644
index 00000000000..ded11659900
--- /dev/null
+++ b/sci-mathematics/maxima/files/emacs-27.patch
@@ -0,0 +1,10 @@
+diff -r -U2 maxima-5.41.0.orig/interfaces/emacs/imaxima/imaxima.el maxima-5.41.0/interfaces/emacs/imaxima/imaxima.el
+--- maxima-5.41.0.orig/interfaces/emacs/imaxima/imaxima.el 2016-04-03 03:42:45.000000000 +0600
++++ maxima-5.41.0/interfaces/emacs/imaxima/imaxima.el 2018-09-05 20:29:46.843231210 +0700
+@@ -528,5 +528,5 @@
+ (set-process-filter imaxima-gs-process 'imaxima-gs-filter)
+ (imaxima-gs-wait)
+- (process-kill-without-query imaxima-gs-process nil)
++ (set-process-query-on-exit-flag imaxima-gs-process nil)
+ (unless (eq (process-status imaxima-gs-process) 'run)
+ (setq output (shell-command-to-string (concat imaxima-gs-program " -h")))
diff --git a/sci-mathematics/maxima/files/xdg-utils-1.patch b/sci-mathematics/maxima/files/xdg-utils-1.patch
new file mode 100644
index 00000000000..4150eb52cb9
--- /dev/null
+++ b/sci-mathematics/maxima/files/xdg-utils-1.patch
@@ -0,0 +1,31 @@
+diff -r -U2 maxima-5.41.0.orig/interfaces/emacs/misc/bookmode.el maxima-5.41.0/interfaces/emacs/misc/bookmode.el
+--- maxima-5.41.0.orig/interfaces/emacs/misc/bookmode.el 2017-05-29 05:30:43.000000000 +0700
++++ maxima-5.41.0/interfaces/emacs/misc/bookmode.el 2018-09-05 20:53:02.518172515 +0700
+@@ -681,5 +681,5 @@
+ (and tem
+ (list (concat "View "(nth 1 tem))
+- 'call-process "ghostview" nil nil nil
++ 'call-process "xdg-open" nil nil nil
+ (expand-file-name(nth 1 tem))
+ ))
+@@ -706,5 +706,5 @@
+ (cond ((looking-at "%PS") "")
+ (t "gzip -dc | "))
+- "ghostview -")
++ "xdg-open -")
+
+ )))
+diff -r -U2 maxima-5.41.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl maxima-5.41.0/interfaces/xmaxima/Tkmaxima/Constants.tcl
+--- maxima-5.41.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl 2016-04-03 03:42:45.000000000 +0600
++++ maxima-5.41.0/interfaces/xmaxima/Tkmaxima/Constants.tcl 2018-09-05 20:55:25.180166516 +0700
+@@ -154,7 +154,7 @@
+ image/png netmath
+ image/jpeg netmath
+- application/postscript "ghostview -safer %s"
+- application/pdf "acroread %s"
+- application/x-dvi "xdvi %s"
++ application/postscript "xdg-open %s"
++ application/pdf "xdg-open %s"
++ application/x-dvi "xdg-open %s"
+ }
+ set maxima_priv(imagecounter) 0
diff --git a/sci-mathematics/maxima/maxima-5.41.0-r2.ebuild b/sci-mathematics/maxima/maxima-5.41.0-r2.ebuild
new file mode 100644
index 00000000000..c09441ad802
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.41.0-r2.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common eutils xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=( . . y . . y )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( . . . ecl ccl . )
+# patch file version; . - no patch
+PATCH_V=( 2 1 . 2 2 1 )
+
+IUSE="emacs tk nls unicode X ${LISPS[*]}"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+RDEPEND="!app-emacs/imaxima
+ X? ( x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ tk? ( dev-lang/tk:0 ) )
+ emacs? ( virtual/emacs
+ virtual/latex-base
+ app-emacs/auctex
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-latexrecommended )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP="dev-lisp/${LISP}:="
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+
+# default lisp
+DEF_LISP=0 # sbcl
+ARM_LISP=2 # gcl
+DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ use arm && DEF_LISP=${ARM_LISP}
+ ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+ NLISPS=${DEF_LISP}
+ fi
+}
+
+src_prepare() {
+ local n PATCHES v
+ PATCHES=( emacs-0 emacs-27 rmaxima-0 wish-2 xdg-utils-1 )
+
+ n=${#PATCHES[*]}
+ for ((n--; n >= 0; n--)); do
+ eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
+ done
+
+ n=${#LISPS[*]}
+ for ((n--; n >= 0; n--)); do
+ v=${PATCH_V[${n}]}
+ if [ "${v}" != "." ]; then
+ eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+ fi
+ done
+
+ eapply_user
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+ CONF=${LISPS[${n}]}
+ fi
+ CONFS="${CONFS} --enable-${CONF}"
+ done
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "l10n_${lang/_/-}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ econf ${CONFS} \
+ $(use_with tk wish) \
+ $(use_enable emacs) \
+ --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+ emake
+ if use emacs; then
+ pushd interfaces/emacs/emaxima > /dev/null
+ elisp-compile *.el
+ popd > /dev/null
+ pushd interfaces/emacs/imaxima > /dev/null
+ BYTECOMPFLAGS="-L . -L ../emaxima"
+ elisp-compile *.el
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ docompress -x /usr/share/info
+ emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+ use tk && make_desktop_entry xmaxima xmaxima \
+ /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+ "Science;Math;Education"
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README.lisps
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+ if use emacs; then
+ elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+ rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+
+ insinto /usr/share/${PN}/${PV}/doc/imaxima
+ doins interfaces/emacs/imaxima/README
+ doins -r interfaces/emacs/imaxima/imath-example
+ fi
+
+ # if we use ecls, build an ecls library for maxima
+ if use ecls; then
+ ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2018-10-01 16:06 Andrey Grozin
0 siblings, 0 replies; 20+ messages in thread
From: Andrey Grozin @ 2018-10-01 16:06 UTC (permalink / raw
To: gentoo-commits
commit: e671c6b407b19d81a63ece43e98f5c507594e96b
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 1 16:05:52 2018 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Mon Oct 1 16:05:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e671c6b4
sci-mathematics/maxima: bump to 5.42.0
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
Package-Manager: Portage-2.3.41, Repoman-2.3.9
sci-mathematics/maxima/Manifest | 1 +
sci-mathematics/maxima/files/ecls-3.patch | 48 +++++++
sci-mathematics/maxima/maxima-5.42.0.ebuild | 212 ++++++++++++++++++++++++++++
3 files changed, 261 insertions(+)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 47cab5b50ef..76d4d1d3864 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,2 +1,3 @@
DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
DIST maxima-5.41.0.tar.gz 41540226 BLAKE2B ff726044c9026bc58d04832fa6382146ed7e7d61d801fa7131b1e7e2ed386b99e238e039481697f9aa24cea59ffd0f6811675cd28818c9fe53f023f965f9d149 SHA512 1b93ae2db055ba7fb4a95924a896667f0cfa1c675c603c104181662aeb32b10b006158526b2f3ad93a59688a23eacdc82e870bb8ffb182a89e1e51de013ec209
+DIST maxima-5.42.0.tar.gz 41902466 BLAKE2B ff09294ee66fc407845b1713e5762d28597bda067fdcaca942a61e6f07365965a9cdeb3f6d7369d9a074f5835cf64d9724d1ac8f2ad84033b84483f3cb619476 SHA512 dedd86838b254c9932166eb161589187f353e986ecd398e9405db43b5159597ba87369e9d7afa8bbfd18288c1213818812fe27881b5f5e99efc63bf31a1d7854
diff --git a/sci-mathematics/maxima/files/ecls-3.patch b/sci-mathematics/maxima/files/ecls-3.patch
new file mode 100644
index 00000000000..b44dea4d09a
--- /dev/null
+++ b/sci-mathematics/maxima/files/ecls-3.patch
@@ -0,0 +1,48 @@
+diff -r -U3 maxima-5.42.0.orig/src/maxima.in maxima-5.42.0/src/maxima.in
+--- maxima-5.42.0.orig/src/maxima.in 2018-09-21 08:21:11.000000000 +0700
++++ maxima-5.42.0/src/maxima.in 2018-10-01 21:49:23.551633882 +0700
+@@ -236,7 +236,7 @@
+ fi
+
+ elif [ "$MAXIMA_LISP" = "ecl" ]; then
+- exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -- "$@"
++ exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -norc -- "$@"
+
+ elif [ "$MAXIMA_LISP" = "sbcl" ]; then
+ # Use executable image if it exists.
+diff -r -U3 maxima-5.42.0.orig/src/maxima.system maxima-5.42.0/src/maxima.system
+--- maxima-5.42.0.orig/src/maxima.system 2016-12-04 05:27:40.000000000 +0700
++++ maxima-5.42.0/src/maxima.system 2018-10-01 22:01:08.068604254 +0700
+@@ -59,6 +59,14 @@
+ (c:build-fasl output :lisp-files (list object-output)))))
+
+ #+ecl
++(defun split-ld-flags-for-ecl (string &aux space)
++ (setf string (string-trim '(#\Space) string))
++ (if (setf space (position #\Space string))
++ (cons (subseq string 0 space)
++ (split-ld-flags-for-ecl (subseq string (1+ space))))
++ (cons string nil)))
++
++#+ecl
+ (defun build-maxima-lib ()
+ (labels ((list-all-objects (module)
+ (if (eql (mk::component-type module) :file)
+@@ -75,11 +83,16 @@
+ ;; Convert dir/foo.fas to dir/foo.o
+ (make-pathname :type "o" :defaults p))
+ files)))
++ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
++ :ld-flags
++ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
++ (find-package "MAXIMA")))))
++ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))))
+ (c::build-program "binary-ecl/maxima" :lisp-files obj
+ :ld-flags
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
+ (find-package "MAXIMA")))))
+- (if (and x (not (string= x ""))) (list x)))
++ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
+ :epilogue-code '(progn (require :defsystem)
+ (cl-user::run)))))))
+
diff --git a/sci-mathematics/maxima/maxima-5.42.0.ebuild b/sci-mathematics/maxima/maxima-5.42.0.ebuild
new file mode 100644
index 00000000000..1c0c67e3ac6
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.42.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common eutils xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=( . . y . . y )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( . . . ecl ccl . )
+# patch file version; . - no patch
+PATCH_V=( 2 1 . 3 2 1 )
+
+IUSE="emacs tk nls unicode X ${LISPS[*]}"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+RDEPEND="!app-emacs/imaxima
+ X? ( x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ tk? ( dev-lang/tk:0 ) )
+ emacs? ( virtual/emacs
+ virtual/latex-base
+ app-emacs/auctex
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-latexrecommended )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP="dev-lisp/${LISP}:="
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+
+# default lisp
+DEF_LISP=0 # sbcl
+ARM_LISP=2 # gcl
+DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ use arm && DEF_LISP=${ARM_LISP}
+ ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+ NLISPS=${DEF_LISP}
+ fi
+}
+
+src_prepare() {
+ local n PATCHES v
+ PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
+
+ n=${#PATCHES[*]}
+ for ((n--; n >= 0; n--)); do
+ eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
+ done
+
+ n=${#LISPS[*]}
+ for ((n--; n >= 0; n--)); do
+ v=${PATCH_V[${n}]}
+ if [ "${v}" != "." ]; then
+ eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+ fi
+ done
+
+ eapply_user
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+ CONF=${LISPS[${n}]}
+ fi
+ CONFS="${CONFS} --enable-${CONF}"
+ done
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "l10n_${lang/_/-}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ econf ${CONFS} \
+ $(use_with tk wish) \
+ $(use_enable emacs) \
+ --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+ emake
+ if use emacs; then
+ pushd interfaces/emacs/emaxima > /dev/null
+ elisp-compile *.el
+ popd > /dev/null
+ pushd interfaces/emacs/imaxima > /dev/null
+ BYTECOMPFLAGS="-L . -L ../emaxima"
+ elisp-compile *.el
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ docompress -x /usr/share/info
+ emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+ use tk && make_desktop_entry xmaxima xmaxima \
+ /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+ "Science;Math;Education"
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README.lisps
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+ if use emacs; then
+ elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+ rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+
+ insinto /usr/share/${PN}/${PV}/doc/imaxima
+ doins interfaces/emacs/imaxima/README
+ doins -r interfaces/emacs/imaxima/imath-example
+ fi
+
+ # if we use ecls, build an ecls library for maxima
+ if use ecls; then
+ ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2019-06-01 11:25 Andrey Grozin
0 siblings, 0 replies; 20+ messages in thread
From: Andrey Grozin @ 2019-06-01 11:25 UTC (permalink / raw
To: gentoo-commits
commit: 073c7f9a0c3ddc8610e809d1fb3082b32d8e3b9c
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 11:24:34 2019 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 11:25:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073c7f9a
sci-mathematics/maxima: bump to 5.43.0
Closes: https://bugs.gentoo.org/show_bug.cgi?id=684670
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-mathematics/maxima/Manifest | 1 +
sci-mathematics/maxima/files/clozurecl-3.patch | 27 ++++
sci-mathematics/maxima/maxima-5.43.0.ebuild | 213 +++++++++++++++++++++++++
3 files changed, 241 insertions(+)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index a0c2fc48ac1..f22ecb58c2b 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,3 +1,4 @@
DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
DIST maxima-5.42.2.tar.gz 41840181 BLAKE2B bca8a94366f1fe2f508436fdef8de80107b19c9b267a4b72dc6f56870078d35b3feb7dbdda384589b38c5351d6eeede1b9738a5ec2152063de2afacd1ced48c4 SHA512 5033b02272121f6aacff5ededf90eaad5e644a06d0c62aafd745401c08429da979ecd8274f7aa12596a0e32ddb614659af14e4273f59d372fe1ecbec081e7829
+DIST maxima-5.43.0.tar.gz 34605709 BLAKE2B db9db75b7eff0454d4b9595120d726969b4e8b651f611ac69dcd92c4496bf9530ce76867348fd87a33444eef3abb7d123ef2726a7b96ebde9e43f231b21a2b8c SHA512 6611eda4bf81bc5454bf6dd641c73a470cc07b2f768d9550b3abeb7b68f1b4675fd5eca766c52844438e9247d8035be537c7120c9f49cdaed9f918d49ed16659
diff --git a/sci-mathematics/maxima/files/clozurecl-3.patch b/sci-mathematics/maxima/files/clozurecl-3.patch
new file mode 100644
index 00000000000..531c6caca9d
--- /dev/null
+++ b/sci-mathematics/maxima/files/clozurecl-3.patch
@@ -0,0 +1,27 @@
+diff -r -U1 maxima-5.43.0.orig/configure.ac maxima-5.43.0/configure.ac
+--- maxima-5.43.0.orig/configure.ac 2019-05-31 00:52:28.000000000 +0200
++++ maxima-5.43.0/configure.ac 2019-06-01 12:08:22.549425058 +0200
+@@ -434,3 +434,3 @@
+ dnl n.b. openmcl_default_name is hardcoded in "with" message
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ AC_ARG_ENABLE(openmcl,
+diff -r -U1 maxima-5.43.0.orig/src/Makefile.am maxima-5.43.0/src/Makefile.am
+--- maxima-5.43.0.orig/src/Makefile.am 2019-05-31 00:52:28.000000000 +0200
++++ maxima-5.43.0/src/Makefile.am 2019-06-01 12:06:49.990422763 +0200
+@@ -392,3 +392,3 @@
+
+-EXECUTEOPENMCL = $(OPENMCL_NAME)
++EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init
+ BUILT_FILES += $(OPENMCL_MAXIMA)
+diff -r -U1 maxima-5.43.0.orig/src/maxima.in maxima-5.43.0/src/maxima.in
+--- maxima-5.43.0.orig/src/maxima.in 2019-05-31 00:52:28.000000000 +0200
++++ maxima-5.43.0/src/maxima.in 2019-06-01 12:10:12.251427778 +0200
+@@ -221,5 +221,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+ else
+- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+ fi
diff --git a/sci-mathematics/maxima/maxima-5.43.0.ebuild b/sci-mathematics/maxima/maxima-5.43.0.ebuild
new file mode 100644
index 00000000000..c537cea53d2
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.43.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common eutils xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=( . . y . . y )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( . . . ecl ccl . )
+# patch file version; . - no patch
+PATCH_V=( 2 1 . 3 3 1 )
+
+IUSE="emacs tk nls unicode X test ${LISPS[*]}"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+RDEPEND="!app-emacs/imaxima
+ X? ( x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ tk? ( dev-lang/tk:0 ) )
+ emacs? ( virtual/emacs
+ virtual/latex-base
+ app-emacs/auctex
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-latexrecommended )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP="dev-lisp/${LISP}:="
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+
+# default lisp
+DEF_LISP=0 # sbcl
+ARM_LISP=2 # gcl
+DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ test? ( sci-visualization/gnuplot )
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ use arm && DEF_LISP=${ARM_LISP}
+ ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+ NLISPS=${DEF_LISP}
+ fi
+}
+
+src_prepare() {
+ local n PATCHES v
+ PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
+
+ n=${#PATCHES[*]}
+ for ((n--; n >= 0; n--)); do
+ eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
+ done
+
+ n=${#LISPS[*]}
+ for ((n--; n >= 0; n--)); do
+ v=${PATCH_V[${n}]}
+ if [ "${v}" != "." ]; then
+ eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+ fi
+ done
+
+ eapply_user
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+ CONF=${LISPS[${n}]}
+ fi
+ CONFS="${CONFS} --enable-${CONF}"
+ done
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "l10n_${lang/_/-}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ econf ${CONFS} \
+ $(use_with tk wish) \
+ $(use_enable emacs) \
+ --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+ emake
+ if use emacs; then
+ pushd interfaces/emacs/emaxima > /dev/null
+ elisp-compile *.el
+ popd > /dev/null
+ pushd interfaces/emacs/imaxima > /dev/null
+ BYTECOMPFLAGS="-L . -L ../emaxima"
+ elisp-compile *.el
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ docompress -x /usr/share/info
+ emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+ use tk && make_desktop_entry xmaxima xmaxima \
+ /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+ "Science;Math;Education"
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README.lisps
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+ if use emacs; then
+ elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+ rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+
+ insinto /usr/share/${PN}/${PV}/doc/imaxima
+ doins interfaces/emacs/imaxima/README
+ doins -r interfaces/emacs/imaxima/imath-example
+ fi
+
+ # if we use ecls, build an ecls library for maxima
+ if use ecls; then
+ ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2021-03-25 13:56 Andrey Grozin
0 siblings, 0 replies; 20+ messages in thread
From: Andrey Grozin @ 2021-03-25 13:56 UTC (permalink / raw
To: gentoo-commits
commit: 9b7b496428d9e3c307666e05aed3035c0ebb883d
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 13:55:42 2021 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 13:55:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b7b4964
sci-mathematics/maxima: don't hardcode python
Suggested-by: Michael Orlitzky <mjo <AT> gentoo.org>
Closes: https://bugs.gentoo.org/766291
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-mathematics/maxima/files/python-0.patch | 38 +++++++++++++++++++++++++++++
sci-mathematics/maxima/maxima-5.44.0.ebuild | 4 +--
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/sci-mathematics/maxima/files/python-0.patch b/sci-mathematics/maxima/files/python-0.patch
new file mode 100644
index 00000000000..63dea1ea1de
--- /dev/null
+++ b/sci-mathematics/maxima/files/python-0.patch
@@ -0,0 +1,38 @@
+From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 24 Mar 2021 20:57:44 -0400
+Subject: [PATCH 1/1] doc/info/build_html.sh.in: use @PYTHON@ for the python
+ interpreter.
+
+Maxima's ./configure script already detects (or is prodded to use) a
+certain python interpreter. The build_html.sh script, however, is
+still using a hard-coded "python" command. On many systems, "python"
+will be different from the python interpreter that we want to use; for
+example when "python" is python-2.7.x and "python3" is what we want to
+use with Maxima.
+
+This commit tweaks doc/info/build_html.sh.in to use the value of the
+$PYTHON variable instead.
+
+Maxima-Bug: https://sourceforge.net/p/maxima/bugs/3754
+Gentoo-Bug: https://bugs.gentoo.org/766291
+---
+ doc/info/build_html.sh.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in
+index 37930e9..c10e38d 100755
+--- a/doc/info/build_html.sh.in
++++ b/doc/info/build_html.sh.in
+@@ -46,7 +46,7 @@ do
+ echo "filenamebase = \"$filenamebase\""
+ cat $f
+ done | @AWK@ '!/^@c / && !/^@c$/ && (/^@deffn/ || /^@defvr/ || /^@end deffn/ || /^@end defvr/ || /@category/ || /@node/ || /^filenamebase/)' | @SED@ -f @abs_srcdir@/extract_categories1.sed | @AWK@ -f @abs_srcdir@/extract_categories1.awk > make-categories.py
+-python make-categories.py
++@PYTHON@ make-categories.py
+ @SED@ -e 's/^@bye/@node Documentation Categories, , Function and Variable Index\n@chapter Documentation Categories/' @abs_srcdir@/maxima.texi > maxima.texi
+ ( for f in Category-*.texi; do echo '@include' $f; done ; echo @bye ) >> maxima.texi
+
+--
+2.26.2
+
diff --git a/sci-mathematics/maxima/maxima-5.44.0.ebuild b/sci-mathematics/maxima/maxima-5.44.0.ebuild
index 6588716b494..da0d520a076 100644
--- a/sci-mathematics/maxima/maxima-5.44.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.44.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -97,7 +97,7 @@ pkg_setup() {
src_prepare() {
local n PATCHES v
- PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
+ PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 python-0 )
n=${#PATCHES[*]}
for ((n--; n >= 0; n--)); do
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2021-03-25 14:38 Michael Orlitzky
0 siblings, 0 replies; 20+ messages in thread
From: Michael Orlitzky @ 2021-03-25 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 1d8da22fd88af065e8691d00fafee09cdd570e85
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 14:24:25 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 14:35:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8da22f
sci-mathematics/maxima: Revert "don't hardcode python"
This reverts commit 9b7b496428d9e3c307666e05aed3035c0ebb883d. I have a
complete fix for this (and other open maxima bugs) in the middle of a
series of patches/revisions. Reverting so that it doesn't clobber my
rebase. Sorry for not speaking up!
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/maxima/files/python-0.patch | 38 -----------------------------
sci-mathematics/maxima/maxima-5.44.0.ebuild | 4 +--
2 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/sci-mathematics/maxima/files/python-0.patch b/sci-mathematics/maxima/files/python-0.patch
deleted file mode 100644
index 63dea1ea1de..00000000000
--- a/sci-mathematics/maxima/files/python-0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 24 Mar 2021 20:57:44 -0400
-Subject: [PATCH 1/1] doc/info/build_html.sh.in: use @PYTHON@ for the python
- interpreter.
-
-Maxima's ./configure script already detects (or is prodded to use) a
-certain python interpreter. The build_html.sh script, however, is
-still using a hard-coded "python" command. On many systems, "python"
-will be different from the python interpreter that we want to use; for
-example when "python" is python-2.7.x and "python3" is what we want to
-use with Maxima.
-
-This commit tweaks doc/info/build_html.sh.in to use the value of the
-$PYTHON variable instead.
-
-Maxima-Bug: https://sourceforge.net/p/maxima/bugs/3754
-Gentoo-Bug: https://bugs.gentoo.org/766291
----
- doc/info/build_html.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in
-index 37930e9..c10e38d 100755
---- a/doc/info/build_html.sh.in
-+++ b/doc/info/build_html.sh.in
-@@ -46,7 +46,7 @@ do
- echo "filenamebase = \"$filenamebase\""
- cat $f
- done | @AWK@ '!/^@c / && !/^@c$/ && (/^@deffn/ || /^@defvr/ || /^@end deffn/ || /^@end defvr/ || /@category/ || /@node/ || /^filenamebase/)' | @SED@ -f @abs_srcdir@/extract_categories1.sed | @AWK@ -f @abs_srcdir@/extract_categories1.awk > make-categories.py
--python make-categories.py
-+@PYTHON@ make-categories.py
- @SED@ -e 's/^@bye/@node Documentation Categories, , Function and Variable Index\n@chapter Documentation Categories/' @abs_srcdir@/maxima.texi > maxima.texi
- ( for f in Category-*.texi; do echo '@include' $f; done ; echo @bye ) >> maxima.texi
-
---
-2.26.2
-
diff --git a/sci-mathematics/maxima/maxima-5.44.0.ebuild b/sci-mathematics/maxima/maxima-5.44.0.ebuild
index da0d520a076..6588716b494 100644
--- a/sci-mathematics/maxima/maxima-5.44.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.44.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -97,7 +97,7 @@ pkg_setup() {
src_prepare() {
local n PATCHES v
- PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 python-0 )
+ PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
n=${#PATCHES[*]}
for ((n--; n >= 0; n--)); do
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2021-03-25 14:38 Michael Orlitzky
0 siblings, 0 replies; 20+ messages in thread
From: Michael Orlitzky @ 2021-03-25 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 579ffa0836ee9943a212862eadb0b27638038316
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 02:47:14 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 14:35:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=579ffa08
sci-mathematics/maxima: don't hard-code the python interpreter.
This is a two-parter to fix bug 766291, which has the build
failing because it can't find "python". First, we patch the
build system to use @PYTHON@ instead of "python" in the one
place upstream missed it. Second, we add python-single-r1 to
the ebuild so that we get $PYTHON set appropriately.
Closes: https://bugs.gentoo.org/766291
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../maxima/files/dont-hardcode-python.patch | 38 ++++++++++++++++++++++
...ma-5.44.0-r1.ebuild => maxima-5.44.0-r2.ebuild} | 21 +++++++++---
2 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/sci-mathematics/maxima/files/dont-hardcode-python.patch b/sci-mathematics/maxima/files/dont-hardcode-python.patch
new file mode 100644
index 00000000000..63dea1ea1de
--- /dev/null
+++ b/sci-mathematics/maxima/files/dont-hardcode-python.patch
@@ -0,0 +1,38 @@
+From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 24 Mar 2021 20:57:44 -0400
+Subject: [PATCH 1/1] doc/info/build_html.sh.in: use @PYTHON@ for the python
+ interpreter.
+
+Maxima's ./configure script already detects (or is prodded to use) a
+certain python interpreter. The build_html.sh script, however, is
+still using a hard-coded "python" command. On many systems, "python"
+will be different from the python interpreter that we want to use; for
+example when "python" is python-2.7.x and "python3" is what we want to
+use with Maxima.
+
+This commit tweaks doc/info/build_html.sh.in to use the value of the
+$PYTHON variable instead.
+
+Maxima-Bug: https://sourceforge.net/p/maxima/bugs/3754
+Gentoo-Bug: https://bugs.gentoo.org/766291
+---
+ doc/info/build_html.sh.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in
+index 37930e9..c10e38d 100755
+--- a/doc/info/build_html.sh.in
++++ b/doc/info/build_html.sh.in
+@@ -46,7 +46,7 @@ do
+ echo "filenamebase = \"$filenamebase\""
+ cat $f
+ done | @AWK@ '!/^@c / && !/^@c$/ && (/^@deffn/ || /^@defvr/ || /^@end deffn/ || /^@end defvr/ || /@category/ || /@node/ || /^filenamebase/)' | @SED@ -f @abs_srcdir@/extract_categories1.sed | @AWK@ -f @abs_srcdir@/extract_categories1.awk > make-categories.py
+-python make-categories.py
++@PYTHON@ make-categories.py
+ @SED@ -e 's/^@bye/@node Documentation Categories, , Function and Variable Index\n@chapter Documentation Categories/' @abs_srcdir@/maxima.texi > maxima.texi
+ ( for f in Category-*.texi; do echo '@include' $f; done ; echo @bye ) >> maxima.texi
+
+--
+2.26.2
+
diff --git a/sci-mathematics/maxima/maxima-5.44.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.44.0-r2.ebuild
similarity index 88%
rename from sci-mathematics/maxima/maxima-5.44.0-r1.ebuild
rename to sci-mathematics/maxima/maxima-5.44.0-r2.ebuild
index 4cb02071d12..778b0ba34fb 100644
--- a/sci-mathematics/maxima/maxima-5.44.0-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.44.0-r2.ebuild
@@ -3,7 +3,9 @@
EAPI=6
-inherit autotools elisp-common eutils flag-o-matic xdg-utils
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 xdg-utils
DESCRIPTION="Free computer algebra environment based on Macsyma"
HOMEPAGE="http://maxima.sourceforge.net/"
@@ -72,16 +74,23 @@ done
unset LISP
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
RDEPEND="${RDEPEND}
${DEF_DEP}"
-DEPEND="${RDEPEND}
+# Python is used in e.g. doc/info/build_html.sh to build the docs.
+DEPEND="${PYTHON_DEPS}
+ ${RDEPEND}
test? ( sci-visualization/gnuplot )
sys-apps/texinfo"
TEXMF="${EPREFIX}"/usr/share/texmf-site
pkg_setup() {
+ # Set the PYTHON variable to whatever it should be.
+ python-single-r1_pkg_setup
+
local n=${#LISPS[*]}
for ((n--; n >= 0; n--)); do
@@ -97,7 +106,7 @@ pkg_setup() {
src_prepare() {
local n PATCHES v
- PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
+ PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 dont-hardcode-python )
n=${#PATCHES[*]}
for ((n--; n >= 0; n--)); do
@@ -148,6 +157,7 @@ src_configure() {
# value (expected an integer): 1 -Wl
#
# when building the maxima.fas library for ECL.
+ #
econf ${CONFS} \
LDFLAGS="$(raw-ldflags)" \
$(use_with tk wish) \
@@ -156,7 +166,10 @@ src_configure() {
}
src_compile() {
- emake
+ # The variable PYTHONBIN is used in one place while building the
+ # German documentation. Some day that script should be converted
+ # to use the value of @PYTHON@ obtained during ./configure.
+ emake PYTHONBIN="${PYTHON}"
if use emacs; then
pushd interfaces/emacs/emaxima > /dev/null
elisp-compile *.el
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2021-03-25 14:38 Michael Orlitzky
0 siblings, 0 replies; 20+ messages in thread
From: Michael Orlitzky @ 2021-03-25 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 99d068bcd512389b60a972d53c95f22571ed3537
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 24 21:35:49 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 14:35:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d068bc
sci-mathematics/maxima: re-enable ECL package.
The ECL package needed for USE=ecls got dropped from the ebuild
because the patch it requires no longer applied. We take François
Bissey's patch from the sage-on-gentoo overlay and re-enable it.
Closes: https://bugs.gentoo.org/732776
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/maxima/files/ecls-4.patch | 16 ++++++++++++++++
...{maxima-5.44.0.ebuild => maxima-5.44.0-r1.ebuild} | 20 +++++++++++++++++---
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/sci-mathematics/maxima/files/ecls-4.patch b/sci-mathematics/maxima/files/ecls-4.patch
new file mode 100644
index 00000000000..7c597c22333
--- /dev/null
+++ b/sci-mathematics/maxima/files/ecls-4.patch
@@ -0,0 +1,16 @@
+diff --git a/src/maxima.system b/src/maxima.system
+index ee7ca0f..85ec36f 100644
+--- a/src/maxima.system
++++ b/src/maxima.system
+@@ -75,6 +75,11 @@
+ ;; Convert dir/foo.fas to dir/foo.o
+ (make-pathname :type "o" :defaults p))
+ files)))
++ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
++ :ld-flags
++ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
++ (find-package "MAXIMA")))))
++ (if (and x (not (string= x ""))) (list x))))
+ (c::build-program "binary-ecl/maxima" :lisp-files obj
+ :ld-flags
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
diff --git a/sci-mathematics/maxima/maxima-5.44.0.ebuild b/sci-mathematics/maxima/maxima-5.44.0-r1.ebuild
similarity index 88%
rename from sci-mathematics/maxima/maxima-5.44.0.ebuild
rename to sci-mathematics/maxima/maxima-5.44.0-r1.ebuild
index 6588716b494..4cb02071d12 100644
--- a/sci-mathematics/maxima/maxima-5.44.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.44.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools elisp-common eutils xdg-utils
+inherit autotools elisp-common eutils flag-o-matic xdg-utils
DESCRIPTION="Free computer algebra environment based on Macsyma"
HOMEPAGE="http://maxima.sourceforge.net/"
@@ -20,7 +20,7 @@ SUPP_RL=( . . y . . y )
# . - just --enable-<lisp>, <flag> - --enable-<flag>
CONF_FLAG=( . . . ecl ccl . )
# patch file version; . - no patch
-PATCH_V=( 2 1 . . 3 1 )
+PATCH_V=( 2 1 . 4 3 1 )
IUSE="emacs tk nls unicode X test ${LISPS[*]}"
RESTRICT="!test? ( test )"
@@ -142,7 +142,14 @@ src_configure() {
done
fi
+ # Using raw-ldflags fixes the error,
+ #
+ # x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option
+ # value (expected an integer): 1 -Wl
+ #
+ # when building the maxima.fas library for ECL.
econf ${CONFS} \
+ LDFLAGS="$(raw-ldflags)" \
$(use_with tk wish) \
$(use_enable emacs) \
--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
@@ -188,6 +195,13 @@ src_install() {
doins interfaces/emacs/imaxima/README
doins -r interfaces/emacs/imaxima/imath-example
fi
+
+ if use ecls; then
+ # Use ECL to find the path where it expects to load packages from.
+ ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2021-03-26 0:57 Michael Orlitzky
0 siblings, 0 replies; 20+ messages in thread
From: Michael Orlitzky @ 2021-03-26 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 16f964dc700f819d2182707cfc49fd0bb71987b9
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 21:09:28 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 00:56:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f964dc
sci-mathematics/maxima: new USE-controlled dependency on sci-libs/vtk.
VTK is an optional backend for plotting in Maxima that you can enable
with "draw_renderer: 'vtk;". It is also NON-optional when drawing with
the scene() command; however, scene() is presently broken after VTK
dropped its Tcl/Tk interface. As a result, we add sci-libs/vtk only as
an optional dependency to Maxima, behind USE=vtk.
This requires dropping ~ppc for now.
Closes: https://bugs.gentoo.org/769899
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/maxima/files/support-new-vtk.patch | 26 +++++++++++++++++++
...ma-5.44.0-r3.ebuild => maxima-5.44.0-r4.ebuild} | 29 ++++++++++++++++------
sci-mathematics/maxima/metadata.xml | 3 +++
3 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/sci-mathematics/maxima/files/support-new-vtk.patch b/sci-mathematics/maxima/files/support-new-vtk.patch
new file mode 100644
index 00000000000..3296ce27646
--- /dev/null
+++ b/sci-mathematics/maxima/files/support-new-vtk.patch
@@ -0,0 +1,26 @@
+commit c21598340008892173578718afa577f93ebfdd45
+Author: Leo Butler <l_butler@users.sourceforge.net>
+Date: Sat Feb 13 16:16:20 2021 -0600
+
+ Fix SF Bug #3714, Update maxima to use vtk-8.2.0
+
+ The GlobalImmediateModeRenderingOn method was deprecated in the VTK
+ codebase in 2017,
+
+ https://github.com/Kitware/VTK/commit/67e054c91063be30e8e991de489fdda3af668e22
+
+ This commit may change or break draw-vtk user code that relies on
+ older versions of vtk.
+
+diff --git a/share/draw/vtk.lisp b/share/draw/vtk.lisp
+index 6ff0f9586..1964048d2 100644
+--- a/share/draw/vtk.lisp
++++ b/share/draw/vtk.lisp
+@@ -224,7 +224,6 @@
+ (defun vtkpolydatamapper-code (mn fn con)
+ (concatenate 'string
+ (format nil "~a=vtk.vtkPolyDataMapper()~%" mn)
+- (format nil "~a.GlobalImmediateModeRenderingOn()~%" mn)
+ (if con
+ (format nil "~a.SetInputConnection(~a.GetOutputPort())~%" mn fn)
+ "") ))
diff --git a/sci-mathematics/maxima/maxima-5.44.0-r3.ebuild b/sci-mathematics/maxima/maxima-5.44.0-r4.ebuild
similarity index 89%
rename from sci-mathematics/maxima/maxima-5.44.0-r3.ebuild
rename to sci-mathematics/maxima/maxima-5.44.0-r4.ebuild
index 57a63d133cc..3babe7349ba 100644
--- a/sci-mathematics/maxima/maxima-5.44.0-r3.ebuild
+++ b/sci-mathematics/maxima/maxima-5.44.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2 GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
# Supported lisps
LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
@@ -24,7 +24,7 @@ CONF_FLAG=( . . . ecl ccl . )
# patch file version; . - no patch
PATCH_V=( 2 1 . 4 3 1 )
-IUSE="emacs gui nls unicode X test ${LISPS[*]}"
+IUSE="emacs gui nls unicode vtk X test ${LISPS[*]}"
RESTRICT="!test? ( test )"
# Languages
@@ -34,14 +34,29 @@ for lang in ${LANGS}; do
done
# texlive-latexrecommended needed by imaxima for breqn.sty
+#
+# VTK is an optional plotting backend that can be enabled by
+# running "draw_renderer: 'vtk;" within maxima.
+#
+# It's NON-optional for the scene() command, but that command is
+# currently useless since Tcl/Tk support was dropped in sci-libs/vtk.
+# Thus we include VTK only as an optional dependency.
RDEPEND="
- X? ( x11-misc/xdg-utils
- sci-visualization/gnuplot[gd] )
- emacs? ( >=app-editors/emacs-23.1:*
+ X? (
+ x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ vtk? (
+ ${PYTHON_DEPS}
+ sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}]
+ )
+ )
+ emacs? (
+ >=app-editors/emacs-23.1:*
virtual/latex-base
app-emacs/auctex
app-text/ghostscript-gpl
- dev-texlive/texlive-latexrecommended )
+ dev-texlive/texlive-latexrecommended
+ )
gui? ( dev-lang/tk:0 )"
# generating lisp dependencies
@@ -109,7 +124,7 @@ pkg_setup() {
src_prepare() {
local n PATCHES v
PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1
- dont-hardcode-python )
+ dont-hardcode-python support-new-vtk )
n=${#PATCHES[*]}
for ((n--; n >= 0; n--)); do
diff --git a/sci-mathematics/maxima/metadata.xml b/sci-mathematics/maxima/metadata.xml
index 2ee0d1e396a..d87f8aea9f0 100644
--- a/sci-mathematics/maxima/metadata.xml
+++ b/sci-mathematics/maxima/metadata.xml
@@ -28,6 +28,9 @@
(<pkg>dev-lisp/gcl</pkg>)</flag>
<flag name="sbcl">Compile maxima with Steel Bank Common Lisp
(<pkg>dev-lisp/sbcl</pkg>)</flag>
+ <flag name="vtk">
+ Support plotting with <pkg>sci-libs/vtk</pkg>
+ </flag>
</use>
<upstream>
<remote-id type="sourceforge">maxima</remote-id>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2021-05-25 12:07 Andrey Grozin
0 siblings, 0 replies; 20+ messages in thread
From: Andrey Grozin @ 2021-05-25 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 0dbef4d44bbcdece9d737d3d53eea9b2c6c41460
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 12:07:10 2021 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue May 25 12:07:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbef4d4
sci-mathematics/maxima: bump to 5.45.0
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-mathematics/maxima/Manifest | 1 +
sci-mathematics/maxima/files/imaxima-0.patch | 10 ++
sci-mathematics/maxima/maxima-5.45.0.ebuild | 235 +++++++++++++++++++++++++++
3 files changed, 246 insertions(+)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 1fd7d2d37f5..8aabbfd7df5 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,2 +1,3 @@
DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
DIST maxima-5.44.0.tar.gz 34976354 BLAKE2B d6870b6fb0581d9e60d6ed97c7daed8ce12b8b1ae49d0edb7b8d31dd723f9b879eb70440659ff958f53cee16d8d2a92f80dcaa3898d9f6dbabd79a5059073a65 SHA512 1e043bebb7c6d002c113d8de20a98d58d1a8e7bedfc9bcf52819e7c7554655991dc2f42f0333889706574249736db833a237b3e59b967e7e42ede28262e31f2f
+DIST maxima-5.45.0.tar.gz 39946933 BLAKE2B bdccb6cb88d458eec4359b7bc0b5337c9d1d0af9fe4cfeece9c80e840a2aa3963793cdf5c02437b72af647ef6c9306224c524f5a715860808d3b49ad5a85641f SHA512 353d33a89e5fd1986e84698866cc9716307a5ab3c7a29908ed474b5d00f6f8869f616334ff068c2c5d175c4bbb95f892d6061b12e43686ee4813b9a16e5a4139
diff --git a/sci-mathematics/maxima/files/imaxima-0.patch b/sci-mathematics/maxima/files/imaxima-0.patch
new file mode 100644
index 00000000000..6e7ce2ee1a5
--- /dev/null
+++ b/sci-mathematics/maxima/files/imaxima-0.patch
@@ -0,0 +1,10 @@
+diff -r -U2 maxima-5.45.0.orig/interfaces/emacs/imaxima/setup-imaxima-imath.el maxima-5.45.0/interfaces/emacs/imaxima/setup-imaxima-imath.el
+--- maxima-5.45.0.orig/interfaces/emacs/imaxima/setup-imaxima-imath.el 2021-05-16 06:20:53.000000000 +0700
++++ maxima-5.45.0/interfaces/emacs/imaxima/setup-imaxima-imath.el 2021-05-25 18:31:38.005882847 +0700
+@@ -133,5 +133,5 @@
+ ;;; imaxima-maxima-options should be "" instead of "(user::run)"
+ ;;; assigned in the imaxima.el
+-(setq imaxima-maxima-options "")
++;(setq imaxima-maxima-options "")
+
+ (autoload 'maxima "maxima" "Maxima CAS mode" t nil)
diff --git a/sci-mathematics/maxima/maxima-5.45.0.ebuild b/sci-mathematics/maxima/maxima-5.45.0.ebuild
new file mode 100644
index 00000000000..32f16ada3d3
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.45.0.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit autotools elisp-common flag-o-matic python-single-r1 xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test"
+RESTRICT="!test? ( test )"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+LISP_DEPEND="
+ clisp? ( dev-lisp/clisp )
+ clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
+ clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
+ cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
+ ecls? ( dev-lisp/ecls app-misc/rlwrap )
+ gcl? ( dev-lisp/gcl[ansi,readline] )
+ sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
+"
+
+# Python is used in e.g. doc/info/build_html.sh to build the docs.
+# LISP_DEPEND is included in both BDEPEND and DEPEND because the various
+# lisp engines are used to both compile and run maxima. It's possible
+# that they don't (all?) need to be listed in DEPEND; who knows.
+BDEPEND="
+ ${PYTHON_DEPS}
+ ${LISP_DEPEND}
+ test? ( sci-visualization/gnuplot )
+ sys-apps/texinfo
+"
+
+DEPEND="
+ ${LISP_DEPEND}
+ emacs? ( >=app-editors/emacs-23.1:* )
+ gui? ( dev-lang/tk:0 )
+"
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+#
+# VTK is an optional plotting backend that can be enabled by
+# running "draw_renderer: 'vtk;" within maxima.
+#
+# It's NON-optional for the scene() command, but that command is
+# currently useless since Tcl/Tk support was dropped in sci-libs/vtk.
+# Thus we include VTK only as an optional dependency.
+#
+# We require app-misc/rlwrap for any lisps that don't support readline
+# themselves.
+RDEPEND="
+ ${DEPEND}
+ X? (
+ x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ vtk? (
+ ${PYTHON_DEPS}
+ sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}]
+ )
+ )
+ emacs? (
+ virtual/latex-base
+ app-emacs/auctex
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-latexrecommended
+ )"
+
+# Maxima can make use of X features like plotting (and launching a PNG
+# viewer) from the console, but you can't use the xmaxima GUI without X.
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
+ gui? ( X )"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ # Set the PYTHON variable to whatever it should be.
+ python-single-r1_pkg_setup
+}
+
+PATCHES=(
+ "${FILESDIR}/dont-hardcode-python.patch"
+ "${FILESDIR}/imaxima-0.patch"
+ "${FILESDIR}/xdg-utils-1.patch"
+ "${FILESDIR}/wish-2.patch"
+ "${FILESDIR}/rmaxima-0.patch"
+ "${FILESDIR}/emacs-0.patch"
+ "${FILESDIR}/clisp-1.patch"
+ "${FILESDIR}/clozurecl-3.patch"
+ "${FILESDIR}/ecls-4.patch"
+ "${FILESDIR}/cmucl-1.patch"
+ "${FILESDIR}/sbcl-2.patch"
+)
+
+src_prepare() {
+ default
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS=""
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "l10n_${lang/_/-}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ # Using raw-ldflags fixes the error,
+ #
+ # x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option
+ # value (expected an integer): 1 -Wl
+ #
+ # when building the maxima.fas library for ECL. See upstream bugs:
+ #
+ # * https://sourceforge.net/p/maxima/bugs/3759/
+ # * https://gitlab.com/embeddable-common-lisp/ecl/-/issues/636
+ #
+ # The 32-bit and 64-bit version of the clozurecl executable
+ # are both called "ccl" on Gentoo, so we need the additional
+ # use_with for clozurecl64. See bugs 665364 and 715278....
+ #
+ # The usex works around https://sourceforge.net/p/maxima/bugs/3757/
+ #
+ econf ${CONFS} \
+ LDFLAGS="$(raw-ldflags)" \
+ $(use_enable clisp) \
+ $(use_enable clozurecl ccl) \
+ $(use_enable clozurecl64 ccl64) \
+ $(usex clozurecl64 "--with-ccl64=ccl" "") \
+ $(use_enable cmucl) \
+ $(use_enable ecls ecl) \
+ $(use_enable emacs) \
+ $(use_enable gcl) \
+ $(use_with gui wish) \
+ $(use_enable sbcl) \
+ --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+ # The variable PYTHONBIN is used in one place while building the
+ # German documentation. Some day that script should be converted
+ # to use the value of @PYTHON@ obtained during ./configure.
+ emake PYTHONBIN="${PYTHON}"
+ if use emacs; then
+ pushd interfaces/emacs/emaxima > /dev/null
+ elisp-compile *.el
+ popd > /dev/null
+ pushd interfaces/emacs/imaxima > /dev/null
+ BYTECOMPFLAGS="-L . -L ../emaxima"
+ elisp-compile *.el
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ docompress -x /usr/share/info
+ emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README-lisps.md
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+ if use emacs; then
+ elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+ rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+
+ insinto /usr/share/${PN}/${PV}/doc/imaxima
+ doins interfaces/emacs/imaxima/README
+ doins -r interfaces/emacs/imaxima/imath-example
+
+ if ! use gcl; then
+ # This emacs package is used to run gcl, maxima, gdb, etc.
+ # all at once and possibly in the same buffer. As such, it's
+ # no use without gcl (more to the point: it requires gcl.el).
+ find "${ED}" -name 'dbl.el' -type f -delete || die
+ fi
+ fi
+
+ if use ecls; then
+ # Use ECL to find the path where it expects to load packages from.
+ ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2022-09-16 7:59 Andreas Sturmlechner
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2022-09-16 7:59 UTC (permalink / raw
To: gentoo-commits
commit: 9363c6359bfc0e1a025a2407b98be26fc3ceaa67
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 07:58:45 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 07:59:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9363c635
sci-mathematics/maxima: drop 5.42.1-r1, 5.45.1-r2
Closes: https://bugs.gentoo.org/867547
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-mathematics/maxima/Manifest | 2 -
sci-mathematics/maxima/files/clozurecl-2.patch | 27 ---
.../maxima/files/dont-hardcode-python.patch | 38 ----
sci-mathematics/maxima/files/ecls-3.patch | 48 -----
sci-mathematics/maxima/files/ecls-4.patch | 16 --
sci-mathematics/maxima/files/support-new-vtk.patch | 26 ---
sci-mathematics/maxima/maxima-5.42.1-r1.ebuild | 213 -------------------
sci-mathematics/maxima/maxima-5.45.1-r2.ebuild | 236 ---------------------
8 files changed, 606 deletions(-)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index a8483d9ff53f..cf9ef845e6a1 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,3 +1 @@
-DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
-DIST maxima-5.45.1.tar.gz 39951932 BLAKE2B b6d67aebf34c12567ec5d08581dc22d13a902d42074abc967f8e50e029845a52a2538da8cb4382e3e28163ce11a6d8c245cfc48150cc10768250de34368acf6c SHA512 08e7a2b24324c0f0dda127d291b9d439125fa1324732b17c804c3eb68d35f87e3fc713c147472821a1781e6378b7afb0721d5da907826324ec3d24848251b7cf
DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef
diff --git a/sci-mathematics/maxima/files/clozurecl-2.patch b/sci-mathematics/maxima/files/clozurecl-2.patch
deleted file mode 100644
index 5c5189c7e051..000000000000
--- a/sci-mathematics/maxima/files/clozurecl-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -r -U1 maxima-5.37.1.orig/configure.ac maxima-5.37.1/configure.ac
---- maxima-5.37.1.orig/configure.ac 2015-09-01 02:28:02.000000000 +0600
-+++ maxima-5.37.1/configure.ac 2015-09-03 18:11:54.335618720 +0600
-@@ -386,3 +386,3 @@
- dnl n.b. openmcl_default_name is hardcoded in "with" message
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- AC_ARG_ENABLE(openmcl,
-diff -r -U1 maxima-5.37.1.orig/src/Makefile.am maxima-5.37.1/src/Makefile.am
---- maxima-5.37.1.orig/src/Makefile.am 2015-08-11 02:44:21.000000000 +0600
-+++ maxima-5.37.1/src/Makefile.am 2015-09-03 17:26:12.849734012 +0600
-@@ -338,3 +338,3 @@
-
--EXECUTEOPENMCL = $(OPENMCL_NAME) -e
-+EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e
- BUILT_FILES += $(OPENMCL_MAXIMA)
-diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
---- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600
-+++ maxima-5.37.1/src/maxima.in 2015-09-03 17:22:31.841743306 +0600
-@@ -182,5 +182,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
- else
-- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
-+ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
- fi
diff --git a/sci-mathematics/maxima/files/dont-hardcode-python.patch b/sci-mathematics/maxima/files/dont-hardcode-python.patch
deleted file mode 100644
index 63dea1ea1de7..000000000000
--- a/sci-mathematics/maxima/files/dont-hardcode-python.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 24 Mar 2021 20:57:44 -0400
-Subject: [PATCH 1/1] doc/info/build_html.sh.in: use @PYTHON@ for the python
- interpreter.
-
-Maxima's ./configure script already detects (or is prodded to use) a
-certain python interpreter. The build_html.sh script, however, is
-still using a hard-coded "python" command. On many systems, "python"
-will be different from the python interpreter that we want to use; for
-example when "python" is python-2.7.x and "python3" is what we want to
-use with Maxima.
-
-This commit tweaks doc/info/build_html.sh.in to use the value of the
-$PYTHON variable instead.
-
-Maxima-Bug: https://sourceforge.net/p/maxima/bugs/3754
-Gentoo-Bug: https://bugs.gentoo.org/766291
----
- doc/info/build_html.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in
-index 37930e9..c10e38d 100755
---- a/doc/info/build_html.sh.in
-+++ b/doc/info/build_html.sh.in
-@@ -46,7 +46,7 @@ do
- echo "filenamebase = \"$filenamebase\""
- cat $f
- done | @AWK@ '!/^@c / && !/^@c$/ && (/^@deffn/ || /^@defvr/ || /^@end deffn/ || /^@end defvr/ || /@category/ || /@node/ || /^filenamebase/)' | @SED@ -f @abs_srcdir@/extract_categories1.sed | @AWK@ -f @abs_srcdir@/extract_categories1.awk > make-categories.py
--python make-categories.py
-+@PYTHON@ make-categories.py
- @SED@ -e 's/^@bye/@node Documentation Categories, , Function and Variable Index\n@chapter Documentation Categories/' @abs_srcdir@/maxima.texi > maxima.texi
- ( for f in Category-*.texi; do echo '@include' $f; done ; echo @bye ) >> maxima.texi
-
---
-2.26.2
-
diff --git a/sci-mathematics/maxima/files/ecls-3.patch b/sci-mathematics/maxima/files/ecls-3.patch
deleted file mode 100644
index b44dea4d09a8..000000000000
--- a/sci-mathematics/maxima/files/ecls-3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -r -U3 maxima-5.42.0.orig/src/maxima.in maxima-5.42.0/src/maxima.in
---- maxima-5.42.0.orig/src/maxima.in 2018-09-21 08:21:11.000000000 +0700
-+++ maxima-5.42.0/src/maxima.in 2018-10-01 21:49:23.551633882 +0700
-@@ -236,7 +236,7 @@
- fi
-
- elif [ "$MAXIMA_LISP" = "ecl" ]; then
-- exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -- "$@"
-+ exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -norc -- "$@"
-
- elif [ "$MAXIMA_LISP" = "sbcl" ]; then
- # Use executable image if it exists.
-diff -r -U3 maxima-5.42.0.orig/src/maxima.system maxima-5.42.0/src/maxima.system
---- maxima-5.42.0.orig/src/maxima.system 2016-12-04 05:27:40.000000000 +0700
-+++ maxima-5.42.0/src/maxima.system 2018-10-01 22:01:08.068604254 +0700
-@@ -59,6 +59,14 @@
- (c:build-fasl output :lisp-files (list object-output)))))
-
- #+ecl
-+(defun split-ld-flags-for-ecl (string &aux space)
-+ (setf string (string-trim '(#\Space) string))
-+ (if (setf space (position #\Space string))
-+ (cons (subseq string 0 space)
-+ (split-ld-flags-for-ecl (subseq string (1+ space))))
-+ (cons string nil)))
-+
-+#+ecl
- (defun build-maxima-lib ()
- (labels ((list-all-objects (module)
- (if (eql (mk::component-type module) :file)
-@@ -75,11 +83,16 @@
- ;; Convert dir/foo.fas to dir/foo.o
- (make-pathname :type "o" :defaults p))
- files)))
-+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
-+ :ld-flags
-+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
-+ (find-package "MAXIMA")))))
-+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))))
- (c::build-program "binary-ecl/maxima" :lisp-files obj
- :ld-flags
- (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
- (find-package "MAXIMA")))))
-- (if (and x (not (string= x ""))) (list x)))
-+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
- :epilogue-code '(progn (require :defsystem)
- (cl-user::run)))))))
-
diff --git a/sci-mathematics/maxima/files/ecls-4.patch b/sci-mathematics/maxima/files/ecls-4.patch
deleted file mode 100644
index 7c597c223333..000000000000
--- a/sci-mathematics/maxima/files/ecls-4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/maxima.system b/src/maxima.system
-index ee7ca0f..85ec36f 100644
---- a/src/maxima.system
-+++ b/src/maxima.system
-@@ -75,6 +75,11 @@
- ;; Convert dir/foo.fas to dir/foo.o
- (make-pathname :type "o" :defaults p))
- files)))
-+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
-+ :ld-flags
-+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
-+ (find-package "MAXIMA")))))
-+ (if (and x (not (string= x ""))) (list x))))
- (c::build-program "binary-ecl/maxima" :lisp-files obj
- :ld-flags
- (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
diff --git a/sci-mathematics/maxima/files/support-new-vtk.patch b/sci-mathematics/maxima/files/support-new-vtk.patch
deleted file mode 100644
index 3296ce276467..000000000000
--- a/sci-mathematics/maxima/files/support-new-vtk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit c21598340008892173578718afa577f93ebfdd45
-Author: Leo Butler <l_butler@users.sourceforge.net>
-Date: Sat Feb 13 16:16:20 2021 -0600
-
- Fix SF Bug #3714, Update maxima to use vtk-8.2.0
-
- The GlobalImmediateModeRenderingOn method was deprecated in the VTK
- codebase in 2017,
-
- https://github.com/Kitware/VTK/commit/67e054c91063be30e8e991de489fdda3af668e22
-
- This commit may change or break draw-vtk user code that relies on
- older versions of vtk.
-
-diff --git a/share/draw/vtk.lisp b/share/draw/vtk.lisp
-index 6ff0f9586..1964048d2 100644
---- a/share/draw/vtk.lisp
-+++ b/share/draw/vtk.lisp
-@@ -224,7 +224,6 @@
- (defun vtkpolydatamapper-code (mn fn con)
- (concatenate 'string
- (format nil "~a=vtk.vtkPolyDataMapper()~%" mn)
-- (format nil "~a.GlobalImmediateModeRenderingOn()~%" mn)
- (if con
- (format nil "~a.SetInputConnection(~a.GetOutputPort())~%" mn fn)
- "") ))
diff --git a/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild
deleted file mode 100644
index e06559d09565..000000000000
--- a/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common eutils xdg-utils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-
-# Supported lisps
-LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
-# <lisp> supports readline: . - no, y - yes
-SUPP_RL=( . . y . . y )
-# . - just --enable-<lisp>, <flag> - --enable-<flag>
-CONF_FLAG=( . . . ecl ccl . )
-# patch file version; . - no patch
-PATCH_V=( 2 1 . 3 2 1 )
-
-IUSE="emacs tk nls unicode X ${LISPS[*]}"
-
-# Languages
-LANGS="de es pt pt_BR"
-for lang in ${LANGS}; do
- IUSE="${IUSE} l10n_${lang/_/-}"
-done
-
-# texlive-latexrecommended needed by imaxima for breqn.sty
-RDEPEND="!app-emacs/imaxima
- virtual/libcrypt:=
- X? ( x11-misc/xdg-utils
- sci-visualization/gnuplot[gd]
- tk? ( dev-lang/tk:0 ) )
- emacs? ( >=app-editors/emacs-23.1:*
- virtual/latex-base
- app-emacs/auctex
- app-text/ghostscript-gpl
- dev-texlive/texlive-latexrecommended )"
-
-# generating lisp dependencies
-depends() {
- local LISP DEP
- LISP=${LISPS[$1]}
- DEP="dev-lisp/${LISP}:="
- if [ "${SUPP_RL[$1]}" = "." ]; then
- DEP="${DEP} app-misc/rlwrap"
- fi
- echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
- LISP=${LISPS[${n}]}
- RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
- DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-
-# default lisp
-DEF_LISP=0 # sbcl
-ARM_LISP=2 # gcl
-DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
- DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
- ${DEF_DEP}"
-
-DEPEND="${RDEPEND}
- sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
- local n=${#LISPS[*]}
-
- for ((n--; n >= 0; n--)); do
- use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
- done
-
- if [ -z "${NLISPS}" ]; then
- use arm && DEF_LISP=${ARM_LISP}
- ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
- NLISPS=${DEF_LISP}
- fi
-}
-
-src_prepare() {
- local n PATCHES v
- PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
-
- n=${#PATCHES[*]}
- for ((n--; n >= 0; n--)); do
- eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
- done
-
- n=${#LISPS[*]}
- for ((n--; n >= 0; n--)); do
- v=${PATCH_V[${n}]}
- if [ "${v}" != "." ]; then
- eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
- fi
- done
-
- eapply_user
-
- # bug #343331
- rm share/Makefile.in || die
- rm src/Makefile.in || die
- touch src/*.mk
- touch src/Makefile.am
- eautoreconf
-}
-
-src_configure() {
- local CONFS CONF n lang
- for n in ${NLISPS}; do
- CONF=${CONF_FLAG[${n}]}
- if [ ${CONF} = . ]; then
- CONF=${LISPS[${n}]}
- fi
- CONFS="${CONFS} --enable-${CONF}"
- done
-
- # enable existing translated doc
- if use nls; then
- for lang in ${LANGS}; do
- if use "l10n_${lang/_/-}"; then
- CONFS="${CONFS} --enable-lang-${lang}"
- use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
- fi
- done
- fi
-
- econf ${CONFS} \
- $(use_with tk wish) \
- $(use_enable emacs) \
- --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-}
-
-src_compile() {
- emake
- if use emacs; then
- pushd interfaces/emacs/emaxima > /dev/null
- elisp-compile *.el
- popd > /dev/null
- pushd interfaces/emacs/imaxima > /dev/null
- BYTECOMPFLAGS="-L . -L ../emaxima"
- elisp-compile *.el
- popd > /dev/null
- fi
-}
-
-src_install() {
- docompress -x /usr/share/info
- emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
- use tk && make_desktop_entry xmaxima xmaxima \
- /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
- "Science;Math;Education"
-
- # do not use dodoc because interfaces can't read compressed files
- # read COPYING before attempt to remove it from dodoc
- insinto /usr/share/${PN}/${PV}/doc
- doins AUTHORS COPYING README README.lisps
- dodir /usr/share/doc
- dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
-
- if use emacs; then
- elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
- elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
-
- rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
- insinto ${TEXMF}/tex/latex/emaxima
- doins interfaces/emacs/emaxima/emaxima.sty
-
- insinto /usr/share/${PN}/${PV}/doc/imaxima
- doins interfaces/emacs/imaxima/README
- doins -r interfaces/emacs/imaxima/imath-example
- fi
-
- # if we use ecls, build an ecls library for maxima
- if use ecls; then
- ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
- insinto "${ECLLIB#${EPREFIX}}"
- doins src/binary-ecl/maxima.fas
- fi
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- if use emacs; then
- elisp-site-regen
- mktexlsr
- fi
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- if use emacs; then
- elisp-site-regen
- mktexlsr
- fi
-}
diff --git a/sci-mathematics/maxima/maxima-5.45.1-r2.ebuild b/sci-mathematics/maxima/maxima-5.45.1-r2.ebuild
deleted file mode 100644
index 532a39609b73..000000000000
--- a/sci-mathematics/maxima/maxima-5.45.1-r2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools elisp-common flag-o-matic python-single-r1 xdg-utils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test"
-RESTRICT="!test? ( test )"
-
-# Languages
-LANGS="de es pt pt_BR"
-for lang in ${LANGS}; do
- IUSE="${IUSE} l10n_${lang/_/-}"
-done
-
-LISP_DEPEND="
- clisp? ( dev-lisp/clisp:= )
- clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
- clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
- cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
- ecls? ( dev-lisp/ecls:= app-misc/rlwrap )
- gcl? ( dev-lisp/gcl[ansi,readline] )
- sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap )
-"
-
-# Python is used in e.g. doc/info/build_html.sh to build the docs.
-# LISP_DEPEND is included in both BDEPEND and DEPEND because the various
-# lisp engines are used to both compile and run maxima. It's possible
-# that they don't (all?) need to be listed in DEPEND; who knows.
-BDEPEND="
- ${PYTHON_DEPS}
- ${LISP_DEPEND}
- test? ( sci-visualization/gnuplot )
- sys-apps/texinfo
-"
-
-DEPEND="
- ${LISP_DEPEND}
- virtual/libcrypt:=
- emacs? ( >=app-editors/emacs-26:* )
- gui? ( dev-lang/tk:0 )
-"
-
-# texlive-latexrecommended needed by imaxima for breqn.sty
-#
-# VTK is an optional plotting backend that can be enabled by
-# running "draw_renderer: 'vtk;" within maxima.
-#
-# It's NON-optional for the scene() command, but that command is
-# currently useless since Tcl/Tk support was dropped in sci-libs/vtk.
-# Thus we include VTK only as an optional dependency.
-#
-# We require app-misc/rlwrap for any lisps that don't support readline
-# themselves.
-RDEPEND="
- ${DEPEND}
- X? (
- x11-misc/xdg-utils
- sci-visualization/gnuplot[gd]
- vtk? (
- ${PYTHON_DEPS}
- sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}]
- )
- )
- emacs? (
- virtual/latex-base
- app-emacs/auctex
- app-text/ghostscript-gpl
- dev-texlive/texlive-latexrecommended
- )"
-
-# Maxima can make use of X features like plotting (and launching a PNG
-# viewer) from the console, but you can't use the xmaxima GUI without X.
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
- gui? ( X )"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
- # Set the PYTHON variable to whatever it should be.
- python-single-r1_pkg_setup
-}
-
-PATCHES=(
- "${FILESDIR}/dont-hardcode-python.patch"
- "${FILESDIR}/imaxima-0.patch"
- "${FILESDIR}/xdg-utils-1.patch"
- "${FILESDIR}/wish-2.patch"
- "${FILESDIR}/rmaxima-0.patch"
- "${FILESDIR}/emacs-0.patch"
- "${FILESDIR}/clisp-1.patch"
- "${FILESDIR}/clozurecl-3.patch"
- "${FILESDIR}/ecls-4.patch"
- "${FILESDIR}/cmucl-1.patch"
- "${FILESDIR}/sbcl-2.patch"
-)
-
-src_prepare() {
- default
-
- # bug #343331
- rm share/Makefile.in || die
- rm src/Makefile.in || die
- touch src/*.mk
- touch src/Makefile.am
-
- eautoreconf
-}
-
-src_configure() {
- local CONFS=""
-
- # enable existing translated doc
- if use nls; then
- for lang in ${LANGS}; do
- if use "l10n_${lang/_/-}"; then
- CONFS="${CONFS} --enable-lang-${lang}"
- use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
- fi
- done
- fi
-
- # Using raw-ldflags fixes the error,
- #
- # x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option
- # value (expected an integer): 1 -Wl
- #
- # when building the maxima.fas library for ECL. See upstream bugs:
- #
- # * https://sourceforge.net/p/maxima/bugs/3759/
- # * https://gitlab.com/embeddable-common-lisp/ecl/-/issues/636
- #
- # The 32-bit and 64-bit version of the clozurecl executable
- # are both called "ccl" on Gentoo, so we need the additional
- # use_with for clozurecl64. See bugs 665364 and 715278....
- #
- # The usex works around https://sourceforge.net/p/maxima/bugs/3757/
- #
- econf ${CONFS} \
- LDFLAGS="$(raw-ldflags)" \
- $(use_enable clisp) \
- $(use_enable clozurecl ccl) \
- $(use_enable clozurecl64 ccl64) \
- $(usex clozurecl64 "--with-ccl64=ccl" "") \
- $(use_enable cmucl) \
- $(use_enable ecls ecl) \
- $(use_enable emacs) \
- $(use_enable gcl) \
- $(use_with gui wish) \
- $(use_enable sbcl) \
- --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-}
-
-src_compile() {
- # The variable PYTHONBIN is used in one place while building the
- # German documentation. Some day that script should be converted
- # to use the value of @PYTHON@ obtained during ./configure.
- emake PYTHONBIN="${PYTHON}"
- if use emacs; then
- pushd interfaces/emacs/emaxima > /dev/null
- elisp-compile *.el
- popd > /dev/null
- pushd interfaces/emacs/imaxima > /dev/null
- BYTECOMPFLAGS="-L . -L ../emaxima"
- elisp-compile *.el
- popd > /dev/null
- fi
-}
-
-src_install() {
- docompress -x /usr/share/info
- emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
- # do not use dodoc because interfaces can't read compressed files
- # read COPYING before attempt to remove it from dodoc
- insinto /usr/share/${PN}/${PV}/doc
- doins AUTHORS COPYING README README-lisps.md
- dodir /usr/share/doc
- dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
-
- if use emacs; then
- elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
- elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
-
- rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
- insinto ${TEXMF}/tex/latex/emaxima
- doins interfaces/emacs/emaxima/emaxima.sty
-
- insinto /usr/share/${PN}/${PV}/doc/imaxima
- doins interfaces/emacs/imaxima/README
- doins -r interfaces/emacs/imaxima/imath-example
-
- if ! use gcl; then
- # This emacs package is used to run gcl, maxima, gdb, etc.
- # all at once and possibly in the same buffer. As such, it's
- # no use without gcl (more to the point: it requires gcl.el).
- find "${ED}" -name 'dbl.el' -type f -delete || die
- fi
- fi
-
- if use ecls; then
- # Use ECL to find the path where it expects to load packages from.
- ECLLIB=$(ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)")
- insinto "${ECLLIB#${EPREFIX}}"
- doins src/binary-ecl/maxima.fas
- fi
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- if use emacs; then
- elisp-site-regen
- mktexlsr
- fi
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- if use emacs; then
- elisp-site-regen
- mktexlsr
- fi
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2022-09-16 8:12 Andreas Sturmlechner
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2022-09-16 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 824addcfff671b0af3ff8dc47f62c872a8105d59
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 08:10:16 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 08:11:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=824addcf
sci-mathematics/maxima: Revert "drop 5.42.1-r1"
This reverts commit 9363c6359bfc0e1a025a2407b98be26fc3ceaa67.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-mathematics/maxima/Manifest | 2 +
sci-mathematics/maxima/files/clozurecl-2.patch | 27 +++
.../maxima/files/dont-hardcode-python.patch | 38 ++++
sci-mathematics/maxima/files/ecls-3.patch | 48 +++++
sci-mathematics/maxima/files/ecls-4.patch | 16 ++
sci-mathematics/maxima/files/support-new-vtk.patch | 26 +++
sci-mathematics/maxima/maxima-5.42.1-r1.ebuild | 213 +++++++++++++++++++++
7 files changed, 370 insertions(+)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index cf9ef845e6a1..a8483d9ff53f 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1 +1,3 @@
+DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
+DIST maxima-5.45.1.tar.gz 39951932 BLAKE2B b6d67aebf34c12567ec5d08581dc22d13a902d42074abc967f8e50e029845a52a2538da8cb4382e3e28163ce11a6d8c245cfc48150cc10768250de34368acf6c SHA512 08e7a2b24324c0f0dda127d291b9d439125fa1324732b17c804c3eb68d35f87e3fc713c147472821a1781e6378b7afb0721d5da907826324ec3d24848251b7cf
DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef
diff --git a/sci-mathematics/maxima/files/clozurecl-2.patch b/sci-mathematics/maxima/files/clozurecl-2.patch
new file mode 100644
index 000000000000..5c5189c7e051
--- /dev/null
+++ b/sci-mathematics/maxima/files/clozurecl-2.patch
@@ -0,0 +1,27 @@
+diff -r -U1 maxima-5.37.1.orig/configure.ac maxima-5.37.1/configure.ac
+--- maxima-5.37.1.orig/configure.ac 2015-09-01 02:28:02.000000000 +0600
++++ maxima-5.37.1/configure.ac 2015-09-03 18:11:54.335618720 +0600
+@@ -386,3 +386,3 @@
+ dnl n.b. openmcl_default_name is hardcoded in "with" message
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ AC_ARG_ENABLE(openmcl,
+diff -r -U1 maxima-5.37.1.orig/src/Makefile.am maxima-5.37.1/src/Makefile.am
+--- maxima-5.37.1.orig/src/Makefile.am 2015-08-11 02:44:21.000000000 +0600
++++ maxima-5.37.1/src/Makefile.am 2015-09-03 17:26:12.849734012 +0600
+@@ -338,3 +338,3 @@
+
+-EXECUTEOPENMCL = $(OPENMCL_NAME) -e
++EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e
+ BUILT_FILES += $(OPENMCL_MAXIMA)
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in 2015-09-03 17:22:31.841743306 +0600
+@@ -182,5 +182,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+ else
+- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+ fi
diff --git a/sci-mathematics/maxima/files/dont-hardcode-python.patch b/sci-mathematics/maxima/files/dont-hardcode-python.patch
new file mode 100644
index 000000000000..63dea1ea1de7
--- /dev/null
+++ b/sci-mathematics/maxima/files/dont-hardcode-python.patch
@@ -0,0 +1,38 @@
+From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 24 Mar 2021 20:57:44 -0400
+Subject: [PATCH 1/1] doc/info/build_html.sh.in: use @PYTHON@ for the python
+ interpreter.
+
+Maxima's ./configure script already detects (or is prodded to use) a
+certain python interpreter. The build_html.sh script, however, is
+still using a hard-coded "python" command. On many systems, "python"
+will be different from the python interpreter that we want to use; for
+example when "python" is python-2.7.x and "python3" is what we want to
+use with Maxima.
+
+This commit tweaks doc/info/build_html.sh.in to use the value of the
+$PYTHON variable instead.
+
+Maxima-Bug: https://sourceforge.net/p/maxima/bugs/3754
+Gentoo-Bug: https://bugs.gentoo.org/766291
+---
+ doc/info/build_html.sh.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in
+index 37930e9..c10e38d 100755
+--- a/doc/info/build_html.sh.in
++++ b/doc/info/build_html.sh.in
+@@ -46,7 +46,7 @@ do
+ echo "filenamebase = \"$filenamebase\""
+ cat $f
+ done | @AWK@ '!/^@c / && !/^@c$/ && (/^@deffn/ || /^@defvr/ || /^@end deffn/ || /^@end defvr/ || /@category/ || /@node/ || /^filenamebase/)' | @SED@ -f @abs_srcdir@/extract_categories1.sed | @AWK@ -f @abs_srcdir@/extract_categories1.awk > make-categories.py
+-python make-categories.py
++@PYTHON@ make-categories.py
+ @SED@ -e 's/^@bye/@node Documentation Categories, , Function and Variable Index\n@chapter Documentation Categories/' @abs_srcdir@/maxima.texi > maxima.texi
+ ( for f in Category-*.texi; do echo '@include' $f; done ; echo @bye ) >> maxima.texi
+
+--
+2.26.2
+
diff --git a/sci-mathematics/maxima/files/ecls-3.patch b/sci-mathematics/maxima/files/ecls-3.patch
new file mode 100644
index 000000000000..b44dea4d09a8
--- /dev/null
+++ b/sci-mathematics/maxima/files/ecls-3.patch
@@ -0,0 +1,48 @@
+diff -r -U3 maxima-5.42.0.orig/src/maxima.in maxima-5.42.0/src/maxima.in
+--- maxima-5.42.0.orig/src/maxima.in 2018-09-21 08:21:11.000000000 +0700
++++ maxima-5.42.0/src/maxima.in 2018-10-01 21:49:23.551633882 +0700
+@@ -236,7 +236,7 @@
+ fi
+
+ elif [ "$MAXIMA_LISP" = "ecl" ]; then
+- exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -- "$@"
++ exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -norc -- "$@"
+
+ elif [ "$MAXIMA_LISP" = "sbcl" ]; then
+ # Use executable image if it exists.
+diff -r -U3 maxima-5.42.0.orig/src/maxima.system maxima-5.42.0/src/maxima.system
+--- maxima-5.42.0.orig/src/maxima.system 2016-12-04 05:27:40.000000000 +0700
++++ maxima-5.42.0/src/maxima.system 2018-10-01 22:01:08.068604254 +0700
+@@ -59,6 +59,14 @@
+ (c:build-fasl output :lisp-files (list object-output)))))
+
+ #+ecl
++(defun split-ld-flags-for-ecl (string &aux space)
++ (setf string (string-trim '(#\Space) string))
++ (if (setf space (position #\Space string))
++ (cons (subseq string 0 space)
++ (split-ld-flags-for-ecl (subseq string (1+ space))))
++ (cons string nil)))
++
++#+ecl
+ (defun build-maxima-lib ()
+ (labels ((list-all-objects (module)
+ (if (eql (mk::component-type module) :file)
+@@ -75,11 +83,16 @@
+ ;; Convert dir/foo.fas to dir/foo.o
+ (make-pathname :type "o" :defaults p))
+ files)))
++ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
++ :ld-flags
++ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
++ (find-package "MAXIMA")))))
++ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))))
+ (c::build-program "binary-ecl/maxima" :lisp-files obj
+ :ld-flags
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
+ (find-package "MAXIMA")))))
+- (if (and x (not (string= x ""))) (list x)))
++ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
+ :epilogue-code '(progn (require :defsystem)
+ (cl-user::run)))))))
+
diff --git a/sci-mathematics/maxima/files/ecls-4.patch b/sci-mathematics/maxima/files/ecls-4.patch
new file mode 100644
index 000000000000..7c597c223333
--- /dev/null
+++ b/sci-mathematics/maxima/files/ecls-4.patch
@@ -0,0 +1,16 @@
+diff --git a/src/maxima.system b/src/maxima.system
+index ee7ca0f..85ec36f 100644
+--- a/src/maxima.system
++++ b/src/maxima.system
+@@ -75,6 +75,11 @@
+ ;; Convert dir/foo.fas to dir/foo.o
+ (make-pathname :type "o" :defaults p))
+ files)))
++ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
++ :ld-flags
++ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
++ (find-package "MAXIMA")))))
++ (if (and x (not (string= x ""))) (list x))))
+ (c::build-program "binary-ecl/maxima" :lisp-files obj
+ :ld-flags
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
diff --git a/sci-mathematics/maxima/files/support-new-vtk.patch b/sci-mathematics/maxima/files/support-new-vtk.patch
new file mode 100644
index 000000000000..3296ce276467
--- /dev/null
+++ b/sci-mathematics/maxima/files/support-new-vtk.patch
@@ -0,0 +1,26 @@
+commit c21598340008892173578718afa577f93ebfdd45
+Author: Leo Butler <l_butler@users.sourceforge.net>
+Date: Sat Feb 13 16:16:20 2021 -0600
+
+ Fix SF Bug #3714, Update maxima to use vtk-8.2.0
+
+ The GlobalImmediateModeRenderingOn method was deprecated in the VTK
+ codebase in 2017,
+
+ https://github.com/Kitware/VTK/commit/67e054c91063be30e8e991de489fdda3af668e22
+
+ This commit may change or break draw-vtk user code that relies on
+ older versions of vtk.
+
+diff --git a/share/draw/vtk.lisp b/share/draw/vtk.lisp
+index 6ff0f9586..1964048d2 100644
+--- a/share/draw/vtk.lisp
++++ b/share/draw/vtk.lisp
+@@ -224,7 +224,6 @@
+ (defun vtkpolydatamapper-code (mn fn con)
+ (concatenate 'string
+ (format nil "~a=vtk.vtkPolyDataMapper()~%" mn)
+- (format nil "~a.GlobalImmediateModeRenderingOn()~%" mn)
+ (if con
+ (format nil "~a.SetInputConnection(~a.GetOutputPort())~%" mn fn)
+ "") ))
diff --git a/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild
new file mode 100644
index 000000000000..e06559d09565
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common eutils xdg-utils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=( . . y . . y )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( . . . ecl ccl . )
+# patch file version; . - no patch
+PATCH_V=( 2 1 . 3 2 1 )
+
+IUSE="emacs tk nls unicode X ${LISPS[*]}"
+
+# Languages
+LANGS="de es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} l10n_${lang/_/-}"
+done
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+RDEPEND="!app-emacs/imaxima
+ virtual/libcrypt:=
+ X? ( x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ tk? ( dev-lang/tk:0 ) )
+ emacs? ( >=app-editors/emacs-23.1:*
+ virtual/latex-base
+ app-emacs/auctex
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-latexrecommended )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP="dev-lisp/${LISP}:="
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+
+# default lisp
+DEF_LISP=0 # sbcl
+ARM_LISP=2 # gcl
+DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ use arm && DEF_LISP=${ARM_LISP}
+ ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+ NLISPS=${DEF_LISP}
+ fi
+}
+
+src_prepare() {
+ local n PATCHES v
+ PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
+
+ n=${#PATCHES[*]}
+ for ((n--; n >= 0; n--)); do
+ eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
+ done
+
+ n=${#LISPS[*]}
+ for ((n--; n >= 0; n--)); do
+ v=${PATCH_V[${n}]}
+ if [ "${v}" != "." ]; then
+ eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+ fi
+ done
+
+ eapply_user
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+ CONF=${LISPS[${n}]}
+ fi
+ CONFS="${CONFS} --enable-${CONF}"
+ done
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "l10n_${lang/_/-}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ econf ${CONFS} \
+ $(use_with tk wish) \
+ $(use_enable emacs) \
+ --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+}
+
+src_compile() {
+ emake
+ if use emacs; then
+ pushd interfaces/emacs/emaxima > /dev/null
+ elisp-compile *.el
+ popd > /dev/null
+ pushd interfaces/emacs/imaxima > /dev/null
+ BYTECOMPFLAGS="-L . -L ../emaxima"
+ elisp-compile *.el
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ docompress -x /usr/share/info
+ emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+ use tk && make_desktop_entry xmaxima xmaxima \
+ /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+ "Science;Math;Education"
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README.lisps
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+ if use emacs; then
+ elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+
+ rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+
+ insinto /usr/share/${PN}/${PV}/doc/imaxima
+ doins interfaces/emacs/imaxima/README
+ doins -r interfaces/emacs/imaxima/imath-example
+ fi
+
+ # if we use ecls, build an ecls library for maxima
+ if use ecls; then
+ ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+ insinto "${ECLLIB#${EPREFIX}}"
+ doins src/binary-ecl/maxima.fas
+ fi
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ if use emacs; then
+ elisp-site-regen
+ mktexlsr
+ fi
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
@ 2022-09-19 19:49 Andreas Sturmlechner
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2022-09-19 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 14dadc85b838b8f632c82d5a8288c78f7a85896b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 07:58:45 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 19:49:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14dadc85
sci-mathematics/maxima: drop 5.42.1-r1, EAPI-6--
Closes: https://bugs.gentoo.org/867547
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-mathematics/maxima/Manifest | 1 -
sci-mathematics/maxima/files/clozurecl-2.patch | 27 ---
.../maxima/files/dont-hardcode-python.patch | 38 ----
sci-mathematics/maxima/files/ecls-3.patch | 48 -----
sci-mathematics/maxima/files/ecls-4.patch | 16 --
sci-mathematics/maxima/files/support-new-vtk.patch | 26 ---
sci-mathematics/maxima/maxima-5.42.1-r1.ebuild | 213 ---------------------
7 files changed, 369 deletions(-)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 181148608f25..cf9ef845e6a1 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,2 +1 @@
-DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef
diff --git a/sci-mathematics/maxima/files/clozurecl-2.patch b/sci-mathematics/maxima/files/clozurecl-2.patch
deleted file mode 100644
index 5c5189c7e051..000000000000
--- a/sci-mathematics/maxima/files/clozurecl-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -r -U1 maxima-5.37.1.orig/configure.ac maxima-5.37.1/configure.ac
---- maxima-5.37.1.orig/configure.ac 2015-09-01 02:28:02.000000000 +0600
-+++ maxima-5.37.1/configure.ac 2015-09-03 18:11:54.335618720 +0600
-@@ -386,3 +386,3 @@
- dnl n.b. openmcl_default_name is hardcoded in "with" message
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- AC_ARG_ENABLE(openmcl,
-diff -r -U1 maxima-5.37.1.orig/src/Makefile.am maxima-5.37.1/src/Makefile.am
---- maxima-5.37.1.orig/src/Makefile.am 2015-08-11 02:44:21.000000000 +0600
-+++ maxima-5.37.1/src/Makefile.am 2015-09-03 17:26:12.849734012 +0600
-@@ -338,3 +338,3 @@
-
--EXECUTEOPENMCL = $(OPENMCL_NAME) -e
-+EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e
- BUILT_FILES += $(OPENMCL_MAXIMA)
-diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
---- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600
-+++ maxima-5.37.1/src/maxima.in 2015-09-03 17:22:31.841743306 +0600
-@@ -182,5 +182,5 @@
- if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
-+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
- else
-- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
-+ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
- fi
diff --git a/sci-mathematics/maxima/files/dont-hardcode-python.patch b/sci-mathematics/maxima/files/dont-hardcode-python.patch
deleted file mode 100644
index 63dea1ea1de7..000000000000
--- a/sci-mathematics/maxima/files/dont-hardcode-python.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 24 Mar 2021 20:57:44 -0400
-Subject: [PATCH 1/1] doc/info/build_html.sh.in: use @PYTHON@ for the python
- interpreter.
-
-Maxima's ./configure script already detects (or is prodded to use) a
-certain python interpreter. The build_html.sh script, however, is
-still using a hard-coded "python" command. On many systems, "python"
-will be different from the python interpreter that we want to use; for
-example when "python" is python-2.7.x and "python3" is what we want to
-use with Maxima.
-
-This commit tweaks doc/info/build_html.sh.in to use the value of the
-$PYTHON variable instead.
-
-Maxima-Bug: https://sourceforge.net/p/maxima/bugs/3754
-Gentoo-Bug: https://bugs.gentoo.org/766291
----
- doc/info/build_html.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in
-index 37930e9..c10e38d 100755
---- a/doc/info/build_html.sh.in
-+++ b/doc/info/build_html.sh.in
-@@ -46,7 +46,7 @@ do
- echo "filenamebase = \"$filenamebase\""
- cat $f
- done | @AWK@ '!/^@c / && !/^@c$/ && (/^@deffn/ || /^@defvr/ || /^@end deffn/ || /^@end defvr/ || /@category/ || /@node/ || /^filenamebase/)' | @SED@ -f @abs_srcdir@/extract_categories1.sed | @AWK@ -f @abs_srcdir@/extract_categories1.awk > make-categories.py
--python make-categories.py
-+@PYTHON@ make-categories.py
- @SED@ -e 's/^@bye/@node Documentation Categories, , Function and Variable Index\n@chapter Documentation Categories/' @abs_srcdir@/maxima.texi > maxima.texi
- ( for f in Category-*.texi; do echo '@include' $f; done ; echo @bye ) >> maxima.texi
-
---
-2.26.2
-
diff --git a/sci-mathematics/maxima/files/ecls-3.patch b/sci-mathematics/maxima/files/ecls-3.patch
deleted file mode 100644
index b44dea4d09a8..000000000000
--- a/sci-mathematics/maxima/files/ecls-3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -r -U3 maxima-5.42.0.orig/src/maxima.in maxima-5.42.0/src/maxima.in
---- maxima-5.42.0.orig/src/maxima.in 2018-09-21 08:21:11.000000000 +0700
-+++ maxima-5.42.0/src/maxima.in 2018-10-01 21:49:23.551633882 +0700
-@@ -236,7 +236,7 @@
- fi
-
- elif [ "$MAXIMA_LISP" = "ecl" ]; then
-- exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -- "$@"
-+ exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -norc -- "$@"
-
- elif [ "$MAXIMA_LISP" = "sbcl" ]; then
- # Use executable image if it exists.
-diff -r -U3 maxima-5.42.0.orig/src/maxima.system maxima-5.42.0/src/maxima.system
---- maxima-5.42.0.orig/src/maxima.system 2016-12-04 05:27:40.000000000 +0700
-+++ maxima-5.42.0/src/maxima.system 2018-10-01 22:01:08.068604254 +0700
-@@ -59,6 +59,14 @@
- (c:build-fasl output :lisp-files (list object-output)))))
-
- #+ecl
-+(defun split-ld-flags-for-ecl (string &aux space)
-+ (setf string (string-trim '(#\Space) string))
-+ (if (setf space (position #\Space string))
-+ (cons (subseq string 0 space)
-+ (split-ld-flags-for-ecl (subseq string (1+ space))))
-+ (cons string nil)))
-+
-+#+ecl
- (defun build-maxima-lib ()
- (labels ((list-all-objects (module)
- (if (eql (mk::component-type module) :file)
-@@ -75,11 +83,16 @@
- ;; Convert dir/foo.fas to dir/foo.o
- (make-pathname :type "o" :defaults p))
- files)))
-+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
-+ :ld-flags
-+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
-+ (find-package "MAXIMA")))))
-+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))))
- (c::build-program "binary-ecl/maxima" :lisp-files obj
- :ld-flags
- (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
- (find-package "MAXIMA")))))
-- (if (and x (not (string= x ""))) (list x)))
-+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
- :epilogue-code '(progn (require :defsystem)
- (cl-user::run)))))))
-
diff --git a/sci-mathematics/maxima/files/ecls-4.patch b/sci-mathematics/maxima/files/ecls-4.patch
deleted file mode 100644
index 7c597c223333..000000000000
--- a/sci-mathematics/maxima/files/ecls-4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/maxima.system b/src/maxima.system
-index ee7ca0f..85ec36f 100644
---- a/src/maxima.system
-+++ b/src/maxima.system
-@@ -75,6 +75,11 @@
- ;; Convert dir/foo.fas to dir/foo.o
- (make-pathname :type "o" :defaults p))
- files)))
-+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
-+ :ld-flags
-+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
-+ (find-package "MAXIMA")))))
-+ (if (and x (not (string= x ""))) (list x))))
- (c::build-program "binary-ecl/maxima" :lisp-files obj
- :ld-flags
- (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
diff --git a/sci-mathematics/maxima/files/support-new-vtk.patch b/sci-mathematics/maxima/files/support-new-vtk.patch
deleted file mode 100644
index 3296ce276467..000000000000
--- a/sci-mathematics/maxima/files/support-new-vtk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit c21598340008892173578718afa577f93ebfdd45
-Author: Leo Butler <l_butler@users.sourceforge.net>
-Date: Sat Feb 13 16:16:20 2021 -0600
-
- Fix SF Bug #3714, Update maxima to use vtk-8.2.0
-
- The GlobalImmediateModeRenderingOn method was deprecated in the VTK
- codebase in 2017,
-
- https://github.com/Kitware/VTK/commit/67e054c91063be30e8e991de489fdda3af668e22
-
- This commit may change or break draw-vtk user code that relies on
- older versions of vtk.
-
-diff --git a/share/draw/vtk.lisp b/share/draw/vtk.lisp
-index 6ff0f9586..1964048d2 100644
---- a/share/draw/vtk.lisp
-+++ b/share/draw/vtk.lisp
-@@ -224,7 +224,6 @@
- (defun vtkpolydatamapper-code (mn fn con)
- (concatenate 'string
- (format nil "~a=vtk.vtkPolyDataMapper()~%" mn)
-- (format nil "~a.GlobalImmediateModeRenderingOn()~%" mn)
- (if con
- (format nil "~a.SetInputConnection(~a.GetOutputPort())~%" mn fn)
- "") ))
diff --git a/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild
deleted file mode 100644
index e06559d09565..000000000000
--- a/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common eutils xdg-utils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-
-# Supported lisps
-LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
-# <lisp> supports readline: . - no, y - yes
-SUPP_RL=( . . y . . y )
-# . - just --enable-<lisp>, <flag> - --enable-<flag>
-CONF_FLAG=( . . . ecl ccl . )
-# patch file version; . - no patch
-PATCH_V=( 2 1 . 3 2 1 )
-
-IUSE="emacs tk nls unicode X ${LISPS[*]}"
-
-# Languages
-LANGS="de es pt pt_BR"
-for lang in ${LANGS}; do
- IUSE="${IUSE} l10n_${lang/_/-}"
-done
-
-# texlive-latexrecommended needed by imaxima for breqn.sty
-RDEPEND="!app-emacs/imaxima
- virtual/libcrypt:=
- X? ( x11-misc/xdg-utils
- sci-visualization/gnuplot[gd]
- tk? ( dev-lang/tk:0 ) )
- emacs? ( >=app-editors/emacs-23.1:*
- virtual/latex-base
- app-emacs/auctex
- app-text/ghostscript-gpl
- dev-texlive/texlive-latexrecommended )"
-
-# generating lisp dependencies
-depends() {
- local LISP DEP
- LISP=${LISPS[$1]}
- DEP="dev-lisp/${LISP}:="
- if [ "${SUPP_RL[$1]}" = "." ]; then
- DEP="${DEP} app-misc/rlwrap"
- fi
- echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
- LISP=${LISPS[${n}]}
- RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
- DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-
-# default lisp
-DEF_LISP=0 # sbcl
-ARM_LISP=2 # gcl
-DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
- DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
- ${DEF_DEP}"
-
-DEPEND="${RDEPEND}
- sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
- local n=${#LISPS[*]}
-
- for ((n--; n >= 0; n--)); do
- use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
- done
-
- if [ -z "${NLISPS}" ]; then
- use arm && DEF_LISP=${ARM_LISP}
- ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
- NLISPS=${DEF_LISP}
- fi
-}
-
-src_prepare() {
- local n PATCHES v
- PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
-
- n=${#PATCHES[*]}
- for ((n--; n >= 0; n--)); do
- eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
- done
-
- n=${#LISPS[*]}
- for ((n--; n >= 0; n--)); do
- v=${PATCH_V[${n}]}
- if [ "${v}" != "." ]; then
- eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
- fi
- done
-
- eapply_user
-
- # bug #343331
- rm share/Makefile.in || die
- rm src/Makefile.in || die
- touch src/*.mk
- touch src/Makefile.am
- eautoreconf
-}
-
-src_configure() {
- local CONFS CONF n lang
- for n in ${NLISPS}; do
- CONF=${CONF_FLAG[${n}]}
- if [ ${CONF} = . ]; then
- CONF=${LISPS[${n}]}
- fi
- CONFS="${CONFS} --enable-${CONF}"
- done
-
- # enable existing translated doc
- if use nls; then
- for lang in ${LANGS}; do
- if use "l10n_${lang/_/-}"; then
- CONFS="${CONFS} --enable-lang-${lang}"
- use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
- fi
- done
- fi
-
- econf ${CONFS} \
- $(use_with tk wish) \
- $(use_enable emacs) \
- --with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-}
-
-src_compile() {
- emake
- if use emacs; then
- pushd interfaces/emacs/emaxima > /dev/null
- elisp-compile *.el
- popd > /dev/null
- pushd interfaces/emacs/imaxima > /dev/null
- BYTECOMPFLAGS="-L . -L ../emaxima"
- elisp-compile *.el
- popd > /dev/null
- fi
-}
-
-src_install() {
- docompress -x /usr/share/info
- emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
- use tk && make_desktop_entry xmaxima xmaxima \
- /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
- "Science;Math;Education"
-
- # do not use dodoc because interfaces can't read compressed files
- # read COPYING before attempt to remove it from dodoc
- insinto /usr/share/${PN}/${PV}/doc
- doins AUTHORS COPYING README README.lisps
- dodir /usr/share/doc
- dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
-
- if use emacs; then
- elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
- elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
-
- rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
- insinto ${TEXMF}/tex/latex/emaxima
- doins interfaces/emacs/emaxima/emaxima.sty
-
- insinto /usr/share/${PN}/${PV}/doc/imaxima
- doins interfaces/emacs/imaxima/README
- doins -r interfaces/emacs/imaxima/imath-example
- fi
-
- # if we use ecls, build an ecls library for maxima
- if use ecls; then
- ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
- insinto "${ECLLIB#${EPREFIX}}"
- doins src/binary-ecl/maxima.fas
- fi
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- if use emacs; then
- elisp-site-regen
- mktexlsr
- fi
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- if use emacs; then
- elisp-site-regen
- mktexlsr
- fi
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2022-09-19 19:49 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-19 19:49 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-09-16 8:12 Andreas Sturmlechner
2022-09-16 7:59 Andreas Sturmlechner
2021-05-25 12:07 Andrey Grozin
2021-03-26 0:57 Michael Orlitzky
2021-03-25 14:38 Michael Orlitzky
2021-03-25 14:38 Michael Orlitzky
2021-03-25 14:38 Michael Orlitzky
2021-03-25 13:56 Andrey Grozin
2019-06-01 11:25 Andrey Grozin
2018-10-01 16:06 Andrey Grozin
2018-09-05 15:26 Andrey Grozin
2017-01-13 20:35 Ulrich Müller
2016-04-03 8:37 Andrey Grozin
2015-12-23 8:20 Ulrich Müller
2015-12-21 21:08 Ulrich Müller
2015-12-21 21:08 Ulrich Müller
2015-09-03 18:46 Andrey Grozin
2015-09-03 14:26 Andrey Grozin
2015-08-29 14:09 Andrey Grozin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox