Version bump with lots of fixes, see bugs for more details. Many thanks to Sebastien Fabbro <seb@ist.utl.pt>, Robert Dodier <robert.dodier@gmail.com>, Thomas Weidner <3.14159@gmx.net> and others for their work. Closes bugs 112717 and 112754.

(Portage version: 2.1_pre7-r5)

6 files changed, 211 insertions, 11 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index d78006af7211..b5ae1d8615b8 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.18 2006/04/12 06:16:35 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.19 2006/04/15 14:57:46 cryos Exp $
+
+*maxima-5.9.3 (15 Apr 2006)
+
+  15 Apr 2006; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/maxima-5.9.3-default-browser.patch,
+  +files/maxima-5.9.3-emaxima.patch, +maxima-5.9.3.ebuild:
+  Version bump with lots of fixes, see bugs for more details. Many thanks to
+  Sebastien Fabbro <seb@ist.utl.pt>, Robert Dodier <robert.dodier@gmail.com>,
+  Thomas Weidner <3.14159@gmx.net> and others for their work. Closes bugs
+  112717 and 112754.
 
   11 Apr 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   maxima-5.9.1-r5.ebuild:
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index cc05fb07b330..b26bfc96ba7d 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,21 +1,45 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b81d16cacb806b94d84a2b855f9e85fc ChangeLog 5825
+RMD160 73ee05ee5c31a769c8d8c500bfc2319c3a8cfd39 ChangeLog 5825
+SHA256 13f86b8ed6d85af642c95fb75068f04a58cd6a8165ecd1b6f1efc648779914a4 ChangeLog 5825
 MD5 6957a9bafd71a24b58e148bb2ee58257 files/50maxima-gentoo.el 346
+RMD160 cea92868f884062c2cf8a4463aa717789e43a8fb files/50maxima-gentoo.el 346
+SHA256 402b016c3215dea129731405818699c2ca9d114ff54bf3274e9c6597b2f7092a files/50maxima-gentoo.el 346
 MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1 65
+RMD160 cc408ee71151e1e8454f62c4f6c69b2c44121527 files/digest-maxima-5.9.1 65
+SHA256 253b31f30fec4f3e453a6f76975b902c40062750169e2d0d58644d388bf19465 files/digest-maxima-5.9.1 65
 MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r5 65
+RMD160 cc408ee71151e1e8454f62c4f6c69b2c44121527 files/digest-maxima-5.9.1-r5 65
+SHA256 253b31f30fec4f3e453a6f76975b902c40062750169e2d0d58644d388bf19465 files/digest-maxima-5.9.1-r5 65
+MD5 b0b6f0a0adb8e2b019e9a3d9decbcf14 files/digest-maxima-5.9.3 241
+RMD160 3954badfebef02d3ae2280deb98c9ee77f8e7f29 files/digest-maxima-5.9.3 241
+SHA256 e91682eae89570d2bb81449c39338148defb3bdda14cd1c815b2c26ca8c92927 files/digest-maxima-5.9.3 241
 MD5 801d6f51244585c2fa72877f708e9843 files/maxima-5.9.1-fix-clisp-getpid.patch 473
+RMD160 60874eaf099746cecb10556b3e94d8fcf87d40cd files/maxima-5.9.1-fix-clisp-getpid.patch 473
+SHA256 255e8300e92cecb6781d3e9f8b6c022354a7db8cb2c3c3581a86395d9c6333ce files/maxima-5.9.1-fix-clisp-getpid.patch 473
 MD5 3fdd1a597381634159c90b916ede48ae files/maxima-5.9.1-no-kill-minus-one.patch 871
+RMD160 c77640c2fdf035babf46bdfb24eed8a8339c1efa files/maxima-5.9.1-no-kill-minus-one.patch 871
+SHA256 45c35de5a4784eb9bc9b38f593eb4186b4888558c2e1af00f34c99e681594f38 files/maxima-5.9.1-no-kill-minus-one.patch 871
 MD5 9d2fde2c70ca34c55c220ac2e46fe463 files/maxima-5.9.1-unicode-fix.patch 9157
+RMD160 9309981ef8f7131bde7dd16117bc542ba3041297 files/maxima-5.9.1-unicode-fix.patch 9157
+SHA256 85fcccd312f9a912148bf7568c52439d3ceda5af4b430e9cf276f98c44cefa02 files/maxima-5.9.1-unicode-fix.patch 9157
+MD5 19f868e092b9726a4d0371521ebce6ff files/maxima-5.9.3-default-browser.patch 498
+RMD160 b9cd13d68ed458e383b2a8d5dacb7088fad59926 files/maxima-5.9.3-default-browser.patch 498
+SHA256 dabf7128e55a2bc1178538d48ae0cbe47337a501bc6cab46a296850efc754c36 files/maxima-5.9.3-default-browser.patch 498
+MD5 71f7028fab51b5e5378fd5021ffa1962 files/maxima-5.9.3-emaxima.patch 706
+RMD160 deec6cf944fe75aa39f0ced6271dc7c5f9f74995 files/maxima-5.9.3-emaxima.patch 706
+SHA256 717f2a81c0a5d643e50a0062018c1425f9661b3536af3f6ffa6836d193bd865e files/maxima-5.9.3-emaxima.patch 706
 MD5 55d928e715074355a442baf0934487de files/maxima-emacs.patch 826
