[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     14dadc85b838b8f632c82d5a8288c78f7a85896b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 07:58:45 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 19:49:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14dadc85

sci-mathematics/maxima: drop 5.42.1-r1, EAPI-6--

Closes: https://bugs.gentoo.org/867547
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-mathematics/maxima/Manifest                    |   1 -
 sci-mathematics/maxima/files/clozurecl-2.patch     |  27 ---
 .../maxima/files/dont-hardcode-python.patch        |  38 ----
 sci-mathematics/maxima/files/ecls-3.patch          |  48 -----
 sci-mathematics/maxima/files/ecls-4.patch          |  16 --
 sci-mathematics/maxima/files/support-new-vtk.patch |  26 ---
 sci-mathematics/maxima/maxima-5.42.1-r1.ebuild     | 213 ---------------------
 7 files changed, 369 deletions(-)

diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 181148608f25..cf9ef845e6a1 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,2 +1 @@
-DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
 DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef

diff --git a/sci-mathematics/maxima/files/clozurecl-2.patch b/sci-mathematics/maxima/files/clozurecl-2.patch
deleted file mode 100644
index 5c5189c7e051..000000000000
--- a/sci-mathematics/maxima/files/clozurecl-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/dont-hardcode-python.patch b/sci-mathematics/maxima/files/dont-hardcode-python.patch
deleted file mode 100644
index 63dea1ea1de7..000000000000
--- a/sci-mathematics/maxima/files/dont-hardcode-python.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@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/files/ecls-3.patch b/sci-mathematics/maxima/files/ecls-3.patch
deleted file mode 100644
index b44dea4d09a8..000000000000
--- a/sci-mathematics/maxima/files/ecls-3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -r -U3 maxima-5.42.0.orig/src/maxima.in maxima-5.42.0/src/maxima.in
---- maxima-5.42.0.orig/src/maxima.in	2018-09-21 08:21:11.000000000 +0700
-+++ maxima-5.42.0/src/maxima.in	2018-10-01 21:49:23.551633882 +0700
-@@ -236,7 +236,7 @@
-    fi
- 
- elif [ "$MAXIMA_LISP" = "ecl" ]; then
--   exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -- "$@"
-+   exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -norc -- "$@"
- 
- elif [ "$MAXIMA_LISP" = "sbcl" ]; then
- # Use executable image if it exists.
-diff -r -U3 maxima-5.42.0.orig/src/maxima.system maxima-5.42.0/src/maxima.system
---- maxima-5.42.0.orig/src/maxima.system	2016-12-04 05:27:40.000000000 +0700
-+++ maxima-5.42.0/src/maxima.system	2018-10-01 22:01:08.068604254 +0700
-@@ -59,6 +59,14 @@
- 	 (c:build-fasl output :lisp-files (list object-output)))))
- 
- #+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 ()
-   (labels ((list-all-objects (module)
-              (if (eql (mk::component-type module) :file)
-@@ -75,11 +83,16 @@
- 			     ;; Convert dir/foo.fas to dir/foo.o
- 			     (make-pathname :type "o" :defaults p))
- 			 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
- 			  :ld-flags
- 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
- 							      (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)
- 					         (cl-user::run)))))))
- 

diff --git a/sci-mathematics/maxima/files/ecls-4.patch b/sci-mathematics/maxima/files/ecls-4.patch
deleted file mode 100644
index 7c597c223333..000000000000
--- a/sci-mathematics/maxima/files/ecls-4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/maxima.system b/src/maxima.system
-index ee7ca0f..85ec36f 100644
---- a/src/maxima.system
-+++ b/src/maxima.system
-@@ -75,6 +75,11 @@
- 			     ;; Convert dir/foo.fas to dir/foo.o
- 			     (make-pathname :type "o" :defaults p))
- 			 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 ""))) (list x))))
- 	(c::build-program "binary-ecl/maxima" :lisp-files obj
- 			  :ld-flags
- 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"

diff --git a/sci-mathematics/maxima/files/support-new-vtk.patch b/sci-mathematics/maxima/files/support-new-vtk.patch
deleted file mode 100644
index 3296ce276467..000000000000
--- a/sci-mathematics/maxima/files/support-new-vtk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit c21598340008892173578718afa577f93ebfdd45
-Author: Leo Butler <l_butler@users.sourceforge.net>
-Date:   Sat Feb 13 16:16:20 2021 -0600
-
-    Fix SF Bug #3714, Update maxima to use vtk-8.2.0
-    
-    The GlobalImmediateModeRenderingOn method was deprecated in the VTK
-    codebase in 2017,
-    
-    https://github.com/Kitware/VTK/commit/67e054c91063be30e8e991de489fdda3af668e22
-    
-    This commit may change or break draw-vtk user code that relies on
-    older versions of vtk.
-
-diff --git a/share/draw/vtk.lisp b/share/draw/vtk.lisp
-index 6ff0f9586..1964048d2 100644
---- a/share/draw/vtk.lisp
-+++ b/share/draw/vtk.lisp
-@@ -224,7 +224,6 @@
- (defun vtkpolydatamapper-code (mn fn con)
-   (concatenate 'string
-     (format nil "~a=vtk.vtkPolyDataMapper()~%" mn)
--    (format nil "~a.GlobalImmediateModeRenderingOn()~%" mn) 
-     (if con
-       (format nil "~a.SetInputConnection(~a.GetOutputPort())~%" mn fn)
-       "") ))

diff --git a/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild
deleted file mode 100644
index e06559d09565..000000000000
--- a/sci-mathematics/maxima/maxima-5.42.1-r1.ebuild
+++ /dev/null
@@ -1,213 +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 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 )
-# <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=(   2    1     .               3    2         1     )
-
-IUSE="emacs tk nls unicode X ${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
-	virtual/libcrypt:=
-	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}
-	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
-}