New revision incorporating a Unicode patch (fixes bug #92644).

Package-Manager: portage-2.0.51.22-r2

5 files changed, 307 insertions, 2 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 18d1620492f1..44bb2023b4f7 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.7 2005/08/20 18:16:23 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.8 2005/08/20 20:55:56 ribosome Exp $
+
+*maxima-5.9.1-r3 (20 Aug 2005)
+
+  20 Aug 2005; Olivier Fisette <ribosome@gentoo.org>
+  +files/maxima-5.9.1-unicode-fix.patch, +maxima-5.9.1-r3.ebuild:
+  New revision incorporating a Unicode patch, thanks to Thomas Weidner
+  <3.14159@gmx.net> (fixes bug #92644).
 
   20 Aug 2005; Olivier Fisette <ribosome@gentoo.org> maxima-5.9.1-r2.ebuild:
   Depend on >=gcl-2.6.7 (fixes bug #81869). Removed ~amd64 previously added by
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 66e927298f57..e30584491230 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,9 +1,12 @@
 MD5 d18fa5be898380dc9f61ca9375a611c1 maxima-5.9.1-r2.ebuild 2632
 MD5 1a4d91430daee0b2899a662587093b22 maxima-5.9.1.ebuild 2494
-MD5 76afe8be83659a73f1f70389cf930644 ChangeLog 3913
+MD5 3a2b0bb24cf80a98f446895295d38afd maxima-5.9.1-r3.ebuild 2633
+MD5 2650a843edabbd09640f557be4d06a4c ChangeLog 4176
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 65b7a40d91f001812e6d3563032ab298 files/5.9.1-sbcl-gentoo.patch 597
 MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r2 65
+MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r3 65
 MD5 6957a9bafd71a24b58e148bb2ee58257 files/50maxima-gentoo.el 346
 MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1 65
+MD5 9d2fde2c70ca34c55c220ac2e46fe463 files/maxima-5.9.1-unicode-fix.patch 9157
 MD5 55d928e715074355a442baf0934487de files/maxima-emacs.patch 826
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.9.1-r3 b/sci-mathematics/maxima/files/digest-maxima-5.9.1-r3
new file mode 100644
index 000000000000..a849fad9cf86
--- /dev/null
+++ b/sci-mathematics/maxima/files/digest-maxima-5.9.1-r3
@@ -0,0 +1 @@
+MD5 659acfad1f61444cf5b38f6c28279d40 maxima-5.9.1.tar.gz 8093534
diff --git a/sci-mathematics/maxima/files/maxima-5.9.1-unicode-fix.patch b/sci-mathematics/maxima/files/maxima-5.9.1-unicode-fix.patch
new file mode 100644
index 000000000000..37f2c7b12910
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.9.1-unicode-fix.patch
@@ -0,0 +1,190 @@
+diff -ru maxima-5.9.1/src/cl-info.lisp maxima-5.9.1.new/src/cl-info.lisp
+--- maxima-5.9.1/src/cl-info.lisp	2004-07-27 03:16:12.000000000 +0200
++++ maxima-5.9.1.new/src/cl-info.lisp	2005-05-14 23:51:29.607052432 +0200
+@@ -118,7 +118,7 @@
+ (eval-when (compile eval load)
+ (defun sharp-u-reader (stream subchar arg)
+   (declare (ignore subchar arg))
+-  (let ((tem (make-array 10 :element-type 'base-char
++  (let ((tem (make-array 10 :element-type 'character
+ 			 :fill-pointer 0 :adjustable t)))
+     (unless (eql (read-char stream) #\")
+       (error "sharp-u-reader reader needs a \"right after it"))
+@@ -132,7 +132,7 @@
+ 					    (#\r . #\return))))
+ 			   ch))))
+        (vector-push-extend ch tem)))
+-    (coerce tem '(simple-array base-char (*)))))
++    (coerce tem '(simple-array character (*)))))
+ 
+ (set-dispatch-macro-character #\# #\u 'sharp-u-reader)
+ )
+@@ -153,7 +153,7 @@
+ 	(error "illegal file start ~a" start))
+       #-gcl
+       (let ((tem (make-array (- len start)
+-			     :element-type 'base-char)))
++			     :element-type 'character)))
+ 	(when (> start 0)
+ 	  (file-position st start))
+ 	(read-sequence tem st :start 0 :end (length tem))
+@@ -249,7 +249,7 @@
+ 	       ((> extra 0)
+ 		(setq tem 
+ 		      (make-array (+ (length x) extra)
+-				  :element-type 'base-char :fill-pointer 0))
++				  :element-type 'character :fill-pointer 0))
+ 		(setq i 0)
+ 		(go AGAIN))
+ 	       (t (setq tem x)))
+diff -ru maxima-5.9.1/src/numerical/f2cl-lib.lisp maxima-5.9.1.new/src/numerical/f2cl-lib.lisp
+--- maxima-5.9.1/src/numerical/f2cl-lib.lisp	2004-06-19 22:32:49.000000000 +0200
++++ maxima-5.9.1.new/src/numerical/f2cl-lib.lisp	2005-05-14 23:51:29.593054560 +0200
+@@ -1125,7 +1125,7 @@
+ 		      `',dims
+ 		      `(list ,@dims))))
+     `(let ((,init (make-array ,new-dims
+-			      :element-type `(simple-array base-char (,',@len))
++			      :element-type `(simple-array character (,',@len))
+ 			      :initial-element (make-string ,@len))))
+        (dotimes (k (array-total-size ,init))
+ 	 (setf (aref ,init k)
+diff -ru maxima-5.9.1/src/numerical/slatec/xercnt.lisp maxima-5.9.1.new/src/numerical/slatec/xercnt.lisp
+--- maxima-5.9.1/src/numerical/slatec/xercnt.lisp	2004-06-19 22:32:50.000000000 +0200
++++ maxima-5.9.1.new/src/numerical/slatec/xercnt.lisp	2005-05-14 23:51:29.562059272 +0200
+@@ -10,7 +10,7 @@
+ 
+ (defun xercnt (librar subrou messg nerr level kontrl)
+   (declare (type f2cl-lib:integer4 kontrl level nerr)
+-           (type (simple-array base-char (*)) messg subrou librar))
++           (type (simple-array character (*)) messg subrou librar))
+   (prog ()
+     (declare)
+     (go end_label)
+diff -ru maxima-5.9.1/src/numerical/slatec/xermsg.lisp maxima-5.9.1.new/src/numerical/slatec/xermsg.lisp
+--- maxima-5.9.1/src/numerical/slatec/xermsg.lisp	2004-06-19 22:32:50.000000000 +0200
++++ maxima-5.9.1.new/src/numerical/slatec/xermsg.lisp	2005-05-14 23:51:29.563059120 +0200
+@@ -10,23 +10,23 @@
+ 
+ (defun xermsg (librar subrou messg nerr level)
+   (declare (type f2cl-lib:integer4 level nerr)
+-           (type (simple-array base-char (*)) messg subrou librar))
++           (type (simple-array character (*)) messg subrou librar))
+   (prog ((lfirst
+-          (make-array '(20) :element-type 'base-char :initial-element #\Space))
++          (make-array '(20) :element-type 'character :initial-element #\Space))
+          (temp
+-          (make-array '(72) :element-type 'base-char :initial-element #\Space))
++          (make-array '(72) :element-type 'character :initial-element #\Space))
+          (xlibr
+-          (make-array '(8) :element-type 'base-char :initial-element #\Space))
++          (make-array '(8) :element-type 'character :initial-element #\Space))
+          (xsubr
+-          (make-array '(8) :element-type 'base-char :initial-element #\Space))
++          (make-array '(8) :element-type 'character :initial-element #\Space))
+          (ltemp 0) (mkntrl 0) (llevel 0) (lerr 0) (kount 0) (i 0) (kdummy 0)
+          (f2cl-lib:f2cl-// 0.0f0) (maxmes 0) (lkntrl 0))
+     (declare (type single-float f2cl-lib:f2cl-//)
+              (type f2cl-lib:integer4 lkntrl maxmes kdummy i kount lerr llevel
+               mkntrl ltemp)
+-             (type (simple-array base-char (8)) xsubr xlibr)
+-             (type (simple-array base-char (72)) temp)
+-             (type (simple-array base-char (20)) lfirst))
++             (type (simple-array character (8)) xsubr xlibr)
++             (type (simple-array character (72)) temp)
++             (type (simple-array character (20)) lfirst))
+     (setf lkntrl (j4save 2 0 f2cl-lib:%false%))
+     (setf maxmes (j4save 4 0 f2cl-lib:%false%))
+     (cond
+diff -ru maxima-5.9.1/src/numerical/slatec/xerprn.lisp maxima-5.9.1.new/src/numerical/slatec/xerprn.lisp
+--- maxima-5.9.1/src/numerical/slatec/xerprn.lisp	2004-06-19 22:32:50.000000000 +0200
++++ maxima-5.9.1.new/src/numerical/slatec/xerprn.lisp	2005-05-14 23:51:29.564058968 +0200
+@@ -9,15 +9,15 @@
+ 
+ 
+ (let* ((newlin "$$"))
+-  (declare (type (simple-array base-char (2)) newlin))
++  (declare (type (simple-array character (2)) newlin))
+   (defun xerprn (prefix npref messg nwrap)
+     (declare (type f2cl-lib:integer4 nwrap npref)
+-             (type (simple-array base-char (*)) messg prefix))
++             (type (simple-array character (*)) messg prefix))
+     (prog ((iu (make-array 5 :element-type 'f2cl-lib:integer4)) (nunit 0)
+            (cbuff
+             (make-array '(148)
+                         :element-type
+-                        'base-char
++                        'character
+                         :initial-element
+                         #\Space))
+            (idelta 0) (lpiece 0) (nextc 0) (lenmsg 0) (lwrap 0) (lpref 0) (i 0)
+@@ -25,7 +25,7 @@
+       (declare (type (simple-array f2cl-lib:integer4 (5)) iu)
+                (type f2cl-lib:integer4 n i lpref lwrap lenmsg nextc lpiece
+                 idelta nunit)
+-               (type (simple-array base-char (148)) cbuff))
++               (type (simple-array character (148)) cbuff))
+       (multiple-value-bind
+           (var-0 var-1)
+           (xgetua iu nunit)
+diff -ru maxima-5.9.1/src/numerical/slatec/xersve.lisp maxima-5.9.1.new/src/numerical/slatec/xersve.lisp
+--- maxima-5.9.1/src/numerical/slatec/xersve.lisp	2004-06-19 22:32:50.000000000 +0200
++++ maxima-5.9.1.new/src/numerical/slatec/xersve.lisp	2005-05-14 23:51:29.564058968 +0200
+@@ -20,37 +20,37 @@
+         (nmsg 0))
+     (declare (type f2cl-lib:integer4 nmsg kountx)
+              (type (simple-array f2cl-lib:integer4 (*)) kount levtab nertab)
+-             (type (simple-array (simple-array base-char (20)) (*)) mestab)
+-             (type (simple-array (simple-array base-char (8)) (*)) subtab
++             (type (simple-array (simple-array character (20)) (*)) mestab)
++             (type (simple-array (simple-array character (8)) (*)) subtab
+               libtab))
+     (setq kountx 0)
+     (setq nmsg 0)
+     (defun xersve (librar subrou messg kflag nerr level icount)
+       (declare (type f2cl-lib:integer4 icount level nerr kflag)
+-               (type (simple-array base-char (*)) messg subrou librar))
++               (type (simple-array character (*)) messg subrou librar))
+       (prog ((mes
+               (make-array '(20)
+                           :element-type
+-                          'base-char
++                          'character
+                           :initial-element
+                           #\Space))
+              (lib
+               (make-array '(8)
+                           :element-type
+-                          'base-char
++                          'character
+                           :initial-element
+                           #\Space))
+              (sub
+               (make-array '(8)
+                           :element-type
+-                          'base-char
++                          'character
+                           :initial-element
+                           #\Space))
+              (lun (make-array 5 :element-type 'f2cl-lib:integer4)) (i 0)
+              (iunit 0) (kunit 0) (nunit 0))
+         (declare (type f2cl-lib:integer4 nunit kunit iunit i)
+-                 (type (simple-array base-char (20)) mes)
+-                 (type (simple-array base-char (8)) lib sub)
++                 (type (simple-array character (20)) mes)
++                 (type (simple-array character (8)) lib sub)
+                  (type (simple-array f2cl-lib:integer4 (5)) lun))
+         (cond
+          ((<= kflag 0) (if (= nmsg 0) (go end_label))
+diff -ru maxima-5.9.1/src/server.lisp maxima-5.9.1.new/src/server.lisp
+--- maxima-5.9.1/src/server.lisp	2004-06-19 22:32:51.000000000 +0200
++++ maxima-5.9.1.new/src/server.lisp	2005-05-14 23:51:29.820020056 +0200
+@@ -48,7 +48,7 @@
+ 	      :element-type (if bin '(unsigned-byte 8) 'character)))
+     #+gcl (si::socket port :host host)
+     #+lispworks (comm:open-tcp-stream host port :direction :io :element-type
+-                                      (if bin 'unsigned-byte 'base-char))
++                                      (if bin 'unsigned-byte 'character))
+     #-(or allegro clisp cmu sbcl gcl lispworks)
+     (error 'not-implemented :proc (list 'open-socket host port bin))))
+ 
diff --git a/sci-mathematics/maxima/maxima-5.9.1-r3.ebuild b/sci-mathematics/maxima/maxima-5.9.1-r3.ebuild
new file mode 100644
index 000000000000..1d966f9e3b7e
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.9.1-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.1-r3.ebuild,v 1.1 2005/08/20 20:55:56 ribosome Exp $
+
+inherit eutils elisp-common
+
+DESCRIPTION="Free computer algebra environment, based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/maxima/${P}.tar.gz"
+
+LICENSE="GPL-2 AECA"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="cmucl clisp gcl sbcl tetex emacs auctex"
+
+DEPEND="tetex? ( virtual/tetex )
+	emacs? ( virtual/emacs )
+	auctex? ( app-emacs/auctex )
+	>=sys-apps/texinfo-4.3
+	x86? ( !clisp?  ( !sbcl? ( !gcl? ( !cmucl? ( dev-lisp/cmucl ) ) ) ) )
+	clisp? ( >=dev-lisp/clisp-2.33.2-r1 )
+	x86? ( cmucl? ( >=dev-lisp/cmucl-19a ) )
+	x86? ( gcl?   ( >=dev-lisp/gcl-2.6.7 ) )
+	x86? ( sbcl?  ( >=dev-lisp/sbcl-0.8.14 ) )"
+RDEPEND=">=dev-lang/tk-8.3.3
+	 >=media-gfx/gnuplot-4.0-r1"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/maxima-${PV}-unicode-fix.patch
+	cd ${S}/interfaces/emacs/emaxima
+	epatch ${FILESDIR}/maxima-emacs.patch
+}
+
+src_compile() {
+	local myconf=""
+	if use cmucl || use clisp || use gcl || use sbcl; then
+		if use cmucl; then
+			myconf="${myconf} --enable-cmucl"
+		fi
+		if use clisp; then
+			myconf="${myconf} --enable-clisp"
+		fi
+		if use gcl; then
+			ewarn "Important - GCL must be installed with"
+			ewarn "ANSI support.  Otherwise this build will"
+			ewarn "fail.  To check this, start gcl and look"
+			ewarn "for a header like the following:"
+			ewarn "GCL (GNU Common Lisp)  2.6.5 ANSI"
+			ewarn "If you see CtL1 where ANSI is, then you"
+			ewarn "need to emerge gcl using something like"
+			ewarn "USE=\"ansi\" emerge gcl"
+			myconf="${myconf} --enable-gcl"
+		fi
+		if use sbcl; then
+			myconf="${myconf} --enable-sbcl"
+		fi
+	else
+		myconf="${myconf} --enable-cmucl"
+	fi
+
+	./configure --prefix=/usr ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	if use emacs
+	then
+		elisp-site-file-install ${FILESDIR}/50maxima-gentoo.el
+	fi
+	if use tetex
+	then
+		insinto /usr/share/texmf/tex/latex/emaxima
+		doins ${S}/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_postinst() {
+	if use emacs
+	then
+		einfo "Running elisp-site-regen...."
+		elisp-site-regen
+	fi
+	if use tetex
+	then
+		einfo "Running mktexlsr to rebuild ls-R database...."
+		mktexlsr
+	fi
+}
+
+pkg_postrm() {
+	if use emacs
+	then
+		einfo "Running elisp-site-regen...."
+		elisp-site-regen
+	fi
+}