From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3B9631384B4 for ; Wed, 23 Dec 2015 08:20:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFA26E07FD; Wed, 23 Dec 2015 08:20:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 499F2E07FD for ; Wed, 23 Dec 2015 08:20:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F463340554 for ; Wed, 23 Dec 2015 08:20:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1172A0E for ; Wed, 23 Dec 2015 08:20:11 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1450858805.e88abf1da79f111c81842732f9dcb824d336573b.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/maxima/files/emacs-0.patch sci-mathematics/maxima/files/wish-2.patch sci-mathematics/maxima/maxima-5.37.3-r2.ebuild sci-mathematics/maxima/maxima-5.37.3-r3.ebuild X-VCS-Directories: sci-mathematics/maxima/ sci-mathematics/maxima/files/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: e88abf1da79f111c81842732f9dcb824d336573b X-VCS-Branch: master Date: Wed, 23 Dec 2015 08:20:11 +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-Archives-Salt: 527fbbea-f22d-44d1-bd0b-250f52d0ada7 X-Archives-Hash: da7606d3248a10d9882ca30caf95d1dd commit: e88abf1da79f111c81842732f9dcb824d336573b Author: Ulrich Müller gentoo org> AuthorDate: Wed Dec 23 08:13:20 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Dec 23 08:20:05 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88abf1d sci-mathematics/maxima: Update Emacs support. Consolidate "emacs" and "latex" USE flags. Remove the non-functional "xemacs" flag. Add a configure option to disable Emacs support in the upstream build system. Bug: 448242 Package-Manager: portage-2.2.26 sci-mathematics/maxima/files/emacs-0.patch | 32 +++++++++++++++ sci-mathematics/maxima/files/wish-2.patch | 26 ++++++++++++ ...ma-5.37.3-r2.ebuild => maxima-5.37.3-r3.ebuild} | 46 +++++++++++----------- 3 files changed, 81 insertions(+), 23 deletions(-) diff --git a/sci-mathematics/maxima/files/emacs-0.patch b/sci-mathematics/maxima/files/emacs-0.patch new file mode 100644 index 0000000..8c84149 --- /dev/null +++ b/sci-mathematics/maxima/files/emacs-0.patch @@ -0,0 +1,32 @@ +--- maxima-5.37.3.orig/configure.ac ++++ maxima-5.37.3/configure.ac +@@ -513,6 +513,17 @@ + fi + fi + ++AC_ARG_ENABLE(emacs, ++ [ --enable-emacs Emacs support], ++ [case "${enableval}" in ++ yes) enable_emacs=true ;; ++ no) enable_emacs=false ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-emacs) ;; ++ esac], ++ [enable_emacs=true]) ++ ++AM_CONDITIONAL(WANT_EMACS, test x$enable_emacs = xtrue) ++ + dnl xgettext + AC_ARG_ENABLE(gettext, + [ --enable-gettext Locale support], +--- maxima-5.37.3.orig/interfaces/Makefile.am ++++ maxima-5.37.3/interfaces/Makefile.am +@@ -1,5 +1,8 @@ ++if WANT_EMACS ++ MAYBE_EMACS = emacs ++endif + if WANT_TK + MAYBE_XMAXIMA = xmaxima + endif +-SUBDIRS = emacs $(MAYBE_XMAXIMA) ++SUBDIRS = $(MAYBE_EMACS) $(MAYBE_XMAXIMA) + EXTRA_DIST = bin/xmaxima.iss diff --git a/sci-mathematics/maxima/files/wish-2.patch b/sci-mathematics/maxima/files/wish-2.patch new file mode 100644 index 0000000..5942733 --- /dev/null +++ b/sci-mathematics/maxima/files/wish-2.patch @@ -0,0 +1,26 @@ +--- maxima-5.37.3.orig/configure.ac ++++ maxima-5.37.3/configure.ac +@@ -991,6 +991,11 @@ + [ --with-wish= Use for Tk wish shell (default wish)], +- [WISH="${withval}"], +- [WISH="wish"]) ++ [], ++ [with_wish="wish"]) ++case "${with_wish}" in ++ no) WISH="none" ;; ++ yes) WISH="wish" ;; ++ *) WISH="${with_wish}" ;; ++esac + AC_SUBST(WISH) +- ++AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno) + +--- maxima-5.37.3.orig/interfaces/Makefile.am ++++ maxima-5.37.3/interfaces/Makefile.am +@@ -1,2 +1,5 @@ +-SUBDIRS = emacs xmaxima ++if WANT_TK ++ MAYBE_XMAXIMA = xmaxima ++endif ++SUBDIRS = emacs $(MAYBE_XMAXIMA) + EXTRA_DIST = bin/xmaxima.iss diff --git a/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild b/sci-mathematics/maxima/maxima-5.37.3-r3.ebuild similarity index 86% rename from sci-mathematics/maxima/maxima-5.37.3-r2.ebuild rename to sci-mathematics/maxima/maxima-5.37.3-r3.ebuild index 3afffbf..7c1c8e6 100644 --- a/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild +++ b/sci-mathematics/maxima/maxima-5.37.3-r3.ebuild @@ -23,7 +23,7 @@ CONF_FLAG=( . . . ecl ccl . ) # patch file version; . - no patch PATCH_V=( 1 1 . 2 2 1 ) -IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}" +IUSE="emacs tk nls unicode X ${LISPS[*]}" # Languages LANGS="es pt pt_BR" @@ -36,13 +36,11 @@ RDEPEND="!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) - latex? ( virtual/latex-base ) emacs? ( virtual/emacs - latex? ( app-emacs/auctex - app-text/ghostscript-gpl - dev-texlive/texlive-latexrecommended ) ) - xemacs? ( app-editors/xemacs - latex? ( app-xemacs/auctex ) )" + virtual/latex-base + app-emacs/auctex + app-text/ghostscript-gpl + dev-texlive/texlive-latexrecommended )" # generating lisp dependencies depends() { @@ -97,7 +95,7 @@ pkg_setup() { src_prepare() { local n PATCHES v - PATCHES=( rmaxima-0 wish-1 xdg-utils-0 db-0 ) + PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-0 db-0 ) n=${#PATCHES[*]} for ((n--; n >= 0; n--)); do @@ -140,7 +138,10 @@ src_configure() { done fi - econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN} + econf ${CONFS} \ + $(use_with tk wish) \ + $(use_enable emacs) \ + --with-lispdir="${EPREFIX}/${SITELISP}/${PN}" } src_compile() { @@ -156,13 +157,6 @@ src_install() { /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \ "Science;Math;Education" - rm -f "${ED}"/${SITELISP}/${PN}/emaxima.sty - - if use latex; then - insinto ${TEXMF}/tex/latex/emaxima - doins interfaces/emacs/emaxima/emaxima.sty - fi - # 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 @@ -173,12 +167,14 @@ src_install() { 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 - else - # remove any emacs files installed by the build system - rm -rf "${ED}"/usr/share/emacs fi # if we use ecls, build an ecls library for maxima @@ -190,11 +186,15 @@ src_install() { } pkg_postinst() { - use emacs && elisp-site-regen - use latex && mktexlsr + if use emacs; then + elisp-site-regen + mktexlsr + fi } pkg_postrm() { - use emacs && elisp-site-regen - use latex && mktexlsr + if use emacs; then + lisp-site-regen + mktexlsr + fi }