From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C90761382C5 for ; Fri, 26 Mar 2021 00:57:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C0FAE0788; Fri, 26 Mar 2021 00:57:16 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00D73E0788 for ; Fri, 26 Mar 2021 00:57:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E42F33BE61 for ; Fri, 26 Mar 2021 00:57:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE5CE612 for ; Fri, 26 Mar 2021 00:57:13 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1616720185.f3eb23e2183025fcf28dbcf8f323cc961cc45f0a.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/maxima/maxima-5.44.0-r2.ebuild sci-mathematics/maxima/maxima-5.44.0-r3.ebuild X-VCS-Directories: sci-mathematics/maxima/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: f3eb23e2183025fcf28dbcf8f323cc961cc45f0a X-VCS-Branch: master Date: Fri, 26 Mar 2021 00:57:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fdb51d43-c006-40b9-ab11-4ecf3cf4500f X-Archives-Hash: 4cf8e32ec0853ef1c2c9bd85b5dcae34 commit: f3eb23e2183025fcf28dbcf8f323cc961cc45f0a Author: Michael Orlitzky gentoo org> AuthorDate: Thu Mar 25 11:27:43 2021 +0000 Commit: Michael Orlitzky gentoo 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 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"