sci-mathematics/maxima: version bump
authorAndrey Grozin <grozin@gentoo.org>
Thu, 3 Sep 2015 14:22:01 +0000 (20:22 +0600)
committerAndrey Grozin <grozin@gentoo.org>
Thu, 3 Sep 2015 14:22:01 +0000 (20:22 +0600)
Package-Manager: portage-2.2.20.1

sci-mathematics/maxima/Manifest
sci-mathematics/maxima/files/clisp-1.patch [new file with mode: 0644]
sci-mathematics/maxima/files/clozurecl-2.patch [new file with mode: 0644]
sci-mathematics/maxima/files/cmucl-1.patch [new file with mode: 0644]
sci-mathematics/maxima/files/ecls-2.patch [new file with mode: 0644]
sci-mathematics/maxima/files/sbcl-1.patch [new file with mode: 0644]
sci-mathematics/maxima/maxima-5.37.1.ebuild [new file with mode: 0644]

index 221c53c28ccf8eef467be2fd974b00cab7e0d1ba..edee4ea7c464c253f9d18201ee49f1e3e05402c4 100644 (file)
@@ -1,2 +1,3 @@
 DIST maxima-5.34.1.tar.gz 29469851 SHA256 20ca416ca912c8d3d99299f2ef45342a1beb2f077cf501c6a647de46bfdb89b7 SHA512 24a9ce0d2bfb0fa107460bbeec561869f9d3f2ce2623e39ab16b810dbf2712981bbf98ceee9c30f4e70fdec7f918a7743b5fb8cf26b67313e1d367dd8f2a1823 WHIRLPOOL 0f59cfe14391686a543027bb5cab8669439d0e36b016924872662f61e36cf05663480f8a3f942d7deccbe39ec7f45ed77deeb8a3c84241189ac0f1993537c47a
 DIST maxima-5.36.1.tar.gz 29615673 SHA256 400bf83000b84d280d75e200e078582fe44f23220824562cc06c589d8a993974 SHA512 10e090230ab408777a1145ad90daef6bf237ba38ae31a654ba4d464e7a27e1f48baac5202ce8fb39e4c04ec9a6c9916ac83a58bd071b676ea5a989ea7db87d4c WHIRLPOOL ee7738085ae9e5b156b89afbf724b3ae5ef70b74550bee43cf3ab763f569d5ac51ea9c0e5aad67070f4b71f480b079aad8e4fd44ded34525a1f84cbeeb2d28b0
