summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2012-10-30 16:38:03 +0000
committerAndrey Grozin <grozin@gentoo.org>2012-10-30 16:38:03 +0000
commit111ec12fbbbeefcea484a58d33602f46192dd9b7 (patch)
tree094c52aa65aa12f8db940e08985f994088f5af33 /sci-mathematics/maxima
parentAdd x86 keyword. (diff)
downloadgentoo-2-111ec12fbbbeefcea484a58d33602f46192dd9b7.tar.gz
gentoo-2-111ec12fbbbeefcea484a58d33602f46192dd9b7.tar.bz2
gentoo-2-111ec12fbbbeefcea484a58d33602f46192dd9b7.zip
Fix maxima-rmaxima.patch for cases when maxima is compiled by several lisps, some support readline, some not
(Portage version: 2.2.0_alpha142/cvs/Linux i686, unsigned Manifest commit)
Diffstat (limited to 'sci-mathematics/maxima')
-rw-r--r--sci-mathematics/maxima/ChangeLog6
-rw-r--r--sci-mathematics/maxima/files/maxima-rmaxima.patch30
2 files changed, 23 insertions, 13 deletions
diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index a0a36729816b..fa888ad2a2ef 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/maxima
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.100 2012/08/25 04:10:19 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.101 2012/10/30 16:38:03 grozin Exp $
+
+ 30 Oct 2012; Andrey Grozin <grozin@gentoo.org> files/maxima-rmaxima.patch:
+ Fix maxima-rmaxima.patch for cases when maxima is compiled by several lisps,
+ some support readline, some not
25 Aug 2012; Andrey Grozin <grozin@gentoo.org> maxima-5.28.0.ebuild,
files/maxima-5.28.0-sbcl.patch, files/maxima-5.28.0.patch,
diff --git a/sci-mathematics/maxima/files/maxima-rmaxima.patch b/sci-mathematics/maxima/files/maxima-rmaxima.patch
index db8e87380591..712cbda19d45 100644
--- a/sci-mathematics/maxima/files/maxima-rmaxima.patch
+++ b/sci-mathematics/maxima/files/maxima-rmaxima.patch
@@ -1,19 +1,25 @@
---- src/Makefile.am.orig 2010-02-01 21:58:17.353941395 +1300
-+++ src/Makefile.am 2010-02-01 22:09:12.859975783 +1300
-@@ -3,8 +3,16 @@
- if WIN32
+diff -r -U2 maxima-5.28.0.orig/src/Makefile.am maxima-5.28.0/src/Makefile.am
+--- maxima-5.28.0.orig/src/Makefile.am 2012-06-15 12:21:34.000000000 +0700
++++ maxima-5.28.0/src/Makefile.am 2012-10-30 22:22:29.000000000 +0700
+@@ -4,5 +4,21 @@
bin_SCRIPTS = maxima maxima-command.ico maxima.bat set_lang.vbs
else
-+if CLISP
-+bin_SCRIPTS = maxima
++if SBCL
+ bin_SCRIPTS = maxima rmaxima
+else
-+if GCL
-+bin_SCRIPTS = maxima
++if CMUCL
++bin_SCRIPTS = maxima rmaxima
+else
- bin_SCRIPTS = maxima rmaxima
- endif
++if ECL
++bin_SCRIPTS = maxima rmaxima
++else
++if OPENMCL
++bin_SCRIPTS = maxima rmaxima
++else
++bin_SCRIPTS = maxima
++endif
+endif
+endif
++endif
+ endif
- LOADDEFSYSTEM = (load "$(top_srcdir)/lisp-utils/defsystem.lisp")
- LOADMAKEPROCLAIM = (load "$(top_srcdir)/lisp-utils/make-proclaim.lisp")