Cleaning of maxima, committing gentooscience overlay changes.

(Portage version: 2.1.2.2)

10 files changed, 240 insertions, 401 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 8b9c02cfd820..be257cc8f777 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.26 2007/04/16 08:51:11 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.27 2007/04/18 10:53:32 bicatali Exp $
+
+*maxima-5.11.0-r2 (18 Apr 2007)
+
+  18 Apr 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/maxima-5.10.0.patch, +files/maxima-5.11.0-xdg-utils.patch,
+  files/50maxima-gentoo.el, -maxima-5.9.3.ebuild, -maxima-5.10.0.ebuild,
+  +maxima-5.11.0-r2.ebuild:
+  auctex flag replaced by emacs+tetex. Cleaned ebuild, removed 
+  obsolete versions. Added a warning using gnuplot.
+  maxima-5.11.0-r2 now depends on x11-misc/xdg-utils,
+  default-browser.patch and default-psviewer.patch replaced 
+  by xdg-utils.patch; sbcl-disable-debugger.patch dropped, 
+  see http://bugzilla.redhat.com/214568. Thanks to Andrey Grozin for his 
+  work on the gentooscience overlay.
 
 *maxima-5.11.0-r1 (16 Apr 2007)
 
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
+ 
diff --git a/sci-mathematics/maxima/maxima-5.10.0.ebuild b/sci-mathematics/maxima/maxima-5.10.0.ebuild
deleted file mode 100644
index 166461322051..000000000000
--- a/sci-mathematics/maxima/maxima-5.10.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.10.0.ebuild,v 1.1 2006/10/31 11:24:06 je_fro Exp $
-
-inherit eutils elisp-common autotools
-
-DESCRIPTION="Free computer algebra environment, based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 AECA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="cmucl clisp sbcl gcl tetex emacs auctex tk nls unicode"
-
-RDEPEND=">=sci-visualization/gnuplot-4.0
-	app-text/gv
-	tetex? ( virtual/tetex )
-	emacs? ( virtual/emacs )
-	auctex? ( app-emacs/auctex )
-	clisp? ( >=dev-lisp/clisp-2.33.2-r1 )
-	gcl?   ( >=dev-lisp/gcl-2.6.7 )
-	sbcl?  ( >=dev-lisp/sbcl-0.9.4 app-misc/rlwrap )
-	cmucl? ( >=dev-lisp/cmucl-19a app-misc/rlwrap )
-	!clisp? ( !sbcl? ( !cmucl? ( >=dev-lisp/gcl-2.6.7 ) ) )
-	tk? ( >=dev-lang/tk-8.3.3 )"
-DEPEND="${RDEPEND} >=sys-apps/texinfo-4.3"
-
-for lang in es pt; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-# chosen apps are hardcoded in maxima source:
-# - ghostview for postscript (changed to gv)
-# - acroread for pdf
-# - xdvi for dvi. this could change, with pain.
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}.patch"
-}
-
-src_compile() {
-
-# automake version mismatch otherwise (sbcl only)
-	use sbcl && eautoreconf
-
-# remove rmaxima if neither cmucl nor sbcl
-	if ! use sbcl && ! use cmucl ; then
-		sed -i -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' src/Makefile.in
-	fi
-
-# remove xmaxima if no tk in USE
-	local myconf=""
-	if use tk; then
-		myconf="${myconf} --with-wish=wish"
-	else
-		myconf="${myconf} --with-wish=none"
-		sed -i -e '/^SUBDIRS/s/xmaxima//' interfaces/Makefile.in
-	fi
-
-# enable gcl if no other lisp is selected
-	if use gcl || (! use cmucl && ! use clisp && ! use sbcl ); then
-		if ! built_with_use dev-lisp/gcl ansi; then
-			eerror "GCL must be installed with ANSI."
-			eerror "Try USE=\"ansi\" emerge gcl"
-			die "This package needs gcl with USE=ansi"
-		fi
-	myconf="${myconf} --enable-gcl"
-	fi
-
-# use existing translated docs
-	if use nls; then
-		for lang in es pt; do
-			if use linguas_${lang}; then
-				myconf="${myconf} --enable-lang-${lang}"
-				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf \
-	$(use_enable cmucl) \
-	$(use_enable clisp) \
-	$(use_enable sbcl) \
-	${myconf} \
-	|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png
-
-	if use emacs; then
-		sed -e "s/PV/${PV}/" "${FILESDIR}"/50maxima-gentoo.el > 50maxima-gentoo.el
-		elisp-site-file-install 50maxima-gentoo.el
-	fi
-
-	if use tetex; then
-		insinto /usr/share/texmf/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-	fi
-
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS ChangeLog COPYING NEWS README*
-	dodir /usr/share/doc
-	dosym /usr/share/${PN}/${PV}/doc /usr/share/doc/${PF}
-}
-
-pkg_preinst() {
-# some lisp do not gunzip info files on the fly
-
-	if use cmucl || use clisp || use sbcl; then
-		for infofile in $(ls ${D}/usr/share/info/*.gz); do
-			gunzip ${infofile}
-		done
-	fi
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-	use tetex && mktexlsr
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/maxima/maxima-5.11.0-r2.ebuild b/sci-mathematics/maxima/maxima-5.11.0-r2.ebuild
new file mode 100644
index 000000000000..4f4956c7f07a
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.11.0-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.11.0-r2.ebuild,v 1.1 2007/04/18 10:53:32 bicatali Exp $
+
+inherit eutils elisp-common autotools
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 AECA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cmucl clisp sbcl gcl tetex emacs tk nls unicode"
+
+# rlwrap is recommended for cmucl and sbcl
+RDEPEND=">=sci-visualization/gnuplot-4.0
+	x11-misc/xdg-utils
+	tetex? ( virtual/tetex )
+	emacs? ( virtual/emacs
+	     tetex? ( || ( app-emacs/auctex app-xemacs/auctex ) ) )
+	clisp? ( >=dev-lisp/clisp-2.33.2-r1 )
+	gcl?   ( >=dev-lisp/gcl-2.6.7 )
+	sbcl?  ( >=dev-lisp/sbcl-0.9.4 app-misc/rlwrap )
+	cmucl? ( >=dev-lisp/cmucl-19a app-misc/rlwrap )
+	!clisp? ( !sbcl? ( !cmucl? ( >=dev-lisp/gcl-2.6.7 ) ) )
+	tk? ( >=dev-lang/tk-8.3.3 )"
+
+DEPEND="${RDEPEND} >=sys-apps/texinfo-4.3"
+# the make install already strips maxima exec.
+RESTRICT="nostrip"
+
+for lang in es pt; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+
+pkg_setup() {
+# Don't install in the main tree, as this may cause file collisions
+	if use tetex; then
+		local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)"
+		local TEXMFCONFIGFILE="$(kpsewhich texmf.cnf)"
+
+		if [ -z "${TEXMFPATH}" ]; then
+			eerror "You haven't defined the TEXMFSITE variable in your TeX config."
+			eerror "Please do so in the file ${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf}"
+			die "Define TEXMFSITE in TeX configuration!"
+		else
+			# go through the colon separated list of directories (maybe only one) provided in the variable
+			# TEXMFPATH (generated from TEXMFSITE from TeX's config) and choose only the first entry.
+			# All entries are separated by colons, even when defined with semi-colons, kpsewhich changes
+			# the output to a generic format, so IFS has to be redefined.
+			local IFS="${IFS}:"
+
+			for strippedpath in ${TEXMFPATH}
+			do
+				if [ -d ${strippedpath} ]; then
+					MAXIMA_TEXMFDIR="${strippedpath}"
+					break
+				fi
+			done
+
+			# verify if an existing path was chosen to prevent from installing into the wrong directory
+			if [ -z ${MAXIMA_TEXMFDIR} ]; then
+				eerror "TEXMFSITE does not contain any existing directory."
+				eerror "Please define an existing directory in your TeX config file"
+				eerror "${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf} or create at least one of the there specified directories"
+				die "TEXMFSITE variable did not contain an existing directory"
+			fi
+		fi
+	fi
+
+	if ! built_with_use -a sci-visualization/gnuplot png gd; then
+		elog "To benefit full plotting capability of maxima,"
+		elog "enable the png and gd USE flags enabled for"
+		elog "both sci-visualization/gnuplot and media-libs/gd"
+		elog "Then re-emerge maxima"
+		epause 5
+	fi
+
+	# enable gcl if no other lisp selected
+	if use gcl || (! use cmucl && ! use clisp && ! use sbcl ); then
+		if ! built_with_use dev-lisp/gcl ansi; then
+			eerror "GCL must be installed with ANSI."
+			eerror "Try USE=\"ansi\" emerge gcl"
+			die "This package needs gcl with USE=ansi"
+		fi
+		enablegcl="--enable-gcl"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# use xdg-open to view html, ps, pdf
+	epatch "${FILESDIR}/${P}-xdg-utils.patch"
+	# diff_form autoloading
+	epatch "${FILESDIR}/${P}-diff_form.patch"
+}
+
+src_compile() {
+	# automake version mismatch otherwise (sbcl only)
+	use sbcl && eautoreconf
+
+	# remove rmaxima if neither cmucl nor sbcl
+	if ! use sbcl && ! use cmucl ; then
+		sed -i -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' src/Makefile.in
+	fi
+
+	# remove xmaxima if no tk
+	local myconf="${enablegcl}"
+	if use tk; then
+		myconf="${myconf} --with-wish=wish"
+	else
+		myconf="${myconf} --with-wish=none"
+		sed -i -e '/^SUBDIRS/s/xmaxima//' interfaces/Makefile.in
+	fi
+
+	# enable existing translated doc
+	if use nls; then
+		for lang in es pt; do
+			if use linguas_${lang}; then
+				myconf="${myconf} --enable-lang-${lang}"
+				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
+			fi
+		done
+	fi
+
+	econf \
+		$(use_enable cmucl) \
+		$(use_enable clisp) \
+		$(use_enable sbcl) \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	use tk && make_desktop_entry xmaxima xmaxima \
+		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png
+
+	use emacs && \
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el
+
+	if use tetex; then
+		insinto "${MAXIMA_TEXMFDIR}/tex/latex/emaxima"
+		doins interfaces/emacs/emaxima/emaxima.sty
+	fi
+
+	insinto /usr/share/${PN}/${PV}/doc
+	doins AUTHORS ChangeLog COPYING NEWS README*
+	dodir /usr/share/doc
+	dosym /usr/share/${PN}/${PV}/doc /usr/share/doc/${PF}
+}
+
+pkg_preinst() {
+	# some lisp do not gunzip info files on the fly
+	if use cmucl || use clisp || use sbcl; then
+		for infofile in $(ls ${D}/usr/share/info/*.gz); do
+			gunzip ${infofile}
+		done
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use tetex && mktexlsr
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/maxima/maxima-5.9.3.ebuild b/sci-mathematics/maxima/maxima-5.9.3.ebuild
deleted file mode 100644
index 60227fab1d95..000000000000
--- a/sci-mathematics/maxima/maxima-5.9.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.3.ebuild,v 1.3 2007/04/16 08:51:11 opfer Exp $
-
-inherit eutils elisp-common autotools
-
-DESCRIPTION="Free computer algebra environment, based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 AECA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="cmucl clisp sbcl gcl tetex emacs auctex tk nls unicode"
-
-DEPEND=">=sys-apps/texinfo-4.3
-	tetex? ( virtual/tetex )
-	emacs? ( virtual/emacs )
-	auctex? ( app-emacs/auctex )
-	!clisp? ( !sbcl? ( !cmucl? ( >=dev-lisp/gcl-2.6.7 ) ) )
-	cmucl? ( >=dev-lisp/cmucl-19a )
-	clisp? ( >=dev-lisp/clisp-2.33.2-r1 )
-	gcl?   ( >=dev-lisp/gcl-2.6.7 )
-	sbcl?  ( >=dev-lisp/sbcl-0.9.4 )"
-
-# rlwrap is recommended for clisp and sbcl
-RDEPEND=">=sci-visualization/gnuplot-4.0
-	app-text/gv
-	sbcl?  ( app-misc/rlwrap )
-	cmucl? ( app-misc/rlwrap )
-	tk? ( >=dev-lang/tk-8.3.3 )"
-
-# chosen apps are hardcoded in maxima source:
-# - ghostview for postscript (changed to gv)
-# - acroread for pdf
-# - xdvi for dvi. this could change, with pain.
-
-src_unpack() {
-	unpack ${A}
-	# small patch for emaxima (from fedora)
-	epatch ${FILESDIR}/${PF}-emaxima.patch
-	# patch to select firefox as def. browswer and add opera as choices
-	epatch ${FILESDIR}/${PF}-default-browser.patch
-	# replace ugly ghostview with gv
-	for psfile in $(grep -rl ghostview ${PF}/*); do
-		sed -i -e 's/ghostview/gv/g' ${psfile}
-	done
-}
-
-src_compile() {
-	# automake version mismatch otherwise (sbcl only)
-	use sbcl && eautoreconf
-
-	# remove rmaxima if neither cmucl nor sbcl
-	if ! use sbcl && ! use cmucl ; then
-		sed -i -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' src/Makefile.in
-	fi
-
-	# remove xmaxima if no tk
-	local myconf=""
-	if use tk; then
-		myconf="${myconf} --with-wish=wish"
-	else
-		myconf="${myconf} --with-wish=none"
-		sed -i -e '/^SUBDIRS/s/xmaxima//' interfaces/Makefile.in
-	fi
-
-	# enable gcl if no other lisp selected
-	if use gcl || (! use cmucl && ! use clisp && ! use sbcl ); then
-		if ! built_with_use dev-lisp/gcl ansi; then
-			eerror "GCL must be installed with ANSI."
-			eerror "Try USE=\"ansi\" emerge gcl"
-			die "This package needs gcl with USE=ansi"
-		fi
-		myconf="${myconf} --enable-gcl"
-	fi
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in es pt; do
-			if use linguas_${lang}; then
-				myconf="${myconf} --enable-lang-${lang}"
-				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf \
-		$(use_enable cmucl) \
-		$(use_enable clisp) \
-		$(use_enable sbcl) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png
-
-	if use emacs; then
-		sed -e "s/PV/${PV}/" "${FILESDIR}"/50maxima-gentoo.el > 50maxima-gentoo.el
-		elisp-site-file-install 50maxima-gentoo.el
-	fi
-
-	if use tetex; then
-		insinto /usr/share/texmf/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-	fi
-
-	# install documentation
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS ChangeLog COPYING NEWS README*
-	dodir /usr/share/doc
-	dosym /usr/share/${PN}/${PV}/doc /usr/share/doc/${PF}
-}
-
-pkg_preinst() {
-	# do not gunzip the info files in certain cases of lisp
-	if use cmucl || use clisp || use sbcl; then
-		for infofile in $(ls ${D}/usr/share/info/*.gz); do
-			gunzip ${infofile}
-		done
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use tetex && mktexlsr
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}