+DIST maxima-5.37.1.tar.gz 29952404 SHA256 511477cbdf4645a6abd49596d59ed449ec8e012f90b59b1ddffc783c697bf744 SHA512 523f2768e18e7e368dee63f5f6350afc87c3f5a51ef317b1bf3d9c662c1326a40a5035c09c44ed2e1388d31b5450802b802088e95dc7a3e10343bc55daefd878 WHIRLPOOL 0d7fad832a145d38fc0106540ba17d270da64495b2c739c215c07fcefeba2ecb769e609a2e7c1dd516e58b8e128776f5365bf10273c5031f5750b5c250d78bc2
diff --git a/sci-mathematics/maxima/files/clisp-1.patch b/sci-mathematics/maxima/files/clisp-1.patch
new file mode 100644 (file)
index 0000000..9dc8dfd
--- /dev/null
@@ -0,0 +1,19 @@
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in   2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in        2015-09-03 16:08:22.467930422 +0600
+@@ -135,5 +135,5 @@
+       if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-        exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q "" -- "$@"
++        exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$@"
+       else
+-      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$@"
++      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$@"
+       fi
+@@ -141,5 +141,5 @@
+       if [ -x "$maxima_image_base" ]; then
+-        exec "$maxima_image_base"  $MAXIMA_LISP_OPTIONS -q  "" -- "$@"
++        exec "$maxima_image_base"  $MAXIMA_LISP_OPTIONS -q -norc  "" -- "$@"
+       else
+-      exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$@"
++      exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$@"
+       fi
diff --git a/sci-mathematics/maxima/files/clozurecl-2.patch b/sci-mathematics/maxima/files/clozurecl-2.patch
new file mode 100644 (file)
index 0000000..5c5189c
--- /dev/null
@@ -0,0 +1,27 @@
+diff -r -U1 maxima-5.37.1.orig/configure.ac maxima-5.37.1/configure.ac
+--- maxima-5.37.1.orig/configure.ac    2015-09-01 02:28:02.000000000 +0600
++++ maxima-5.37.1/configure.ac 2015-09-03 18:11:54.335618720 +0600
+@@ -386,3 +386,3 @@
+ dnl n.b. openmcl_default_name is hardcoded in "with" message
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ AC_ARG_ENABLE(openmcl,
+diff -r -U1 maxima-5.37.1.orig/src/Makefile.am maxima-5.37.1/src/Makefile.am
+--- maxima-5.37.1.orig/src/Makefile.am 2015-08-11 02:44:21.000000000 +0600
++++ maxima-5.37.1/src/Makefile.am      2015-09-03 17:26:12.849734012 +0600
+@@ -338,3 +338,3 @@
+-EXECUTEOPENMCL = $(OPENMCL_NAME) -e
++EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e
+ BUILT_FILES += $(OPENMCL_MAXIMA)
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in   2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in        2015-09-03 17:22:31.841743306 +0600
+@@ -182,5 +182,5 @@
+     if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+     else
+-      exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@"
++      exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@"
+    fi
diff --git a/sci-mathematics/maxima/files/cmucl-1.patch b/sci-mathematics/maxima/files/cmucl-1.patch
new file mode 100644 (file)
index 0000000..c87a6c9
--- /dev/null
@@ -0,0 +1,19 @@
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in   2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in        2015-09-03 16:29:30.751877085 +0600
+@@ -152,5 +152,5 @@
+       if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-          exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$@"
++          exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$@"
+       else
+-          exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$@"
++          exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$@"
+       fi
+@@ -158,5 +158,5 @@
+       if [ -x "$maxima_image_base" ]; then
+-          exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -- "$@"
++          exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$@"
+       else
+-          exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$@"
++          exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$@"
+       fi
diff --git a/sci-mathematics/maxima/files/ecls-2.patch b/sci-mathematics/maxima/files/ecls-2.patch
new file mode 100644 (file)
index 0000000..d9af8c3
--- /dev/null
@@ -0,0 +1,35 @@
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in   2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in        2015-09-03 16:33:30.913866985 +0600
+@@ -188,3 +188,3 @@
+ elif [ "$MAXIMA_LISP" = "ecl" ]; then
+-   exec "$maxima_image_base"  $MAXIMA_LISP_OPTIONS -- "$@"
++   exec "$maxima_image_base"  $MAXIMA_LISP_OPTIONS -norc -- "$@"
+diff -r -U1 maxima-5.37.1.orig/src/maxima.system maxima-5.37.1/src/maxima.system
+--- maxima-5.37.1.orig/src/maxima.system       2015-09-01 02:26:13.000000000 +0600
++++ maxima-5.37.1/src/maxima.system    2015-09-03 16:42:47.071843596 +0600
+@@ -61,2 +61,10 @@
+ #+ecl
++(defun split-ld-flags-for-ecl (string &aux space)
++  (setf string (string-trim '(#\Space) string))
++  (if (setf space (position #\Space string))
++    (cons (subseq string 0 space)
++      (split-ld-flags-for-ecl (subseq string (1+ space))))
++    (cons string nil)))
++
++#+ecl
+ (defun build-maxima-lib ()
+@@ -77,2 +85,7 @@
+                        files)))
++      (c::build-fasl "binary-ecl/maxima" :lisp-files obj
++                     :ld-flags
++                       (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
++                                                           (find-package "MAXIMA")))))
++                         (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))))
+       (c::build-program "binary-ecl/maxima" :lisp-files obj
+@@ -81,3 +94,3 @@
+                                                             (find-package "MAXIMA")))))
+-                          (if (and x (not (string= x ""))) (list x)))
++                          (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
+                         :epilogue-code '(progn (require :defsystem)
diff --git a/sci-mathematics/maxima/files/sbcl-1.patch b/sci-mathematics/maxima/files/sbcl-1.patch
new file mode 100644 (file)
index 0000000..8899f09
--- /dev/null
@@ -0,0 +1,18 @@
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in   2015-05-22 04:40:03.000000000 +0600
++++ maxima-5.37.1/src/maxima.in        2015-09-03 16:22:57.340893630 +0600
+@@ -193,5 +193,5 @@
+   if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$@"
++    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$@"
+   else
+-    exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$@"
++    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 "$@"
+   fi
+diff -r -U1 maxima-5.37.1.orig/src/server.lisp maxima-5.37.1/src/server.lisp
+--- maxima-5.37.1.orig/src/server.lisp 2015-04-10 01:41:59.000000000 +0600
++++ maxima-5.37.1/src/server.lisp      2015-09-03 16:23:47.100891537 +0600
+@@ -10,3 +10,2 @@
+ (eval-when (:compile-toplevel :load-toplevel :execute)
+-  #+sbcl (require 'asdf)                  ;not needed here for a recent SBCL
+   #+sbcl (require 'sb-posix)
diff --git a/sci-mathematics/maxima/maxima-5.37.1.ebuild b/sci-mathematics/maxima/maxima-5.37.1.ebuild
new file mode 100644 (file)
index 0000000..a0988d8
--- /dev/null
@@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=(   .    .     y               .    .         y     )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( .    .     .               ecl  ccl       .     )
+# patch file version; . - no patch
+PATCH_V=(   1    1     .               2    2         1     )
+
+IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
+
+# Languages
+LANGS="es pt pt_BR"
+for lang in ${LANGS}; do
+       IUSE="${IUSE} linguas_${lang}"
+done
+
+RDEPEND="X? ( x11-misc/xdg-utils
+                sci-visualization/gnuplot[gd]
+                tk? ( dev-lang/tk:0 ) )
+       latex? ( virtual/latex-base )
+       emacs? ( virtual/emacs
+               latex? ( app-emacs/auctex ) )
+       xemacs? ( app-editors/xemacs
+               latex? ( app-emacs/auctex ) )"
+
+PDEPEND="emacs? ( app-emacs/imaxima )"
+
+# generating lisp dependencies
+depends() {
+       local LISP DEP
+       LISP=${LISPS[$1]}
+       DEP="dev-lisp/${LISP}:="
+       if [ "${SUPP_RL[$1]}" = "." ]; then
+               DEP="${DEP} app-misc/rlwrap"
+       fi
+       echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+       LISP=${LISPS[${n}]}
+       RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+       if (( ${n} > 0 )); then
+               DEF_DEP="${DEF_DEP} !${LISP}? ( "
+       fi
+done
+
+# default lisp
+if use arm; then
+       DEF_LISP=2 # gcl
+else
+       DEF_LISP=0 # sbcl
+fi
+
+DEF_DEP="${DEF_DEP} `depends ${DEF_LISP}`"
+
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+       DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+       ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+       sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+       local n=${#LISPS[*]}
+
+       for ((n--; n >= 0; n--)); do
+               use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+       done
+
+       if [ -z "${NLISPS}" ]; then
+               ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+               NLISPS=${DEF_LISP}
+       fi
+}
+
+src_prepare() {
+       local n PATCHES v
+       PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 )
+
+       n=${#PATCHES[*]}
+       for ((n--; n >= 0; n--)); do
+               epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
+       done
+
+       n=${#LISPS[*]}
+       for ((n--; n >= 0; n--)); do
+               v=${PATCH_V[${n}]}
+               if [ "${v}" != "." ]; then
+                       epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+               fi
+       done
+
+       # bug #343331
+       rm share/Makefile.in || die
+       rm src/Makefile.in || die
+       touch src/*.mk
+       touch src/Makefile.am
+       eautoreconf
+}
+
+src_configure() {
+       local CONFS CONF n lang
+       for n in ${NLISPS}; do
+               CONF=${CONF_FLAG[${n}]}
+               if [ ${CONF} = . ]; then
+                       CONF=${LISPS[${n}]}
+               fi
+               CONFS="${CONFS} --enable-${CONF}"
+       done
+
+       # enable existing translated doc
+       if use nls; then
+               for lang in ${LANGS}; do
+                       if use "linguas_${lang}"; then
+                               CONFS="${CONFS} --enable-lang-${lang}"
+                               use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+                       fi
+               done
+       fi
+
+       econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN}
+}
+
+src_install() {
+       docompress -x /usr/share/info
+       emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+       use tk && make_desktop_entry xmaxima xmaxima \
+               /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+               "Science;Math;Education"
+
+       if use latex; then
+               insinto ${TEXMF}/tex/latex/emaxima
+               doins interfaces/emacs/emaxima/emaxima.sty
+       fi
+
+       # do not use dodoc because interfaces can't read compressed files
+       # read COPYING before attempt to remove it from dodoc
+       insinto /usr/share/${PN}/${PV}/doc
+       doins AUTHORS COPYING README README.lisps || die
+       dodir /usr/share/doc
+       dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
+
+       if use emacs; then
+               elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
+       fi
+
+       # if we use ecls, build an ecls library for maxima
+       if use ecls; then
+               ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+               insinto "${ECLLIB#${EPREFIX}}"
+               doins src/binary-ecl/maxima.fas
+       fi
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+       use latex && mktexlsr
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+       use latex && mktexlsr
+}