Fixed bug #59288: Invalid reference to "/usr/local/info" in maxima's emacs mode.

5 files changed, 124 insertions, 3 deletions

diff --git a/app-sci/maxima/ChangeLog b/app-sci/maxima/ChangeLog
index c7654945eb9b..f0240d3e4994 100644
--- a/app-sci/maxima/ChangeLog
+++ b/app-sci/maxima/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-sci/maxima
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-sci/maxima/ChangeLog,v 1.10 2004/06/28 03:16:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/maxima/ChangeLog,v 1.11 2004/08/08 20:34:22 ribosome Exp $
+
+  08 Aug 2004; Olivier Fisette <ribosome@gentoo.org>
+  maxima-5.9.0-r3.ebuild, files/maxima-emacs.patch:
+  Fixed invalid reference to "/usr/local/info" in maxima emacs mode.
+  Reported by Dirk Gerrits <dirk@dirkgerrits.com> in bug #59288.
 
   27 Jun 2004; Aron Griffis <agriffis@gentoo.org> maxima-5.9.0-r2.ebuild:
   QA - fix use invocation
@@ -29,7 +34,7 @@
 *maxima-5.9.0-r1 (06 Aug 2003)
 
   06 Aug 2003; George Shapovalov <george@gentoo.org> maxima-5.9.0-r1.ebuild :
-  expandedn the ebuild following the #16529. 
+  expandedn the ebuild following the #16529.
   Now has 4 use flags (two of the local) and some emacs and tex related functionality.
   Can be built with either clisp or cmucl
   Thanks to  Cliff Yapp  and  Sourav Mandal for suggestions and additions
diff --git a/app-sci/maxima/Manifest b/app-sci/maxima/Manifest
index 8d3351cefb44..b4a8e58f0672 100644
--- a/app-sci/maxima/Manifest
+++ b/app-sci/maxima/Manifest
@@ -1,6 +1,9 @@
+MD5 150487070ff1954106a32f8a53bce62b maxima-5.9.0-r3.ebuild 2502
 MD5 7d41c1c45bc7a97912d8cf7d39f5a7b8 maxima-5.9.0-r2.ebuild 2382
-MD5 3c212d79364def752b8f57b83df8211f ChangeLog 1776
+MD5 38d8e3ba1a4fb9439bc573017db913e2 ChangeLog 2015
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 f631a3c65646fa76dca994fe54383c83 maxima-5.9.0.ebuild 786
 MD5 aaa91ea4812a84a1054b82e69d3fe05b files/digest-maxima-5.9.0-r2 65
+MD5 aaa91ea4812a84a1054b82e69d3fe05b files/digest-maxima-5.9.0-r3 65
 MD5 aaa91ea4812a84a1054b82e69d3fe05b files/digest-maxima-5.9.0 65
