sci-mathematics/maxima: version bump

Package-Manager: portage-2.2.20.1

5 files changed, 118 insertions, 0 deletions

diff --git a/sci-mathematics/maxima/files/clisp-1.patch b/sci-mathematics/maxima/files/clisp-1.patch
new file mode 100644
index 00000000000..9dc8dfd7d51
--- /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 00000000000..5c5189c7e05
--- /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 00000000000..c87a6c922b3
--- /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 00000000000..d9af8c373ca
--- /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 00000000000..8899f097370
--- /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)