From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F1CC3138334 for ; Sat, 1 Jun 2019 11:25:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 042B2E087B; Sat, 1 Jun 2019 11:25:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7EA6E087B for ; Sat, 1 Jun 2019 11:25:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52BD93454C9 for ; Sat, 1 Jun 2019 11:25:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B79FC5C0 for ; Sat, 1 Jun 2019 11:25:44 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1559388319.073c7f9a0c3ddc8610e809d1fb3082b32d8e3b9c.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/maxima/Manifest sci-mathematics/maxima/files/clozurecl-3.patch sci-mathematics/maxima/maxima-5.43.0.ebuild X-VCS-Directories: sci-mathematics/maxima/files/ sci-mathematics/maxima/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: 073c7f9a0c3ddc8610e809d1fb3082b32d8e3b9c X-VCS-Branch: master Date: Sat, 1 Jun 2019 11:25:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab7b8f7f-3537-4395-a586-f8654193dd55 X-Archives-Hash: fa213581ba79e50c21f4384c81fae2f6 commit: 073c7f9a0c3ddc8610e809d1fb3082b32d8e3b9c Author: Andrey Grozin gentoo org> AuthorDate: Sat Jun 1 11:24:34 2019 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Sat Jun 1 11:25:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073c7f9a sci-mathematics/maxima: bump to 5.43.0 Closes: https://bugs.gentoo.org/show_bug.cgi?id=684670 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Andrey Grozin gentoo.org> sci-mathematics/maxima/Manifest | 1 + sci-mathematics/maxima/files/clozurecl-3.patch | 27 ++++ sci-mathematics/maxima/maxima-5.43.0.ebuild | 213 +++++++++++++++++++++++++ 3 files changed, 241 insertions(+) diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest index a0c2fc48ac1..f22ecb58c2b 100644 --- a/sci-mathematics/maxima/Manifest +++ b/sci-mathematics/maxima/Manifest @@ -1,3 +1,4 @@ DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9 DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48 DIST maxima-5.42.2.tar.gz 41840181 BLAKE2B bca8a94366f1fe2f508436fdef8de80107b19c9b267a4b72dc6f56870078d35b3feb7dbdda384589b38c5351d6eeede1b9738a5ec2152063de2afacd1ced48c4 SHA512 5033b02272121f6aacff5ededf90eaad5e644a06d0c62aafd745401c08429da979ecd8274f7aa12596a0e32ddb614659af14e4273f59d372fe1ecbec081e7829 +DIST maxima-5.43.0.tar.gz 34605709 BLAKE2B db9db75b7eff0454d4b9595120d726969b4e8b651f611ac69dcd92c4496bf9530ce76867348fd87a33444eef3abb7d123ef2726a7b96ebde9e43f231b21a2b8c SHA512 6611eda4bf81bc5454bf6dd641c73a470cc07b2f768d9550b3abeb7b68f1b4675fd5eca766c52844438e9247d8035be537c7120c9f49cdaed9f918d49ed16659 diff --git a/sci-mathematics/maxima/files/clozurecl-3.patch b/sci-mathematics/maxima/files/clozurecl-3.patch new file mode 100644 index 00000000000..531c6caca9d --- /dev/null +++ b/sci-mathematics/maxima/files/clozurecl-3.patch @@ -0,0 +1,27 @@ +diff -r -U1 maxima-5.43.0.orig/configure.ac maxima-5.43.0/configure.ac +--- maxima-5.43.0.orig/configure.ac 2019-05-31 00:52:28.000000000 +0200 ++++ maxima-5.43.0/configure.ac 2019-06-01 12:08:22.549425058 +0200 +@@ -434,3 +434,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.43.0.orig/src/Makefile.am maxima-5.43.0/src/Makefile.am +--- maxima-5.43.0.orig/src/Makefile.am 2019-05-31 00:52:28.000000000 +0200 ++++ maxima-5.43.0/src/Makefile.am 2019-06-01 12:06:49.990422763 +0200 +@@ -392,3 +392,3 @@ + +-EXECUTEOPENMCL = $(OPENMCL_NAME) ++EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init + BUILT_FILES += $(OPENMCL_MAXIMA) +diff -r -U1 maxima-5.43.0.orig/src/maxima.in maxima-5.43.0/src/maxima.in +--- maxima-5.43.0.orig/src/maxima.in 2019-05-31 00:52:28.000000000 +0200 ++++ maxima-5.43.0/src/maxima.in 2019-06-01 12:10:12.251427778 +0200 +@@ -221,5 +221,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/maxima-5.43.0.ebuild b/sci-mathematics/maxima/maxima-5.43.0.ebuild new file mode 100644 index 00000000000..c537cea53d2 --- /dev/null +++ b/sci-mathematics/maxima/maxima-5.43.0.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools elisp-common eutils xdg-utils + +DESCRIPTION="Free computer algebra environment based on Macsyma" +HOMEPAGE="http://maxima.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2 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 ) +# supports readline: . - no, y - yes +SUPP_RL=( . . y . . y ) +# . - just --enable-, - --enable- +CONF_FLAG=( . . . ecl ccl . ) +# patch file version; . - no patch +PATCH_V=( 2 1 . 3 3 1 ) + +IUSE="emacs tk nls unicode X test ${LISPS[*]}" + +# Languages +LANGS="de es pt pt_BR" +for lang in ${LANGS}; do + IUSE="${IUSE} l10n_${lang/_/-}" +done + +# texlive-latexrecommended needed by imaxima for breqn.sty +RDEPEND="!app-emacs/imaxima + X? ( x11-misc/xdg-utils + sci-visualization/gnuplot[gd] + tk? ( dev-lang/tk:0 ) ) + emacs? ( virtual/emacs + virtual/latex-base + app-emacs/auctex + app-text/ghostscript-gpl + dev-texlive/texlive-latexrecommended )" + +# 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}) )" + DEF_DEP="${DEF_DEP} !${LISP}? ( " +done + +# default lisp +DEF_LISP=0 # sbcl +ARM_LISP=2 # gcl +DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )" + +n=${#LISPS[*]} +for ((n--; n >= 0; n--)); do + DEF_DEP="${DEF_DEP} )" +done + +unset LISP + +RDEPEND="${RDEPEND} + ${DEF_DEP}" + +DEPEND="${RDEPEND} + test? ( sci-visualization/gnuplot ) + 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 + use arm && DEF_LISP=${ARM_LISP} + ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default" + NLISPS=${DEF_LISP} + fi +} + +src_prepare() { + local n PATCHES v + PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 ) + + n=${#PATCHES[*]} + for ((n--; n >= 0; n--)); do + eapply "${FILESDIR}"/${PATCHES[${n}]}.patch + done + + n=${#LISPS[*]} + for ((n--; n >= 0; n--)); do + v=${PATCH_V[${n}]} + if [ "${v}" != "." ]; then + eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch + fi + done + + eapply_user + + # 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 "l10n_${lang/_/-}"; then + CONFS="${CONFS} --enable-lang-${lang}" + use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8" + fi + done + fi + + econf ${CONFS} \ + $(use_with tk wish) \ + $(use_enable emacs) \ + --with-lispdir="${EPREFIX}/${SITELISP}/${PN}" +} + +src_compile() { + emake + if use emacs; then + pushd interfaces/emacs/emaxima > /dev/null + elisp-compile *.el + popd > /dev/null + pushd interfaces/emacs/imaxima > /dev/null + BYTECOMPFLAGS="-L . -L ../emaxima" + elisp-compile *.el + popd > /dev/null + fi +} + +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" + + # 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 + dodir /usr/share/doc + dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} + + if use emacs; then + elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp} + elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el + + rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die + insinto ${TEXMF}/tex/latex/emaxima + doins interfaces/emacs/emaxima/emaxima.sty + + insinto /usr/share/${PN}/${PV}/doc/imaxima + doins interfaces/emacs/imaxima/README + doins -r interfaces/emacs/imaxima/imath-example + 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() { + xdg_mimeinfo_database_update + if use emacs; then + elisp-site-regen + mktexlsr + fi +} + +pkg_postrm() { + xdg_mimeinfo_database_update + if use emacs; then + elisp-site-regen + mktexlsr + fi +}