Fix problem with LaTeX output caused by renamed mlabel symbol in maxima-5.29, bug 448242. Apply some minor updates from imaxima-imath-1.03, see the ChangeLog of the package for details.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

6 files changed, 253 insertions, 22 deletions

diff --git a/app-emacs/imaxima/ChangeLog b/app-emacs/imaxima/ChangeLog
index 514a20970c02..c223be86ebc8 100644
--- a/app-emacs/imaxima/ChangeLog
+++ b/app-emacs/imaxima/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emacs/imaxima
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/ChangeLog,v 1.39 2011/06/19 16:31:49 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/ChangeLog,v 1.40 2013/01/02 21:03:31 ulm Exp $
+
+*imaxima-1.0-r3 (02 Jan 2013)
+
+  02 Jan 2013; Ulrich Müller <ulm@gentoo.org> imaxima-1.0-r2.ebuild,
+  +imaxima-1.0-r3.ebuild, +files/imaxima-1.0-1.03.patch,
+  +files/imaxima-1.0-mlabel.patch:
+  Fix problem with LaTeX output caused by renamed mlabel symbol in maxima-5.29,
+  bug 448242. Apply some minor updates from imaxima-imath-1.03, see the
+  ChangeLog of the package for details.
 
   19 Jun 2011; Raúl Porcel <armin76@gentoo.org> imaxima-1.0-r2.ebuild:
   Drop sparc keywords
diff --git a/app-emacs/imaxima/Manifest b/app-emacs/imaxima/Manifest
index 1a72c7672a89..8e7a9cbc0c8d 100644
--- a/app-emacs/imaxima/Manifest
+++ b/app-emacs/imaxima/Manifest
@@ -1,25 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 50imaxima-gentoo.el 162 SHA256 f59430ec9f3f8b3aabbbe3758f6add5fe0b2c128dbbe6754a228770bd5e86cf8 SHA512 cf2b84b833f787ff1bc8e6d31e2b8f80c3d65e8035b0f560795b9aff66b29f39df066279778d07afe346370145c69e7aa61688567864ec500a366453a53e21ed WHIRLPOOL ec5ce2cc35670189b572a238d2005ad4ba63e0b2abce736a6742003300f7f7cff3eb338292aac2f4887687a22a4a55ddc56c33605a72520e63203ca2fae9d242
+AUX imaxima-1.0-1.03.patch 4778 SHA256 e6d00a5d3e7ba7498258f94ab72b21d5bcbe1ef29afafee755d1b8254d5b9051 SHA512 d0b7254e7ef325b3fba53fc327027bdf59ca3d2c751ae78ecaaa738a064dd04bc45b9d727f561df1b0ba3896400ba84e092dc9232df086edaeb0f1115183f243 WHIRLPOOL 5ab43fda7ac36d74064d6fa411bb90528ba375998ea12061484805bc3429b86293a6695d8a8d5c68ab89c874f6d79c964839e49ca6d3dd669b691c06feec7657
+AUX imaxima-1.0-mlabel.patch 748 SHA256 80005099a92e01392eea7420c9bb8c29ef88448f9e6e9adba6f7894cd4639163 SHA512 02ba8a381273bddb074d70a33c0c2d80f9c74bf780e7fe09d47ff973204c7358df6437ac35c2716955737031ccad3bb493a9aefb1c2fc478f34b99a04d55502b WHIRLPOOL c6da4d79d1221c61f27f4bceab52bb6e285dd72f90191775d389e9e234cd1155519acae54760bb5e7de06e1dcb53b2d20559d439b8cd48274f3b3e17537ea194
 DIST imaxima-imath-1.0.tar.gz 407857 SHA256 cce63323ed7d1a77012f81cbc5ded51ceb5be6d13eec79f8660fec638d92ce74 SHA512 d3cbf6f3a8ee7f0b952052f72be684f2143a377a9b896d328db1c46a06d5ec64d6f20d69604536a3abf44a5d5e5b09ec9862992270e5470c561083d183372991 WHIRLPOOL 186fcb8fce7091b350470f6704652020e264427824fee6c3a00cea79bdb0da83a7706ac7098507a164d286b293d06e5ac3dfefd84c5d7d92dc8d9d04f709cb01