+RMD160 e6030b78934ace0c31b1cddf108e3e885cee7abf files/maxima-emacs.patch 826
+SHA256 eb28871fb0019c92961a96f27380400379798eac7b884943a3c75ba9832acce4 files/maxima-emacs.patch 826
 MD5 f653050981b2fed1501454602f59ad11 maxima-5.9.1-r5.ebuild 2571
+RMD160 ebac3868f73122da2777fa53b86d2eef0aebe7ab maxima-5.9.1-r5.ebuild 2571
+SHA256 9aee8bf82b4b47a1f3d04992de623cb2173862451591510cd49fc227b1f08db0 maxima-5.9.1-r5.ebuild 2571
 MD5 a5bd93bd68dec962956ea5ed64b5c276 maxima-5.9.1.ebuild 2532
+RMD160 a4145d603c61df84ece22b2a06631f487904c514 maxima-5.9.1.ebuild 2532
+SHA256 6bbb7dc68d8bc64954ee7e621a4c3afc26a8b777c6cea8eb7e50210fa1083bcc maxima-5.9.1.ebuild 2532
+MD5 6b3179a438fd3c520cd2b9b347058961 maxima-5.9.3.ebuild 3615
+RMD160 b83008b48afd26e8b405afca94cbae7fe59d5ecc maxima-5.9.3.ebuild 3615
+SHA256 6fe9aa937efaf6af38a14566d3cc696bca4936c6ac34c8e59bbaae0f9195d0dc maxima-5.9.3.ebuild 3615
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD4DBQFEPJTP/NoSW7FuNV8RArpGAJQKQ8WjjLNQRPuTC8ubCFhDqiLZAKCTV6wE
-GV5LtW3Po0KRSTIT2TeURQ==
-=tD/L
------END PGP SIGNATURE-----
+RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
+SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.9.3 b/sci-mathematics/maxima/files/digest-maxima-5.9.3
new file mode 100644
index 000000000000..66a15c4deed9
--- /dev/null
+++ b/sci-mathematics/maxima/files/digest-maxima-5.9.3
@@ -0,0 +1,3 @@
+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.9.3-default-browser.patch b/sci-mathematics/maxima/files/maxima-5.9.3-default-browser.patch
new file mode 100644
index 000000000000..161273889944
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.9.3-default-browser.patch
@@ -0,0 +1,14 @@
+--- maxima-5.9.3/interfaces/xmaxima/Tkmaxima/Menu.tcl	2005-09-30 16:23:11.000000000 +0100
++++ maxima-5.9.3/interfaces/xmaxima/Tkmaxima/Menu.tcl.new	2006-04-08 16:01:02.000000000 +0100
+@@ -215,9 +215,9 @@
+ 	}
+     } 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 --git a/sci-mathematics/maxima/files/maxima-5.9.3-emaxima.patch b/sci-mathematics/maxima/files/maxima-5.9.3-emaxima.patch
new file mode 100644
index 000000000000..992d0b1afb79
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.9.3-emaxima.patch
@@ -0,0 +1,13 @@
+--- maxima-5.9.3/interfaces/emacs/emaxima/maxima.el~	2005-06-21 23:48:42.000000000 -0400
++++ maxima-5.9.3/interfaces/emacs/emaxima/maxima.el	2006-04-07 12:10:29.000000000 -0400
+@@ -2756,8 +2756,8 @@
+       (save-excursion
+         (set-buffer mbuf)
+         (setq inferior-maxima-process (get-buffer-process mbuf))
+-        (add-to-list 'comint-output-filter-functions
+-                     'inferior-maxima-output-filter)
++;        (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
diff --git a/sci-mathematics/maxima/maxima-5.9.3.ebuild b/sci-mathematics/maxima/maxima-5.9.3.ebuild
new file mode 100644
index 000000000000..a9e1f062d378
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.9.3.ebuild
@@ -0,0 +1,136 @@
+# 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.9.3.ebuild,v 1.1 2006/04/15 14:57:46 cryos 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 tcltk 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 )
+	tcktk? ( >=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 tcltk; 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 tcltk && 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
+}