Cleaning of maxima, committing gentooscience overlay changes.

(Portage version: 2.1.2.2)

6 files changed, 53 insertions, 133 deletions

diff --git a/sci-mathematics/maxima/files/50maxima-gentoo.el b/sci-mathematics/maxima/files/50maxima-gentoo.el
index 7ec9767413a8..cbba83115f8f 100644
--- a/sci-mathematics/maxima/files/50maxima-gentoo.el
+++ b/sci-mathematics/maxima/files/50maxima-gentoo.el
@@ -1,5 +1,5 @@
 ;; maxima mode
-(add-to-list 'load-path "/usr/share/maxima/PV/emacs")
+(add-to-list 'load-path "@SITELISP@")
 (autoload 'maxima-mode "maxima" "Maxima mode" t)
 (autoload 'maxima "maxima" "Maxima interactive" t)
 (setq auto-mode-alist (cons '("\\.max" . maxima-mode) auto-mode-alist))
@@ -10,4 +10,3 @@
 ;; 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/digest-maxima-5.10.0 b/sci-mathematics/maxima/files/digest-maxima-5.10.0
deleted file mode 100644
index 305a1626da24..000000000000
--- a/sci-mathematics/maxima/files/digest-maxima-5.10.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e7f5ecabf990f350c5f662f106d83b7 maxima-5.10.0.tar.gz 9957907
-RMD160 6ec60429f3720c9d8dca5d628e49d2eb01e24fc1 maxima-5.10.0.tar.gz 9957907
-SHA256 b59e3af8a771b92158410bed6327f18a6a69bccd4e776d83a3952a67bd388c49 maxima-5.10.0.tar.gz 9957907
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.11.0-r2 b/sci-mathematics/maxima/files/digest-maxima-5.11.0-r2
new file mode 100644
index 000000000000..706606789654
--- /dev/null
+++ b/sci-mathematics/maxima/files/digest-maxima-5.11.0-r2
@@ -0,0 +1,3 @@
+MD5 d9ae353e8eba9b9d5686e119e59ab88c maxima-5.11.0.tar.gz 13924132
+RMD160 8f7fb1b8bc7438ffdc393a0eb0f86b5efa79ef3e maxima-5.11.0.tar.gz 13924132
+SHA256 7a7259123bd81a7de3609c7e59b561d49e2710a8f7117c42f373afdd6a6786ac maxima-5.11.0.tar.gz 13924132
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.9.3 b/sci-mathematics/maxima/files/digest-maxima-5.9.3
deleted file mode 100644
index 66a15c4deed9..000000000000
--- a/sci-mathematics/maxima/files/digest-maxima-5.9.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e6388632d91722bb0607914bdabc72f6 maxima-5.9.3.tar.gz 8629022
-RMD160 4b00da6406bab222f4a7069c4e8820a9437277f9 maxima-5.9.3.tar.gz 8629022
-SHA256 1807e46e12b5968ac70643eee32a3479fc06035613086d85366610440842abb9 maxima-5.9.3.tar.gz 8629022
diff --git a/sci-mathematics/maxima/files/maxima-5.10.0.patch b/sci-mathematics/maxima/files/maxima-5.10.0.patch
deleted file mode 100644
index 749063757ece..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.10.0.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -r -U4 maxima-5.10.0.orig/interfaces/emacs/emaxima/maxima.el maxima-5.10.0/interfaces/emacs/emaxima/maxima.el
---- maxima-5.10.0.orig/interfaces/emacs/emaxima/maxima.el	2005-06-22 05:48:42.000000000 +0200
-+++ maxima-5.10.0/interfaces/emacs/emaxima/maxima.el	2006-09-21 20:04:48.000000000 +0200
-@@ -2704,9 +2704,9 @@
-               (process-mark inferior-maxima-process))))
- 
- (defun inferior-maxima-wait-for-output ()
-   "Wait for output from the Maxima process."
--  (while (and 
-+  (when (and 
-           inferior-maxima-waiting-for-output
-           (inferior-maxima-running))
-     (accept-process-output inferior-maxima-process))
-   (if maxima-running-xemacs
-@@ -2759,10 +2759,10 @@
-         (add-to-list 'comint-output-filter-functions
-                      'inferior-maxima-output-filter)
- ;        (add-to-list 'comint-output-filter-functions
- ;                     'inferior-maxima-replace-tabs-by-spaces)
--        (add-to-list 'comint-output-filter-functions
--                     'inferior-maxima-remove-double-input-prompt)
-+;        (add-to-list 'comint-output-filter-functions
-+;                     'inferior-maxima-remove-double-input-prompt)
- 	(if maxima-fix-double-prompt
-             (add-to-list 'comint-output-filter-functions
-                          'inferior-maxima-remove-double-prompt))
-         (inferior-maxima-wait-for-output)
-diff -r -U4 maxima-5.10.0.orig/interfaces/emacs/misc/bookmode.el maxima-5.10.0/interfaces/emacs/misc/bookmode.el
---- maxima-5.10.0.orig/interfaces/emacs/misc/bookmode.el	2000-05-08 08:09:44.000000000 +0200
-+++ maxima-5.10.0/interfaces/emacs/misc/bookmode.el	2006-09-21 20:18:03.000000000 +0200
-@@ -679,9 +679,9 @@
- 			    'book-set-postscript-value beg end (nth 1 tem)))
- 		
- 		  (and tem
- 		       (list (concat "View "(nth 1 tem))
--			     'call-process  "ghostview" nil nil nil
-+			     'call-process  "gv" nil nil nil
- 			     (expand-file-name(nth 1 tem))
- 			     ))
- 		  (list "Cancel")
- 		  )))
-@@ -704,9 +704,9 @@
- 			 ;; construct command to pass to the shell.
- 			 (concat
- 			  (cond ((looking-at "%PS") "")
- 				(t "gzip -dc | "))
--			  "ghostview -")
-+			  "gv -")
- 			 
- 	)))
- 	 
- (defun book-set-postscript-value ( beg end &optional file)
-diff -r -U4 maxima-5.10.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl
---- maxima-5.10.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-08-03 15:21:57.000000000 +0200
-+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-09-21 20:20:32.000000000 +0200
-@@ -142,9 +142,9 @@
-     text/plain netmath
-     image/gif  netmath
-     image/png  netmath
-     image/jpeg netmath
--    application/postscript "ghostview -safer %s"
-+    application/postscript "gv -safer %s"
-     application/pdf "acroread %s"
-     application/x-dvi "xdvi %s"
- }
- set maxima_priv(imagecounter) 0
-diff -r -U4 maxima-5.10.0.orig/interfaces/xmaxima/Tkmaxima/Menu.tcl maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl
---- maxima-5.10.0.orig/interfaces/xmaxima/Tkmaxima/Menu.tcl	2006-09-11 17:38:01.000000000 +0200
-+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2006-09-21 20:08:45.000000000 +0200
-@@ -214,11 +214,11 @@
- 	    lappend browse cmd.exe /c start
- 	}
-     } else {
- 	
--	set selectedbrowser mozilla
-+	set selectedbrowser firefox
- 
--	foreach b { mozilla konqueror epiphany firefox netscape } {
-+	foreach b { firefox konqueror epiphany mozilla opera netscape } {
- 	    if { ! [catch {exec which $b} ] } {
- 		set selectedbrowser $b
- 		break } }
- 
-diff -r -U4 maxima-5.10.0.orig/src/Makefile.am maxima-5.10.0/src/Makefile.am
---- maxima-5.10.0.orig/src/Makefile.am	2006-09-05 01:52:42.000000000 +0200
-+++ maxima-5.10.0/src/Makefile.am	2006-09-21 20:11:16.000000000 +0200
-@@ -150,9 +150,9 @@
- endif
- 
- 
- if SBCL
--EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
-+EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
- all-local: binary-sbcl/maxima.core
- install-exec-local: install-sbcl
- uninstall: uninstall-sbcl
- clean: clean-sbcl
-diff -r -U4 maxima-5.10.0.orig/src/Makefile.in maxima-5.10.0/src/Makefile.in
---- maxima-5.10.0.orig/src/Makefile.in	2006-09-21 06:00:57.000000000 +0200
-+++ maxima-5.10.0/src/Makefile.in	2006-09-21 20:14:59.000000000 +0200
-@@ -203,9 +203,9 @@
- @CLISP_TRUE@EXECUTECLISP = $(CLISP_NAME) -norc -q -x
- @CMUCL_TRUE@EXECUTECMUCL = $(CMUCL_NAME) -noinit -batch
- @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) --noinform --noprint --disable-debugger --eval
- @GCL_TRUE@EXECUTEGCL = $(GCL_NAME) -batch -eval
- @OPENMCL_TRUE@EXECUTEOPENMCL = $(OPENMCL_NAME) -e
- genericdir = $(instsrcdir)
- real_lisp_sources = acall.lisp \
-diff -r -U4 maxima-5.10.0.orig/src/plot.lisp maxima-5.10.0/src/plot.lisp
---- maxima-5.10.0.orig/src/plot.lisp	2006-08-26 13:13:40.000000000 +0200
-+++ maxima-5.10.0/src/plot.lisp	2006-09-21 20:19:02.000000000 +0200
-@@ -74,9 +74,9 @@
-                         ((mlist) $logy nil)
-                         ((mlist) $plot_realpart nil)
-                         ))
- 
--(defvar $viewps_command  "(ghostview \"~a\")")
-+(defvar $viewps_command  "(gv \"~a\")")
- 
- ;; $plot_realpart option is false by default but *plot-realpart* is true because coerce-float-fun
- ;; is used outside of plot package too.
- (defvar *plot-realpart* t)
diff --git a/sci-mathematics/maxima/files/maxima-5.11.0-xdg-utils.patch b/sci-mathematics/maxima/files/maxima-5.11.0-xdg-utils.patch
new file mode 100644
index 000000000000..eb0cb91ce007
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.11.0-xdg-utils.patch
@@ -0,0 +1,49 @@
+--- maxima-5.11.0/interfaces/emacs/misc/bookmode.el.xdg_utils	2000-05-08 01:09:44.000000000 -0500
++++ maxima-5.11.0/interfaces/emacs/misc/bookmode.el	2006-12-27 13:07:51.000000000 -0600
+@@ -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 -")
+ 			 
+ 	)))
+ 	 
+--- maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.xdg_utils	2006-12-09 13:52:11.000000000 -0600
++++ maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2006-12-27 13:00:45.000000000 -0600
+@@ -245,9 +245,9 @@
+ 	}
+     } else {
+ 	
+-	set selectedbrowser mozilla
++	set selectedbrowser xdg-open 
+ 
+-	foreach b { firefox mozilla konqueror epiphany galeon amaya netscape } {
++	foreach b { xdg-open htmlview firefox mozilla konqueror epiphany galeon amaya netscape } {
+ 	    if { ! [catch {exec which $b} ] } {
+ 		set selectedbrowser $b
+ 		break } }
+--- maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Constants.tcl.xdg_utils	2006-10-01 17:42:48.000000000 -0500
++++ maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-12-27 13:01:52.000000000 -0600
+@@ -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 %s"
++    application/pdf "xdg-open %s"
++    application/x-dvi "xdg-open %s"
+ }
+ set maxima_priv(imagecounter) 0
+