Gentoo Archives: gentoo-commits

From: "Andrey Grozin (grozin)" <grozin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/maxima/files: maxima-5.27.0.patch maxima-5.27.0-wish.patch
Date: Thu, 05 Apr 2012 13:38:58
Message-Id: 20120405133847.BA6622004C@flycatcher.gentoo.org
1 grozin 12/04/05 13:38:47
2
3 Added: maxima-5.27.0.patch maxima-5.27.0-wish.patch
4 Log:
5 Version bump
6
7 (Portage version: 2.2.0_alpha99/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 sci-mathematics/maxima/files/maxima-5.27.0.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.27.0.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.27.0.patch?rev=1.1&content-type=text/plain
14
15 Index: maxima-5.27.0.patch
16 ===================================================================
17 diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
18 --- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
19 +++ maxima-5.23.1//configure.in 2011-01-16 19:50:55.000000000 +0600
20 @@ -294,3 +294,3 @@
21 dnl n.b. openmcl_default_name is hardcoded in "with" message
22 -openmcl_default_name=openmcl
23 +openmcl_default_name=ccl
24 AC_ARG_ENABLE(openmcl,
25 diff -r -U1 maxima-5.23.1.orig//src/maxima.in maxima-5.23.1//src/maxima.in
26 --- maxima-5.23.1.orig//src/maxima.in 2010-12-05 08:06:03.000000000 +0600
27 +++ maxima-5.23.1//src/maxima.in 2011-01-16 20:07:27.000000000 +0600
28 @@ -137,5 +137,5 @@
29 if [ "$layout_autotools" = "true" ]; then
30 - exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
31 + exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
32 else
33 - exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
34 + exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
35 fi
36 @@ -147,5 +147,5 @@
37 if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
38 - exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
39 + exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
40 else
41 - exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
42 + exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
43 fi
44 @@ -155,3 +155,3 @@
45 else
46 - exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
47 + exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
48 fi
49 @@ -177,3 +177,3 @@
50 elif [ "$MAXIMA_LISP" = "sbcl" ]; then
51 - exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
52 + exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
53 else
54
55
56
57 1.1 sci-mathematics/maxima/files/maxima-5.27.0-wish.patch
58
59 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.27.0-wish.patch?rev=1.1&view=markup
60 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.27.0-wish.patch?rev=1.1&content-type=text/plain
61
62 Index: maxima-5.27.0-wish.patch
63 ===================================================================
64 diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
65 --- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
66 +++ maxima-5.23.1//configure.in 2011-01-16 21:00:16.000000000 +0600
67 @@ -777,6 +777,11 @@
68 [ --with-wish=<prog> Use <prog> for Tk wish shell (default wish)],
69 - [WISH="${withval}"],
70 - [WISH="wish"])
71 + [],
72 + [with_wish="wish"])
73 +case "${with_wish}" in
74 + no) WISH="none" ;;
75 + yes) WISH="wish" ;;
76 + *) WISH="${with_wish}" ;;
77 +esac
78 AC_SUBST(WISH)
79 -
80 +AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno)
81
82 diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am
83 --- maxima-5.23.1.orig//interfaces/Makefile.am 2004-04-28 23:34:59.000000000 +0700
84 +++ maxima-5.23.1//interfaces/Makefile.am 2011-01-16 20:41:38.000000000 +0600
85 @@ -1,2 +1,6 @@
86 +if WANT_TK
87 SUBDIRS = emacs xmaxima
88 +else
89 +SUBDIRS = emacs
90 +endif
91 EXTRA_DIST = bin/xmaxima.iss