gentoo resync : 16.04.2022

3 files changed, 14 insertions, 276 deletions

diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 41cdfc15117f..960e3f36382f 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -14,10 +14,9 @@ AUX support-new-vtk.patch 924 BLAKE2B 960c3342ca4374c03aff30d7d2326c6e826ffb2cb0
 AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f93b949a05de9226d19d7898daf998cbedc61a77556c923f3f6f8e57508b73f3cae117f62d214d SHA512 110db85899241e1f9ea8427ffb397737aefe0bb6286d037c2c04cfad9726838521ef6403242aeb1e4246d06f13cf83af84bba38567a99b00ed6a081f17b38ead
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
 DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48
-DIST maxima-5.44.0.tar.gz 34976354 BLAKE2B d6870b6fb0581d9e60d6ed97c7daed8ce12b8b1ae49d0edb7b8d31dd723f9b879eb70440659ff958f53cee16d8d2a92f80dcaa3898d9f6dbabd79a5059073a65 SHA512 1e043bebb7c6d002c113d8de20a98d58d1a8e7bedfc9bcf52819e7c7554655991dc2f42f0333889706574249736db833a237b3e59b967e7e42ede28262e31f2f
 DIST maxima-5.45.1.tar.gz 39951932 BLAKE2B b6d67aebf34c12567ec5d08581dc22d13a902d42074abc967f8e50e029845a52a2538da8cb4382e3e28163ce11a6d8c245cfc48150cc10768250de34368acf6c SHA512 08e7a2b24324c0f0dda127d291b9d439125fa1324732b17c804c3eb68d35f87e3fc713c147472821a1781e6378b7afb0721d5da907826324ec3d24848251b7cf
+DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef
 EBUILD maxima-5.42.1-r1.ebuild 4916 BLAKE2B 838203d4b4e1d417eb35a0891cb8b9801114f53fbce2ca9910e3ecfe53932a4be96e454721e46049a4fdd84b61eb447610eb028b33860fd34b0e2d60c9595bea SHA512 77184d89fa584f92da3e691ebddab58da12733c99742d6eb835d1be2d69ff0f11bdfffa40f3c7dfe537a4ee08fc34e8d269a5cec20c60a498eb9e77f92f137ce
-EBUILD maxima-5.44.0-r10.ebuild 6372 BLAKE2B e3297b624215d728f9e2496548dd7f8120a580769a4d9a4900732b81410f6e10df28b132bb89272668ad29fbab8c95507ea9c7d0854894bff23ce3e82597ba0f SHA512 1f8d36eb61225a4a76250808964a6a6352a642c031ee129680a4f5cc6b418515c34c5c275478a4b46fcc41caffa3cc80d3111205b530b2384b313b46b481ea1b
-EBUILD maxima-5.44.0-r9.ebuild 6298 BLAKE2B 8db82bbae80fd131141e5d5b8a700972865ae187b6b72956f14d48733ed91d54527e8784da044d63ee6c48f0c0604124dbe08aad856fbfd81bb61546aabb21d5 SHA512 f166a500b8bfc04de71d0851fe25fe8e9e48e5fe274d38099d5b9277c839ecb2fa4e6ec11c6b854921691b782a1c47b03001b0ac3723d6b9e42710bafc8cac78
 EBUILD maxima-5.45.1-r2.ebuild 6374 BLAKE2B bae227125971213b20fc68eb0e6e6e1b653e07969169edc6c0157b0567e4fa64d5c9dc8233e0b03bcc0d41a19757da740bfe6a87742b5d9be0ae18a6ce53f42d SHA512 7729217e3978f9d05bbfcef32127c8f43a820ad176195032c8a6d8fe26e95e69ff0369d1c0e5fb92925ce35c7c73adc531dc7f0175fddbfb5798d79932f56d43
+EBUILD maxima-5.46.0.ebuild 5956 BLAKE2B 8e3ddf245d7001934f9fb82867a2842c3e062f4d9881cbc2319cd64bf83cee81681cc7e49ead4d0de17fd07cb22b8fbd7ec1dbb76ad5f6c80fc4a74e97d08a4f SHA512 5be5951714e2072cb4d0c3e2a6bbbb723f45227930d5e9e2ce183b439361dfaf5575f09ca8760b2319113cdf34e5d051fded3dea0d771227b4afce849a7c3ec3
 MISC metadata.xml 1734 BLAKE2B a7f2d1c80272f79cce70c14b84b2c5bec1898f59464ce871a97ed4af1026b1d49622e865743002dbb7a9c91a878d2e8b4ae0302084f5bb2f7c75eedfd5370099 SHA512 2fbe921b196b17d6cf866f1193b4b83aa9974598f4b923acd7847dc1d327f5ab2b623ffd19bb772176740a96b1efb438f26c57a108151f0f18c720ce8b540bf7
