commit: 1d8da22fd88af065e8691d00fafee09cdd570e85 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Thu Mar 25 14:24:25 2021 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Thu Mar 25 14:35:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8da22f
sci-mathematics/maxima: Revert "don't hardcode python" This reverts commit 9b7b496428d9e3c307666e05aed3035c0ebb883d. I have a complete fix for this (and other open maxima bugs) in the middle of a series of patches/revisions. Reverting so that it doesn't clobber my rebase. Sorry for not speaking up! Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> sci-mathematics/maxima/files/python-0.patch | 38 ----------------------------- sci-mathematics/maxima/maxima-5.44.0.ebuild | 4 +-- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/sci-mathematics/maxima/files/python-0.patch b/sci-mathematics/maxima/files/python-0.patch deleted file mode 100644 index 63dea1ea1de..00000000000 --- a/sci-mathematics/maxima/files/python-0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <mich...@orlitzky.com> -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.ebuild b/sci-mathematics/maxima/maxima-5.44.0.ebuild index da0d520a076..6588716b494 100644 --- a/sci-mathematics/maxima/maxima-5.44.0.ebuild +++ b/sci-mathematics/maxima/maxima-5.44.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -97,7 +97,7 @@ pkg_setup() { src_prepare() { local n PATCHES v - PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 python-0 ) + PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 ) n=${#PATCHES[*]} for ((n--; n >= 0; n--)); do
