commit: f3eb23e2183025fcf28dbcf8f323cc961cc45f0a
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 11:27:43 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 00:56:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3eb23e2
sci-mathematics/maxima: rename USE=tk to USE=gui.
The "tk" flag isn't something a normal user can understand. Since its
main purpose it to enable a GUI, I've renamed it to "gui".
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
...ima-5.44.0-r2.ebuild => maxima-5.44.0-r3.ebuild} | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/sci-mathematics/maxima/maxima-5.44.0-r2.ebuild
b/sci-mathematics/maxima/maxima-5.44.0-r3.ebuild
similarity index 91%
rename from sci-mathematics/maxima/maxima-5.44.0-r2.ebuild
rename to sci-mathematics/maxima/maxima-5.44.0-r3.ebuild
index 778b0ba34fb..57a63d133cc 100644
--- a/sci-mathematics/maxima/maxima-5.44.0-r2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.44.0-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit autotools elisp-common eutils flag-o-matic python-single-r1 xdg-utils
@@ -24,7 +24,7 @@ CONF_FLAG=( . . . ecl ccl . )
# patch file version; . - no patch
PATCH_V=( 2 1 . 4 3 1 )
-IUSE="emacs tk nls unicode X test ${LISPS[*]}"
+IUSE="emacs gui nls unicode X test ${LISPS[*]}"
RESTRICT="!test? ( test )"
# Languages
@@ -36,13 +36,13 @@ done
# texlive-latexrecommended needed by imaxima for breqn.sty
RDEPEND="
X? ( x11-misc/xdg-utils
- sci-visualization/gnuplot[gd]
- tk? ( dev-lang/tk:0 ) )
+ sci-visualization/gnuplot[gd] )
emacs? ( >=app-editors/emacs-23.1:*
virtual/latex-base
app-emacs/auctex
app-text/ghostscript-gpl
- dev-texlive/texlive-latexrecommended )"
+ dev-texlive/texlive-latexrecommended )
+ gui? ( dev-lang/tk:0 )"
# generating lisp dependencies
depends() {
@@ -74,7 +74,9 @@ done
unset LISP
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# 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}"
@@ -106,7 +108,8 @@ pkg_setup() {
src_prepare() {
local n PATCHES v
- PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 dont-hardcode-python )
+ PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1
+ dont-hardcode-python )
n=${#PATCHES[*]}
for ((n--; n >= 0; n--)); do
@@ -160,7 +163,7 @@ src_configure() {
#
econf ${CONFS} \
LDFLAGS="$(raw-ldflags)" \
- $(use_with tk wish) \
+ $(use_with gui wish) \
$(use_enable emacs) \
--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
}
@@ -185,7 +188,7 @@ src_install() {
docompress -x /usr/share/info
emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
- use tk && make_desktop_entry xmaxima xmaxima \
+ use gui && make_desktop_entry xmaxima xmaxima \
/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
"Science;Math;Education"