-EBUILD imaxima-1.0-r2.ebuild 1328 SHA256 aa9a19e676c3b8351a41efb14effc56c7574e7536f8e641f563a1d3cc801e07a SHA512 d1e0e70e1d19edd6722a50bd413b2be310851fa330275b21ccead36b728d8fc6a0c40eb9fe85cab972fedb8cf4994d3764f4be653a96dc39ec6ee1b68c7b6585 WHIRLPOOL 6a27fff4b3f460c9e6c4466bf3dd4ed303ac7400222a7769790abedf261ebf2867d9b31e2cbb60f9af710d4c9472f9e7605b34d19a21f9cf7a2cda8f7a2db647
-MISC ChangeLog 5421 SHA256 de3d5cdbea9dc4f63009e5c0ad21cfb1f3f47eee863e6793c59520880be1fa28 SHA512 55a9b01f23eee1357b89cb02466a13c8f52af687f362fb9ae56ae4d5235274dfcbb0b7916eedf924fce09d94128aa103f56b365dc223b2d138816d30c6f1bc7b WHIRLPOOL 8d4a9b11ebff89b29691d7e8f725f441775876695a9283d1faae58bb93ad2432a9eaf44fb337236a14a288d167255a181e9dc902f7baaeb2757cafaf7f45bd96
+EBUILD imaxima-1.0-r2.ebuild 1331 SHA256 eb9fe97f5e843e6566587c86c19ecb13f26043db2c681bee5679df4c911ce783 SHA512 6f267ccdaf350f2389361962721097bf5bc2e7bdb23660aab336c71169105c486241bdce8843fe176008f1e07ab64b4f388b13c7cd47134efb4d6630ce68fd93 WHIRLPOOL bf3fc3f44796e8cfc9479ebde0fff3fb1174074964979c12b4d95057c1fb574515ee83350504f854bd0f848635eae8049c90533cc7b940a8334a393e862c3455
+EBUILD imaxima-1.0-r3.ebuild 1274 SHA256 3fb13c81354c0bba17c75161ccadf0499848c1faf2366df255c051d51c3e61d7 SHA512 96adaa08afc5f28b3378121913deb8806e1fb79fd55ac16cdb4f2eafd03f73949a09bf83578d383706797843d077c858d82ed2cd0bfa3b700c509a666fa42064 WHIRLPOOL b30d45e9eca3511c6ca9c8efd6f937cd5d6fc9935af325ff2a6ba596e4712d36a9a6830f72f948e5ce9a345b3166454af0258a555a5b5f03aa64beb646fbcbdb
+MISC ChangeLog 5803 SHA256 d44a896df6662517e4798922cc620e18fe83ba998a93caabf4f3736147230ddf SHA512 f6839116c9032607f6259202ff799732d9173b865e1d00c60d07d34d9a674aa42b14dc8005312fadadade7e361ba82fc891bbd89527931f2b3d6072f69b46f36 WHIRLPOOL 98410a2fbc34284eede54a661bad4bb8e759cfcb1d99bf79220183bf3b1393dd786d119951460b99c05154e9005117e32ae3b97a2a55b2b2e9dd55e627ee6542
 MISC metadata.xml 709 SHA256 44e217de8c5f40e329de8f4b32f620aca544791358329f8a9717c9d68f089c2a SHA512 8c71398ac4ff962c950919edb269e1eea8c64189e3d5439ef57fffb642003e0d3038ce638364f4a2ac3d18b1ad8cb08a5ad133f2a0b906da7ea640a092252fff WHIRLPOOL 0070729ebef8337e0bd3cb57604b5fb778e445320b6d14de7ae5227f11a39a26f6a1022e7b37bfde1f81094a3075d345e12b1f729890673208d4a40c323eb55b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9e/OAAoJEDxpGckxwJCBJt0P/RJ4SVBdGDrAGrCLb1/5SmMK
