From 579ffa0836ee9943a212862eadb0b27638038316 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 24 Mar 2021 22:47:14 -0400 Subject: sci-mathematics/maxima: don't hard-code the python interpreter. This is a two-parter to fix bug 766291, which has the build failing because it can't find "python". First, we patch the build system to use @PYTHON@ instead of "python" in the one place upstream missed it. Second, we add python-single-r1 to the ebuild so that we get $PYTHON set appropriately. Closes: https://bugs.gentoo.org/766291 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Michael Orlitzky --- .../maxima/files/dont-hardcode-python.patch | 38 ++++ sci-mathematics/maxima/maxima-5.44.0-r1.ebuild | 221 ------------------- sci-mathematics/maxima/maxima-5.44.0-r2.ebuild | 234 +++++++++++++++++++++ 3 files changed, 272 insertions(+), 221 deletions(-) create mode 100644 sci-mathematics/maxima/files/dont-hardcode-python.patch delete mode 100644 sci-mathematics/maxima/maxima-5.44.0-r1.ebuild create mode 100644 sci-mathematics/maxima/maxima-5.44.0-r2.ebuild (limited to 'sci-mathematics/maxima') diff --git a/sci-mathematics/maxima/files/dont-hardcode-python.patch b/sci-mathematics/maxima/files/dont-hardcode-python.patch new file mode 100644 index 000000000000..63dea1ea1de7 --- /dev/null +++ b/sci-mathematics/maxima/files/dont-hardcode-python.patch @@ -0,0 +1,38 @@ +From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Wed, 24 Mar 2021 20:57:44 -0400 +Subject: [PATCH 1/1] doc/info/build_html.sh.in: use @PYTHON@ for the python + interpreter. + +Maxima's ./configure script already detects (or is prodded to use) a +certain python interpreter. The build_html.sh script, however, is +still using a hard-coded "python" command. On many systems, "python" +will be different from the python interpreter that we want to use; for +example when "python" is python-2.7.x and "python3" is what we want to +use with Maxima. + +This commit tweaks doc/info/build_html.sh.in to use the value of the +$PYTHON variable instead. + +Maxima-Bug: https://sourceforge.net/p/maxima/bugs/3754 +Gentoo-Bug: https://bugs.gentoo.org/766291 +--- + doc/info/build_html.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in +index 37930e9..c10e38d 100755 +--- a/doc/info/build_html.sh.in ++++ b/doc/info/build_html.sh.in +@@ -46,7 +46,7 @@ do + echo "filenamebase = \"$filenamebase\"" + cat $f + done | @AWK@ '!/^@c / && !/^@c$/ && (/^@deffn/ || /^@defvr/ || /^@end deffn/ || /^@end defvr/ || /@category/ || /@node/ || /^filenamebase/)' | @SED@ -f @abs_srcdir@/extract_categories1.sed | @AWK@ -f @abs_srcdir@/extract_categories1.awk > make-categories.py +-python make-categories.py ++@PYTHON@ make-categories.py + @SED@ -e 's/^@bye/@node Documentation Categories, , Function and Variable Index\n@chapter Documentation Categories/' @abs_srcdir@/maxima.texi > maxima.texi + ( for f in Category-*.texi; do echo '@include' $f; done ; echo @bye ) >> maxima.texi + +-- +2.26.2 + diff --git a/sci-mathematics/maxima/maxima-5.44.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.44.0-r1.ebuild deleted file mode 100644 index 4cb02071d129..000000000000 --- a/sci-mathematics/maxima/maxima-5.44.0-r1.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools elisp-common eutils flag-o-matic 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" - -# 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 . 4 3 1 ) - -IUSE="emacs tk nls unicode X test ${LISPS[*]}" -RESTRICT="!test? ( test )" - -# 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=" - X? ( x11-misc/xdg-utils - sci-visualization/gnuplot[gd] - tk? ( dev-lang/tk:0 ) ) - emacs? ( >=app-editors/emacs-23.1:* - 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 - - # Using raw-ldflags fixes the error, - # - # x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option - # value (expected an integer): 1 -Wl - # - # when building the maxima.fas library for ECL. - econf ${CONFS} \ - LDFLAGS="$(raw-ldflags)" \ - $(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 use ecls; then - # Use ECL to find the path where it expects to load packages from. - 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 -} diff --git a/sci-mathematics/maxima/maxima-5.44.0-r2.ebuild b/sci-mathematics/maxima/maxima-5.44.0-r2.ebuild new file mode 100644 index 000000000000..778b0ba34fb9 --- /dev/null +++ b/sci-mathematics/maxima/maxima-5.44.0-r2.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit autotools elisp-common eutils flag-o-matic python-single-r1 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" + +# 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 . 4 3 1 ) + +IUSE="emacs tk nls unicode X test ${LISPS[*]}" +RESTRICT="!test? ( test )" + +# 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=" + X? ( x11-misc/xdg-utils + sci-visualization/gnuplot[gd] + tk? ( dev-lang/tk:0 ) ) + emacs? ( >=app-editors/emacs-23.1:* + 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 + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${RDEPEND} + ${DEF_DEP}" + +# Python is used in e.g. doc/info/build_html.sh to build the docs. +DEPEND="${PYTHON_DEPS} + ${RDEPEND} + test? ( sci-visualization/gnuplot ) + sys-apps/texinfo" + +TEXMF="${EPREFIX}"/usr/share/texmf-site + +pkg_setup() { + # Set the PYTHON variable to whatever it should be. + python-single-r1_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 dont-hardcode-python ) + + 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 + + # Using raw-ldflags fixes the error, + # + # x86_64-pc-linux-gnu/bin/ld: fatal error: -O1 -Wl: invalid option + # value (expected an integer): 1 -Wl + # + # when building the maxima.fas library for ECL. + # + econf ${CONFS} \ + LDFLAGS="$(raw-ldflags)" \ + $(use_with tk wish) \ + $(use_enable emacs) \ + --with-lispdir="${EPREFIX}/${SITELISP}/${PN}" +} + +src_compile() { + # The variable PYTHONBIN is used in one place while building the + # German documentation. Some day that script should be converted + # to use the value of @PYTHON@ obtained during ./configure. + emake PYTHONBIN="${PYTHON}" + 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 use ecls; then + # Use ECL to find the path where it expects to load packages from. + 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 +} -- cgit v1.2.3-65-gdbad