From 0fe19e668b7037c41b7a4c6925e06f1d5d3f5bf8 Mon Sep 17 00:00:00 2001 From: Andrey Grozin Date: Sat, 1 May 2010 12:18:11 +0000 Subject: A patch to support clozurecl-1.5 added (Portage version: 2.2_rc67/cvs/Linux i686) --- sci-mathematics/maxima/ChangeLog | 9 +- .../maxima/files/maxima-5.21.1-clozurecl-1.5.patch | 22 --- sci-mathematics/maxima/files/maxima-5.21.1.patch | 38 ++++ sci-mathematics/maxima/maxima-5.21.1-r1.ebuild | 191 ++++++++++++++++++++ sci-mathematics/maxima/maxima-5.21.1.ebuild | 192 --------------------- 5 files changed, 237 insertions(+), 215 deletions(-) delete mode 100644 sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch create mode 100644 sci-mathematics/maxima/files/maxima-5.21.1.patch create mode 100644 sci-mathematics/maxima/maxima-5.21.1-r1.ebuild delete mode 100644 sci-mathematics/maxima/maxima-5.21.1.ebuild (limited to 'sci-mathematics/maxima') diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog index 8995c86c639b..22816211d7b8 100644 --- a/sci-mathematics/maxima/ChangeLog +++ b/sci-mathematics/maxima/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-mathematics/maxima # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.78 2010/04/24 21:23:45 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.79 2010/05/01 12:18:10 grozin Exp $ + +*maxima-5.21.1-r1 (01 May 2010) + + 01 May 2010; Andrey Grozin -maxima-5.21.1.ebuild, + +maxima-5.21.1-r1.ebuild, -files/maxima-5.21.1-clozurecl-1.5.patch, + +files/maxima-5.21.1.patch: + A patch to support clozurecl-1.5 added *maxima-5.21.1 (24 Apr 2010) diff --git a/sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch b/sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch deleted file mode 100644 index ed64d5f67d6b..000000000000 --- a/sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -r -U2 maxima-5.20.1.orig/configure maxima-5.20.1/configure ---- maxima-5.20.1.orig/configure 2009-12-14 04:20:43.000000000 +0100 -+++ maxima-5.20.1/configure 2010-04-24 21:59:24.000000000 +0200 -@@ -2559,5 +2559,5 @@ - fi - --openmcl_default_name=openmcl -+openmcl_default_name=ccl - # Check whether --enable-openmcl or --disable-openmcl was given. - if test "${enable_openmcl+set}" = set; then -diff -r -U2 maxima-5.20.1.orig/src/maxima-build.lisp maxima-5.20.1/src/maxima-build.lisp ---- maxima-5.20.1.orig/src/maxima-build.lisp 2008-12-30 02:32:33.000000000 +0100 -+++ maxima-5.20.1/src/maxima-build.lisp 2010-04-24 21:54:19.000000000 +0200 -@@ -36,5 +36,5 @@ - #+allegro (excl:dumplisp :name "binary-acl/maxima.dxl") - #+lispworks (hcl:save-image "binary-lispworks/maxima" :restart-function 'cl-user::run) -- #+ccl (ccl:save-application "binary-openmcl/maxima" :toplevel-function 'cl-user::run)) -- -- -+ #+ccl (ccl:save-application "binary-openmcl/maxima" :toplevel-function -+ (lambda () (let* ((*read-default-float-format* 'double-float)) -+ (cl-user::run)))) diff --git a/sci-mathematics/maxima/files/maxima-5.21.1.patch b/sci-mathematics/maxima/files/maxima-5.21.1.patch new file mode 100644 index 000000000000..189fbb97ae33 --- /dev/null +++ b/sci-mathematics/maxima/files/maxima-5.21.1.patch @@ -0,0 +1,38 @@ +diff -r -U1 maxima-5.21.1.orig/configure maxima-5.21.1/configure +--- maxima-5.21.1.orig/configure 2010-04-24 18:34:21.000000000 +0200 ++++ maxima-5.21.1/configure 2010-04-27 03:37:50.000000000 +0200 +@@ -2560,3 +2560,3 @@ + +-openmcl_default_name=openmcl ++openmcl_default_name=ccl + # Check whether --enable-openmcl or --disable-openmcl was given. +diff -r -U1 maxima-5.21.1.orig/src/maxima.in maxima-5.21.1/src/maxima.in +--- maxima-5.21.1.orig/src/maxima.in 2009-07-13 17:25:25.000000000 +0200 ++++ maxima-5.21.1/src/maxima.in 2010-04-27 03:36:24.000000000 +0200 +@@ -131,5 +131,5 @@ + if [ "$layout_autotools" = "true" ]; then +- 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" ++ 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" + else +- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" ++ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" + fi +@@ -137,5 +137,5 @@ + if [ "$layout_autotools" = "true" ]; then +- 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" ++ 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" + else +- 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" ++ 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" + fi +@@ -156,3 +156,3 @@ + # in the function get-application-args in command-line.lisp +- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" ++ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e "(let\* ((\*read-default-float-format\* 'double-float)) (cl-user::run))" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" + elif [ "$MAXIMA_LISP" = "ecl" ]; then +@@ -160,3 +160,3 @@ + elif [ "$MAXIMA_LISP" = "sbcl" ]; then +- 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" ++ 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" + else +Только в maxima-5.21.1/src: maxima.in.orig diff --git a/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild new file mode 100644 index 000000000000..45e91bef01d3 --- /dev/null +++ b/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild,v 1.1 2010/05/01 12:18:10 grozin Exp $ +EAPI=2 +inherit eutils elisp-common + +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 ~sparc ~x86" + +# Supported lisps with readline +SUPP_RL="gcl clisp" +# Supported lisps without readline +SUPP_NORL="cmucl sbcl ecl openmcl" +SUPP_LISPS="${SUPP_RL} ${SUPP_NORL}" +# Default lisp if none selected +DEF_LISP="sbcl" + +IUSE="latex emacs tk nls unicode xemacs X ${SUPP_LISPS} ${IUSE}" + +# 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 ) ) + latex? ( virtual/latex-base ) + emacs? ( virtual/emacs + latex? ( app-emacs/auctex ) ) + xemacs? ( app-editors/xemacs + latex? ( app-emacs/auctex ) )" + +PDEPEND="emacs? ( app-emacs/imaxima )" + +# create lisp dependencies +for LISP in ${SUPP_LISPS}; do + if [ "${LISP}" = "gcl" ] + then + RDEPEND="${RDEPEND} gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] )" + else if [ "${LISP}" = "ecl" ] + then + RDEPEND="${RDEPEND} ecl? ( >=dev-lisp/ecls-10.4.1 )" + else if [ "${LISP}" = "openmcl" ] + then + RDEPEND="${RDEPEND} openmcl? ( dev-lisp/clozurecl )" + else + RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )" + fi + fi + fi + DEF_DEP="${DEF_DEP} !${LISP}? ( " +done +DEF_DEP="${DEF_DEP} dev-lisp/${DEF_LISP}" +for LISP in ${SUPP_NORL}; do + RDEPEND="${RDEPEND} ${LISP}? ( app-misc/rlwrap )" + [[ ${LISP} = ${DEF_LISP} ]] && \ + DEF_DEP="${DEF_DEP} app-misc/rlwrap" +done +for LISP in ${SUPP_LISPS}; do + DEF_DEP="${DEF_DEP} )" +done + +RDEPEND="${RDEPEND} + ${DEF_DEP}" + +DEPEND="${RDEPEND} + sys-apps/texinfo" + +TEXMF=/usr/share/texmf-site +NO_INIT_PATCH_PV="5.19.1" + +pkg_setup() { + LISPS="" + + for LISP in ${SUPP_LISPS}; do + use ${LISP} && LISPS="${LISPS} ${LISP}" + done + + RL="" + + for LISP in ${SUPP_NORL}; do + use ${LISP} && RL="yes" + done + + if [ -z "${LISPS}" ]; then + ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default" + LISPS="${DEF_LISP}" + RL="yes" + fi +} + +src_prepare() { + # use xdg-open to view ps, pdf + epatch "${FILESDIR}"/${PN}-xdg-utils.patch + + # Don't use lisp init files + # ClozureCL executable name is now ccl + # *read-default-float-format* is now bound per-thread + # and isn't saved in a heap image + epatch "${FILESDIR}"/${P}.patch + + epatch "${FILESDIR}"/${P}-emacs-version.patch + + # remove rmaxima if not needed + if [ -z "${RL}" ]; then + sed -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \ + -i "${S}"/src/Makefile.in \ + || die "sed for rmaxima failed" + fi + + # don't install imaxima, since we have a separate package for it + sed -i -e '/^SUBDIRS/s/imaxima//' interfaces/emacs/Makefile.in \ + || die "sed for imaxima failed" +} + +src_configure() { + local myconf="" + for LISP in ${LISPS}; do + myconf="${myconf} --enable-${LISP}" + done + + # remove xmaxima if no tk + if use tk; then + myconf="${myconf} --with-wish=wish" + else + myconf="${myconf} --with-wish=none" + sed -i \ + -e '/^SUBDIRS/s/xmaxima//' \ + interfaces/Makefile.in || die "sed for tk failed" + fi + + # enable existing translated doc + if use nls; then + for lang in ${LANGS}; do + if use "linguas_${lang}"; then + myconf="${myconf} --enable-lang-${lang}" + use unicode && myconf="${myconf} --enable-lang-${lang}-utf8" + fi + done + fi + + econf ${myconf} +} + +src_install() { + einstall emacsdir="${D}${SITELISP}/${PN}" || die "einstall failed" + + 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 +} + +pkg_preinst() { + # some lisps do not read compress info files (bug #176411) + for infofile in "${D}"/usr/share/info/*.bz2 ; do + bunzip2 "${infofile}" + done +} + +pkg_postinst() { + use emacs && elisp-site-regen + use latex && mktexlsr +} + +pkg_postrm() { + use emacs && elisp-site-regen + use latex && mktexlsr +} diff --git a/sci-mathematics/maxima/maxima-5.21.1.ebuild b/sci-mathematics/maxima/maxima-5.21.1.ebuild deleted file mode 100644 index 302b74f837c2..000000000000 --- a/sci-mathematics/maxima/maxima-5.21.1.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.21.1.ebuild,v 1.1 2010/04/24 21:23:45 grozin Exp $ -EAPI=2 -inherit eutils elisp-common - -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 ~sparc ~x86" - -# Supported lisps with readline -SUPP_RL="gcl clisp" -# Supported lisps without readline -SUPP_NORL="cmucl sbcl ecl openmcl" -SUPP_LISPS="${SUPP_RL} ${SUPP_NORL}" -# Default lisp if none selected -DEF_LISP="sbcl" - -IUSE="latex emacs tk nls unicode xemacs X ${SUPP_LISPS} ${IUSE}" - -# 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 ) ) - latex? ( virtual/latex-base ) - emacs? ( virtual/emacs - latex? ( app-emacs/auctex ) ) - xemacs? ( app-editors/xemacs - latex? ( app-emacs/auctex ) )" - -PDEPEND="emacs? ( app-emacs/imaxima )" - -# create lisp dependencies -for LISP in ${SUPP_LISPS}; do - if [ "${LISP}" = "gcl" ] - then - RDEPEND="${RDEPEND} gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] )" - else if [ "${LISP}" = "ecl" ] - then - RDEPEND="${RDEPEND} ecl? ( >=dev-lisp/ecls-10.4.1 )" - else if [ "${LISP}" = "openmcl" ] - then - RDEPEND="${RDEPEND} openmcl? ( dev-lisp/clozurecl )" - else - RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )" - fi - fi - fi - DEF_DEP="${DEF_DEP} !${LISP}? ( " -done -DEF_DEP="${DEF_DEP} dev-lisp/${DEF_LISP}" -for LISP in ${SUPP_NORL}; do - RDEPEND="${RDEPEND} ${LISP}? ( app-misc/rlwrap )" - [[ ${LISP} = ${DEF_LISP} ]] && \ - DEF_DEP="${DEF_DEP} app-misc/rlwrap" -done -for LISP in ${SUPP_LISPS}; do - DEF_DEP="${DEF_DEP} )" -done - -RDEPEND="${RDEPEND} - ${DEF_DEP}" - -DEPEND="${RDEPEND} - sys-apps/texinfo" - -TEXMF=/usr/share/texmf-site -NO_INIT_PATCH_PV="5.19.1" - -pkg_setup() { - LISPS="" - - for LISP in ${SUPP_LISPS}; do - use ${LISP} && LISPS="${LISPS} ${LISP}" - done - - RL="" - - for LISP in ${SUPP_NORL}; do - use ${LISP} && RL="yes" - done - - if [ -z "${LISPS}" ]; then - ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default" - LISPS="${DEF_LISP}" - RL="yes" - fi -} - -src_prepare() { - # use xdg-open to view ps, pdf - epatch "${FILESDIR}"/${PN}-xdg-utils.patch - - epatch "${FILESDIR}"/${PN}-${NO_INIT_PATCH_PV}-no-init-files.patch - - # ClozureCL executable name is now ccl - # *read-default-float-format* is now bound per-thread - # and isn't saved in a heap image - epatch "${FILESDIR}"/${P}-clozurecl-1.5.patch - - epatch "${FILESDIR}"/${P}-emacs-version.patch - - # remove rmaxima if not needed - if [ -z "${RL}" ]; then - sed -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \ - -i "${S}"/src/Makefile.in \ - || die "sed for rmaxima failed" - fi - - # don't install imaxima, since we have a separate package for it - sed -i -e '/^SUBDIRS/s/imaxima//' interfaces/emacs/Makefile.in \ - || die "sed for imaxima failed" -} - -src_configure() { - local myconf="" - for LISP in ${LISPS}; do - myconf="${myconf} --enable-${LISP}" - done - - # remove xmaxima if no tk - if use tk; then - myconf="${myconf} --with-wish=wish" - else - myconf="${myconf} --with-wish=none" - sed -i \ - -e '/^SUBDIRS/s/xmaxima//' \ - interfaces/Makefile.in || die "sed for tk failed" - fi - - # enable existing translated doc - if use nls; then - for lang in ${LANGS}; do - if use "linguas_${lang}"; then - myconf="${myconf} --enable-lang-${lang}" - use unicode && myconf="${myconf} --enable-lang-${lang}-utf8" - fi - done - fi - - econf ${myconf} -} - -src_install() { - einstall emacsdir="${D}${SITELISP}/${PN}" || die "einstall failed" - - 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 -} - -pkg_preinst() { - # some lisps do not read compress info files (bug #176411) - for infofile in "${D}"/usr/share/info/*.bz2 ; do - bunzip2 "${infofile}" - done -} - -pkg_postinst() { - use emacs && elisp-site-regen - use latex && mktexlsr -} - -pkg_postrm() { - use emacs && elisp-site-regen - use latex && mktexlsr -} -- cgit v1.2.3-65-gdbad