diff --git a/sci-mathematics/maxima/maxima-5.44.0-r9.ebuild b/sci-mathematics/maxima/maxima-5.44.0-r9.ebuild
deleted file mode 100644
index 4f4ea7fe41d2..000000000000
--- a/sci-mathematics/maxima/maxima-5.44.0-r9.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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 ~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     .               4    3         1     )
-
-IUSE="emacs gui nls unicode vtk 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
-#
-# VTK is an optional plotting backend that can be enabled by
-# running "draw_renderer: 'vtk;" within maxima.
-#
-# It's NON-optional for the scene() command, but that command is
-# currently useless since Tcl/Tk support was dropped in sci-libs/vtk.
-# Thus we include VTK only as an optional dependency.
-RDEPEND="
-	virtual/libcrypt:=
-	X? (
-		x11-misc/xdg-utils
-		sci-visualization/gnuplot[gd]
-		vtk? (
-			${PYTHON_DEPS}
-			sci-libs/vtk[python,rendering,${PYTHON_SINGLE_USEDEP}]
-		)
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		virtual/latex-base
-		app-emacs/auctex
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latexrecommended
-	)
-	gui? ( dev-lang/tk:0 )"
-
-# 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
-
-# Maxima can make use of X features like plotting (and launching a PNG
-# viewer) from the console, but you can't use the xmaxima GUI without X.
-REQUIRED_USE="${PYTHON_REQUIRED_USE} gui? ( X )"
-
-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 support-new-vtk )
-
-	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 gui 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 gui && 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-r10.ebuild b/sci-mathematics/maxima/maxima-5.46.0.ebuild
index 7b3910f71060..e6051e772c32 100644
--- a/sci-mathematics/maxima/maxima-5.44.0-r10.ebuild
+++ b/sci-mathematics/maxima/maxima-5.46.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools elisp-common flag-o-matic python-single-r1 xdg-utils
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test"
+IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test"
 RESTRICT="!test? ( test )"
 
 # Languages
@@ -25,21 +25,19 @@ for lang in ${LANGS}; do
 done
 
 LISP_DEPEND="
-	clisp? ( dev-lisp/clisp )
+	clisp? ( dev-lisp/clisp:= )
 	clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap )
 	clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap )
 	cmucl? ( dev-lisp/cmucl app-misc/rlwrap )
-	ecls? ( dev-lisp/ecls app-misc/rlwrap )
+	ecls? ( dev-lisp/ecls:= app-misc/rlwrap )
 	gcl? ( dev-lisp/gcl[ansi,readline] )
-	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
+	sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap )
 "
 
-# Python is used in e.g. doc/info/build_html.sh to build the docs.
 # LISP_DEPEND is included in both BDEPEND and DEPEND because the various
 # lisp engines are used to both compile and run maxima. It's possible
 # that they don't (all?) need to be listed in DEPEND; who knows.
 BDEPEND="
-	${PYTHON_DEPS}
 	${LISP_DEPEND}
 	test? ( sci-visualization/gnuplot )
 	sys-apps/texinfo
@@ -48,7 +46,7 @@ BDEPEND="
 DEPEND="
 	${LISP_DEPEND}
 	virtual/libcrypt:=
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? ( >=app-editors/emacs-26:* )
 	gui? ( dev-lang/tk:0 )
 "
 
@@ -83,7 +81,7 @@ RDEPEND="
 # Maxima can make use of X features like plotting (and launching a PNG
 # viewer) from the console, but you can't use the xmaxima GUI without X.
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
+	vtk? ( ${PYTHON_REQUIRED_USE} )
 	|| ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl )
 	gui? ( X )"
 
@@ -91,19 +89,17 @@ TEXMF="${EPREFIX}"/usr/share/texmf-site
 
 pkg_setup() {
 	# Set the PYTHON variable to whatever it should be.
-	python-single-r1_pkg_setup
+	use vtk && python-single-r1_pkg_setup
 }
 
 PATCHES=(
-	"${FILESDIR}/support-new-vtk.patch"
-	"${FILESDIR}/dont-hardcode-python.patch"
+	"${FILESDIR}/imaxima-0.patch"
 	"${FILESDIR}/xdg-utils-1.patch"
 	"${FILESDIR}/wish-2.patch"
 	"${FILESDIR}/rmaxima-0.patch"
 	"${FILESDIR}/emacs-0.patch"
 	"${FILESDIR}/clisp-1.patch"
 	"${FILESDIR}/clozurecl-3.patch"
-	"${FILESDIR}/ecls-4.patch"
 	"${FILESDIR}/cmucl-1.patch"
 	"${FILESDIR}/sbcl-2.patch"
 )
@@ -128,7 +124,6 @@ src_configure() {
 		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
@@ -165,10 +160,7 @@ src_configure() {
 }
 
 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}"
+	emake
 	if use emacs; then
 		pushd interfaces/emacs/emaxima > /dev/null
 		elisp-compile *.el
@@ -187,7 +179,7 @@ src_install() {
 	# 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
+	doins AUTHORS COPYING README README-lisps.md
 	dodir /usr/share/doc
 	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}