+MD5 55d928e715074355a442baf0934487de files/maxima-emacs.patch 826
diff --git a/app-sci/maxima/files/digest-maxima-5.9.0-r3 b/app-sci/maxima/files/digest-maxima-5.9.0-r3
new file mode 100644
index 000000000000..ca2a7e39dc79
--- /dev/null
+++ b/app-sci/maxima/files/digest-maxima-5.9.0-r3
@@ -0,0 +1 @@
+MD5 a1d6d6ed6afb0eebf03df865c0a19f19 maxima-5.9.0.tar.gz 7116131
diff --git a/app-sci/maxima/files/maxima-emacs.patch b/app-sci/maxima/files/maxima-emacs.patch
new file mode 100644
index 000000000000..1775d82dcf31
--- /dev/null
+++ b/app-sci/maxima/files/maxima-emacs.patch
@@ -0,0 +1,20 @@
+--- maxima.el~	2004-07-20 19:18:05.000000000 +0200
++++ maxima.el	2004-08-03 18:17:47.559653376 +0200
+@@ -50,7 +50,7 @@
+ ;; Some variables that may have to be set in order to use the maxima help:
+ ;;  maxima-info-dir
+ ;;         This should be the directory where the maxima info files are kept.
+-;;         By default, it is "/usr/local/info/"
++;;         By default, it is "/usr/share/info/"
+ ;;  maxima-info-index-file
+ ;;         This should be the name of the maxima info file that contains
+ ;;         the index, by default, it is "maxima.info-15"
+@@ -213,7 +213,7 @@
+ (defvar maxima-newline-style nil
+   "For compatability.")
+
+-(defcustom maxima-info-dir "/usr/local/info/"
++(defcustom maxima-info-dir "/usr/share/info/"
+   "*The directory where the maxima info files are kept."
+   :group 'maxima
+   :type '(directory))
diff --git a/app-sci/maxima/maxima-5.9.0-r3.ebuild b/app-sci/maxima/maxima-5.9.0-r3.ebuild
new file mode 100644
index 000000000000..e59596728c22
--- /dev/null
+++ b/app-sci/maxima/maxima-5.9.0-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/maxima/maxima-5.9.0-r3.ebuild,v 1.1 2004/08/08 20:34:22 ribosome Exp $
+
+inherit eutils
+
+DESCRIPTION="Free computer algebra environment, based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="http://dl.sourceforge.net/sourceforge/maxima/maxima-${PV}.tar.gz"
+
+LICENSE="GPL-2 AECA"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="cmucl clisp gcl tetex emacs auctex"
+
+DEPEND="tetex? ( virtual/tetex )
+	emacs? ( virtual/emacs )
+	auctex? ( app-emacs/auctex )
+	>=sys-apps/texinfo-4.3
+	x86? ( !clisp?	( !gcl? ( !cmucl? ( dev-lisp/cmucl ) ) ) )
+	clisp? ( dev-lisp/clisp )
+	x86? ( cmucl? ( dev-lisp/cmucl ) )
+	x86? ( gcl?   ( dev-lisp/gcl ) )"
+RDEPEND=">=dev-lang/tk-8.3.3"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/interfaces/emacs/emaxima
+	epatch ${FILESDIR}/maxima-emacs.patch
+}
+
+src_compile() {
+	local myconf=""
+	if use cmucl || use clisp || use gcl; then
+		if use cmucl; then
+			myconf="${myconf} --enable-cmucl"
+		fi
+		if use clisp; then
+			myconf="${myconf} --enable-clisp"
+		fi
+		if use gcl; then
+			myconf="${myconf} --enable-gcl"
+		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-install ${S}/interfaces/emacs/emaxima *.el *.elc
+		insinto /usr/share/emacs/site-lisp
+		doins ${S}/interfaces/emacs/emaxima/emaxima.lisp
+	fi
+	if use tetex
+	then
+		insinto /usr/share/texmf/tex/latex/emaxima
+		doins ${S}/interfaces/emacs/emaxima/emaxima.sty
+	fi
+	#move docs to the appropriate place
+	dodoc AUTHORS ChangeLog COPYING COPYING1 NEWS README*
+	mv ${D}/usr/share/${PN}/${PV}/doc/* ${D}/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
+	if use emacs
+	then
+		einfo "In order to use Maxima with emacs, add the following to your"
+		einfo ".emacs file:"
+		einfo "(setq load-path (cons "/usr/share/maxima/5.9.0/emacs" load-path))"
+		einfo "(autoload 'maxima-mode "maxima" "Maxima mode" t)"
+		einfo "(autoload 'maxima "maxima" "Maxima interactive" t)"
+		einfo "(setq auto-mode-alist (cons '("\\.max" . maxima-mode) auto-mode-alist))"
+		einfo "(autoload 'emaxima-mode "emaxima" "EMaxima" t)"
+		einfo "(add-hook 'emaxima-mode-hook 'emaxima-mark-file-as-emaxima)"
+	fi
+}