-VKstiziAXjNbkFtpmxDS0y1QDAwzZDCZA7WYVzXVdwZEfyvLO2gXmidWEf6gXctu
-IzD5lfkfq9awYjEpTJrh1axL1rQsaqdzrOe1njUGi1sspp/sYqIJF6dDlRGfOZdS
-Z6ANzuklLPNfMnIvLCzcVDjD+Kb+fE/PQOgpHZyS7IR9K/5SVb+3XBt7AbXLijo0
-icxb0HLgUCzfzKbXvfYH5VjCHmkbSZcJhXpDyl8xb8modjWtKKeRM5kUT0rkDKCd
-aq+CYb+1ao8gMA8Ng08/eWSPJ1LUVxWhHHihzSBRTuqAGu5+wXiMbGdi5NIFwk4A
-ennWFRRR7BX2TCAWVNEd2YWSI56BXU07C1/Xz/vYsU3XS0a8csmfS4HVxCCWx26+
-BDqhc+zzHIHJmHi5szMJnSlL8MQQwMjfSOz+YrPDEyLYhuk3PFkMtEJSmsU2EHqb
-vwguwIyDuyGz8WkJZsQW3jPefo1D46XmmPMCGTeHpfUcblOKF0VXtCDZBs1hDvAY
-4ss4rKyABS+VjQME/otPlEfEXT/3K9ey/vXLxIKR8oKo+DiWQhk5uHKF2bfGJtIB
-0+XBmDppUBjxp7XOeoFdogalIHFlw/MRMADNW5RyeuTS/ijHXmVWRgJ+wKkHdhf4
-HS0JnU4PSnguflGqivTX
-=c60C
+iQIcBAEBCAAGBQJQ5KE2AAoJEDxpGckxwJCB94AP/iSuc8/GBo27kjN7E5hPrLJr
+1T0gF4CEQ8Yct2Zj+f10eVvev50qGS73MTqnQ/jartlpX87kneRXY7nB++VOhKRk
+qS6Aw9ClzTyPjIJQ9+nofj5TqnBeUoZN+t2rpLJwuTVIuBq/XpbbMSFeMqHvwtwI
+OhCwqQVHzgUUwEUf9O0f4NfRNhtvzmbXUz8sdS7pBk0VmIVcj9QrJ6GlEkixc9m2
+e4Ihv1ueSdRJRjacwdyVH320kw8ZMruQN9aVlmkEfMNyV7gJhHcsPILCo4QsqbGl
+nKTsQNZ+RXVkDhansQorzzUvQw4ylA57XxiOMKlkIT3Z9G9QJgV6zZ7Rm92e9j2S
+dPXX0vDMj8LspsUpnNaJARIKEyyCGXi5jtjdHjODfD89Owo7t77FyhFE7MEyj8PZ
+JX7HDk2QZ7s519n/P9vqkfsBspr2c/rFiGot4Nam6OAtGrmn24ge+sdG8XPskx+1
+iRP8QaoDborQoPt+/UW+Afv5pja5pqNh+CzAHGgp9lOeJD0CaOpAU3m/x7APUk6E
+B9+D8WgBNQe1mShk+6VNWKE2Elt/WFFaY3o+MhUn1YpNyVbFgIfIEHhVw60g4CtR
+acza3vdOw+fssA9ow0PjqhBUKwHY2JcblKcs43KpG/RIKkmS3RUfYXkGFjvb/ArK
+01ZKjP09W13GMSfmh8uS
+=pmRf
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/imaxima/files/imaxima-1.0-1.03.patch b/app-emacs/imaxima/files/imaxima-1.0-1.03.patch
new file mode 100644
index 000000000000..93d332f6bc0f
--- /dev/null
+++ b/app-emacs/imaxima/files/imaxima-1.0-1.03.patch
@@ -0,0 +1,140 @@
+Patch extracted from maxima git repository.
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,19 @@
++2012-03-25 Yasuaki Honda <yasuaki.honda@gmail.com>
++	* version 1.03
++	* A new command "reinit-imaxima" is added. This command reset the
++	communication status of Emacs Lisp and Maxima. When imaxima does
++	not respond to any input, this command will help to resolve such
++	situation.
++
++2011-10-02 Yasuaki Honda <yasuaki.honda@gmail.com>
++	* version 1.01
++	* An old workaround code for tex prevented imaxima on Mac OS X
++	Lion from working. This is related to the placing of the temporary
++	file directory and the name of the file path containing the
++	character "_". This is fixed in this version.
++	* Special treatment of greek character gamma is removed from
++	imaxima.el and commited to maxima mactex.lisp.
++
+ 2009-02-07 Yasuaki Honda <yasuaki.honda@gmail.com>
+ 	* As for inline graph, if the emacs buffer window is too small for
+ 	the generated graph image, the graph is not displayed, but a file
+--- a/imaxima-autoconf-variables.el
++++ b/imaxima-autoconf-variables.el
+@@ -19,6 +19,6 @@
+ ;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ ;; MA 02111-1307 USA
+ (defconst *imaxima-autoconf-package* "imaxima-imath")
+-(defconst *imaxima-autoconf-version* "1.0")
++(defconst *imaxima-autoconf-version* "1.03")
+ 
+ (provide 'imaxima-autoconf-variables)
+--- a/imaxima.el
++++ b/imaxima.el
+@@ -420,6 +420,17 @@
+   (message "%s %s" *imaxima-autoconf-package* *imaxima-autoconf-version*))
+ 
+ ;;
++;; Reset
++;;
++
++(defun reinit-imaxima ()
++  "Re-initialize imaxima"
++  (interactive)
++  (setq imaxima-filter-running nil
++    imaxima-output nil
++    continuation nil))
++
++;;
+ ;; Geometry
+ ;;
+ 
+@@ -1174,6 +1185,7 @@
+ 	  (switch-to-buffer imaxima-buffer)
+ 	(set-buffer imaxima-buffer))
+       (return-from imaxima t)))
++  (reinit-imaxima)
+   (unless (imaxima-image-type-available-p imaxima-image-type)
+     (error "Your version of Emacs does not support the image type %s"
+ 	   imaxima-image-type))
+@@ -1183,9 +1195,7 @@
+   (setq imaxima-file-counter 0)
+   (make-directory
+    (setq imaxima-tmp-subdir
+-	 ;; For some reason TeX doesn't grok underscores in file names
+-	 (imaxima-subst-char-in-string ?_ ?=
+-	    (make-temp-name (expand-file-name "imaxima" imaxima-tmp-dir)))))
++	 (make-temp-name (expand-file-name "imaxima" imaxima-tmp-dir))) t)
+   (set-file-modes imaxima-tmp-subdir 448) ; 700 in octal
+   (let ((process-connection-type process-connection-type-flag))
+     (if imaxima-use-maxima-mode-flag
+--- a/imaxima.lisp
++++ b/imaxima.lisp
+@@ -109,9 +109,9 @@
+ ;;; SBCL.
+ ;;; by yasuaki honda
+ #-sbcl
+-(if (not (fboundp (find-symbol "PRINT-INVERT-CASE" :maxima)))
+-    (defun print-invert-case (obj)
+-      (princ-to-string obj)))
++(unless (fboundp 'maxima::print-invert-case)
++  (defun print-invert-case (obj)
++    (princ-to-string obj)))
+ 
+ (defun print-case-sensitive (obj)
+   (if obj
+@@ -126,7 +126,7 @@
+ 
+ (defun main-prompt ()
+   (format () (concatenate 'string (string (code-char 3)) "(~A~D) " (string (code-char 4)))
+-    (STRIPDOLLAR (print-case-sensitive $inchar)) $linenum))
++    (stripdollar (print-case-sensitive $inchar)) $linenum))
+ 
+ (defun break-dbm-loop (at)
+   (let* (
+@@ -142,7 +142,7 @@
+     (declare (special *mread-prompt* ))
+     (and (consp at) (set-env at))
+     (cond ((null at)
+-	   ($frame 0 nil)))
++	   (break-frame 0 nil)))
+     (catch 'step-continue
+       (catch *quit-tag*
+ 	(unwind-protect
+@@ -672,9 +672,12 @@
+     (setq res (apply (symbol-function '$draw)
+ 		     (append
+ 		      `(
+-			((mequal simp) $terminal $eps)
+-			((mequal simp) $pic_width ,($first $wxplot_size))
+-			((mequal simp) $pic_height ,($second $wxplot_size))
++			((mequal simp) $terminal $eps_color)
++                        ((mequal simp) $dimensions
++                                       ((mlist simp)
++                                        ;; convert points to 1/100 of cm
++                                        ,(* 3.53 ($first $wxplot_size))
++                                        ,(* 3.53 ($second $wxplot_size))))
+ 			((mequal simp) $file_name ,filename))
+ 		      args)))
+     ($ldisp `((wxxmltag simp) ,(format nil "~a.eps" filename) "img"))
+--- a/imaxima.texi
++++ b/imaxima.texi
+@@ -223,6 +223,15 @@
+ information when you want to make bug reports.
+ @end defun
+ 
++@defun reinit-imaxima
++Initialize the imaxima program. Sometimes you may encounter situations
++where imaxima does not repond to your input. This is caused by the
++inconsistency between Emacs Lisp and Maxima. Such situations can be
++resolved by using this command. After calling this command from the
++Emacs mini buffer, you should type simple Maxima expression such as
++1+2; to ensure that the imaxima does respond to you now.
++@end defun
++
+ @node Inline Graph
+ @chapter Inline Graph
+ 
diff --git a/app-emacs/imaxima/files/imaxima-1.0-mlabel.patch b/app-emacs/imaxima/files/imaxima-1.0-mlabel.patch
new file mode 100644
index 000000000000..4b23ee761731
--- /dev/null
+++ b/app-emacs/imaxima/files/imaxima-1.0-mlabel.patch
@@ -0,0 +1,26 @@
+Rename mlable to mlabel, accounting for corresponding change in maxima-5.29.
+https://bugs.gentoo.org/show_bug.cgi?id=448242
+
+Patch taken from maxima git repo:
+http://maxima.git.sourceforge.net/git/gitweb.cgi?p=maxima/maxima;a=commit;h=620f23e27328a58bfa81fe101734b7488a2b93f5
+
+--- a/imaxima.lisp
++++ b/imaxima.lisp
+@@ -498,7 +498,7 @@
+ 
+ (defun tex-mtext (x l r) (tex-list (cdr x) l r ""))
+ 
+-(defun tex-mlable (x l r)
++(defun tex-mlabel (x l r)
+   (tex (caddr x)
+     (append l
+       (if (cadr x)
+@@ -517,7 +517,7 @@
+ (defun latex (x)
+ ;  (princ x)  ;; uncomment to debug.
+   (if (and (listp x) (car x) (listp (car x)) (caar x)
+-	   (equal (caar x) 'mlable)
++	   (equal (caar x) 'mlabel)
+ 	   (cdr x)
+ 	   (cadr x)
+ 	   (input-label-p (cadr x)))
diff --git a/app-emacs/imaxima/imaxima-1.0-r2.ebuild b/app-emacs/imaxima/imaxima-1.0-r2.ebuild
index 2feec9112910..5b084316f520 100644
--- a/app-emacs/imaxima/imaxima-1.0-r2.ebuild
+++ b/app-emacs/imaxima/imaxima-1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/imaxima-1.0-r2.ebuild,v 1.6 2011/06/19 16:31:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/imaxima-1.0-r2.ebuild,v 1.7 2013/01/02 21:03:31 ulm Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ DESCRIPTION="Imaxima enables graphical output in Maxima sessions with emacs"
 HOMEPAGE="http://sites.google.com/site/imaximaimath/"
 SRC_URI="http://members3.jcom.home.ne.jp/imaxima/Site/Download_and_Install_files/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="examples"
@@ -20,7 +20,7 @@ DEPEND=""
 RDEPEND="virtual/latex-base
 	app-text/ghostscript-gpl
 	dev-tex/mh
-	sci-mathematics/maxima"
+	<sci-mathematics/maxima-5.29"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/imaxima/imaxima-1.0-r3.ebuild b/app-emacs/imaxima/imaxima-1.0-r3.ebuild
new file mode 100644
index 000000000000..07fa1352f133
--- /dev/null
+++ b/app-emacs/imaxima/imaxima-1.0-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/imaxima-1.0-r3.ebuild,v 1.1 2013/01/02 21:03:31 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+MY_P="${PN}-imath-${PV/_}"
+DESCRIPTION="Imaxima enables graphical output in Maxima sessions with emacs"
+HOMEPAGE="http://sites.google.com/site/imaximaimath/"
+SRC_URI="https://sites.google.com/site/imaximaimath/download-and-install/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="virtual/latex-base
+	app-text/ghostscript-gpl
+	dev-tex/mh
+	>=sci-mathematics/maxima-5.29"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-1.03.patch
+	epatch "${FILESDIR}"/${P}-mlabel.patch
+	# Remove broken Info file (will be recreated)
+	rm imaxima.info
+}
+
+src_configure() {
+	econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	dodoc ChangeLog NEWS README
+
+	if use examples; then
+		docinto imath-example
+		dodoc imath-example/*.txt
+		dohtml -r imath-example/.
+	fi
+}