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 D31641384B4 for ; Fri, 27 Nov 2015 12:17:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F1E621C00D; Fri, 27 Nov 2015 12:17:55 +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 C093021C00D for ; Fri, 27 Nov 2015 12:17:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D0E53404B1 for ; Fri, 27 Nov 2015 12:17:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1724C612 for ; Fri, 27 Nov 2015 12:17:46 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1448626296.ad0a006bbf3a9460f3c3d74190e763bd3fcea1af.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/files/, sci-mathematics/maxima/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/maxima/Manifest sci-mathematics/maxima/files/clozurecl-1.patch sci-mathematics/maxima/maxima-5.36.1.ebuild sci-mathematics/maxima/maxima-5.37.3.ebuild X-VCS-Directories: sci-mathematics/maxima/ sci-mathematics/maxima/files/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: ad0a006bbf3a9460f3c3d74190e763bd3fcea1af X-VCS-Branch: master Date: Fri, 27 Nov 2015 12:17:46 +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: f2b19baf-203d-4771-beff-bec9303a739e X-Archives-Hash: ce0880e0cd49b9b4f5640b9ed1af785e commit: ad0a006bbf3a9460f3c3d74190e763bd3fcea1af Author: Andrey Grozin gentoo org> AuthorDate: Fri Nov 27 12:09:59 2015 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Fri Nov 27 12:11:36 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad0a006b sci-mathematics/maxima: cleaning old Package-Manager: portage-2.2.25 sci-mathematics/maxima/Manifest | 1 - sci-mathematics/maxima/files/clozurecl-1.patch | 28 ---- sci-mathematics/maxima/maxima-5.36.1.ebuild | 190 ------------------------- sci-mathematics/maxima/maxima-5.37.3.ebuild | 190 ------------------------- 4 files changed, 409 deletions(-) diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest index 4465bce..321acdc 100644 --- a/sci-mathematics/maxima/Manifest +++ b/sci-mathematics/maxima/Manifest @@ -1,3 +1,2 @@ DIST maxima-5.34.1.tar.gz 29469851 SHA256 20ca416ca912c8d3d99299f2ef45342a1beb2f077cf501c6a647de46bfdb89b7 SHA512 24a9ce0d2bfb0fa107460bbeec561869f9d3f2ce2623e39ab16b810dbf2712981bbf98ceee9c30f4e70fdec7f918a7743b5fb8cf26b67313e1d367dd8f2a1823 WHIRLPOOL 0f59cfe14391686a543027bb5cab8669439d0e36b016924872662f61e36cf05663480f8a3f942d7deccbe39ec7f45ed77deeb8a3c84241189ac0f1993537c47a -DIST maxima-5.36.1.tar.gz 29615673 SHA256 400bf83000b84d280d75e200e078582fe44f23220824562cc06c589d8a993974 SHA512 10e090230ab408777a1145ad90daef6bf237ba38ae31a654ba4d464e7a27e1f48baac5202ce8fb39e4c04ec9a6c9916ac83a58bd071b676ea5a989ea7db87d4c WHIRLPOOL ee7738085ae9e5b156b89afbf724b3ae5ef70b74550bee43cf3ab763f569d5ac51ea9c0e5aad67070f4b71f480b079aad8e4fd44ded34525a1f84cbeeb2d28b0 DIST maxima-5.37.3.tar.gz 29964644 SHA256 8bd5dcd672f37ea752385475fc64f8c87dfa29bbe34766cbcb87b1f63dfb5934 SHA512 a337afdc779abc88297e7dadf8af949da881c91a237e85ed654046c98692f2446c0b2ddb8c81b637cb7a35dd3b712832aadc5dedcaa8b681496dae4835c9d0f1 WHIRLPOOL d24eeb7f39f88b9f542e28db28b8f249b1badc059fe744a83209b102b8f776131e4b2f91c28949f4f6de8323f163cb0a6be9bafc3c0ef058a73e9b543622e976 diff --git a/sci-mathematics/maxima/files/clozurecl-1.patch b/sci-mathematics/maxima/files/clozurecl-1.patch deleted file mode 100644 index 07203a2..0000000 --- a/sci-mathematics/maxima/files/clozurecl-1.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -r -U1 maxima-5.35.1.orig/configure.ac maxima-5.35.1/configure.ac ---- maxima-5.35.1.orig/configure.ac 2014-12-13 06:44:51.000000000 +0600 -+++ maxima-5.35.1/configure.ac 2014-12-20 20:43:04.713305777 +0600 -@@ -379,3 +379,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.35.1.orig/src/Makefile.am maxima-5.35.1/src/Makefile.am ---- maxima-5.35.1.orig/src/Makefile.am 2014-09-24 00:02:16.000000000 +0700 -+++ maxima-5.35.1/src/Makefile.am 2014-12-20 20:43:04.713305777 +0600 -@@ -359,3 +359,3 @@ - --EXECUTEOPENMCL = $(OPENMCL_NAME) -e -+EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e - BUILT_FILES += $(OPENMCL_MAXIMA) -Только в maxima-5.35.1/src: Makefile.am.orig -diff -r -U1 maxima-5.35.1.orig/src/maxima.in maxima-5.35.1/src/maxima.in ---- maxima-5.35.1.orig/src/maxima.in 2014-12-03 04:17:05.000000000 +0600 -+++ maxima-5.35.1/src/maxima.in 2014-12-20 20:43:04.713305777 +0600 -@@ -185,5 +185,5 @@ - if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then -- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" -+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" - else -- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" -+ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9" - fi diff --git a/sci-mathematics/maxima/maxima-5.36.1.ebuild b/sci-mathematics/maxima/maxima-5.36.1.ebuild deleted file mode 100644 index 79aa856..0000000 --- a/sci-mathematics/maxima/maxima-5.36.1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools elisp-common eutils - -DESCRIPTION="Free computer algebra environment based on Macsyma" -HOMEPAGE="http://maxima.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" - -# Supported lisps -LISPS=( sbcl cmucl gcl ecls clozurecl clisp ) -# supports readline: . - no, y - yes -SUPP_RL=( . . y . . y ) -# . - just --enable-, - --enable- -CONF_FLAG=( . . . ecl ccl . ) -# patch file version; . - no patch -PATCH_V=( 0 0 . 1 1 0 ) - -IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}" - -# Languages -LANGS="es pt pt_BR" -for lang in ${LANGS}; do - IUSE="${IUSE} linguas_${lang}" -done - -RDEPEND="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 ) ) - xemacs? ( app-editors/xemacs - latex? ( app-emacs/auctex ) )" - -PDEPEND="emacs? ( app-emacs/imaxima )" - -# 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}) )" - if (( ${n} > 0 )); then - DEF_DEP="${DEF_DEP} !${LISP}? ( " - fi -done - -# default lisp -if use arm; then - DEF_LISP=2 # gcl -else - DEF_LISP=0 # sbcl -fi - -DEF_DEP="${DEF_DEP} `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 - ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default" - NLISPS=${DEF_LISP} - fi -} - -src_prepare() { - local n PATCHES v - PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 ) - - n=${#PATCHES[*]} - for ((n--; n >= 0; n--)); do - epatch "${FILESDIR}"/${PATCHES[${n}]}.patch - done - - n=${#LISPS[*]} - for ((n--; n >= 0; n--)); do - v=${PATCH_V[${n}]} - if [ "${v}" != "." ]; then - epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch - fi - done - - # 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 "linguas_${lang}"; then - CONFS="${CONFS} --enable-lang-${lang}" - use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8" - fi - done - fi - - econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN} -} - -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" - - 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 - doins AUTHORS COPYING README README.lisps || die - dodir /usr/share/doc - dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die - - if use emacs; then - elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die - 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() { - use emacs && elisp-site-regen - use latex && mktexlsr -} - -pkg_postrm() { - use emacs && elisp-site-regen - use latex && mktexlsr -} diff --git a/sci-mathematics/maxima/maxima-5.37.3.ebuild b/sci-mathematics/maxima/maxima-5.37.3.ebuild deleted file mode 100644 index 8f2f164..0000000 --- a/sci-mathematics/maxima/maxima-5.37.3.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools elisp-common eutils - -DESCRIPTION="Free computer algebra environment based on Macsyma" -HOMEPAGE="http://maxima.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" - -# Supported lisps -LISPS=( sbcl cmucl gcl ecls clozurecl clisp ) -# supports readline: . - no, y - yes -SUPP_RL=( . . y . . y ) -# . - just --enable-, - --enable- -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[*]}" - -# Languages -LANGS="es pt pt_BR" -for lang in ${LANGS}; do - IUSE="${IUSE} linguas_${lang}" -done - -RDEPEND="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 ) ) - xemacs? ( app-editors/xemacs - latex? ( app-emacs/auctex ) )" - -PDEPEND="emacs? ( app-emacs/imaxima )" - -# 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}) )" - if (( ${n} > 0 )); then - DEF_DEP="${DEF_DEP} !${LISP}? ( " - fi -done - -# default lisp -if use arm; then - DEF_LISP=2 # gcl -else - DEF_LISP=0 # sbcl -fi - -DEF_DEP="${DEF_DEP} `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 - ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default" - NLISPS=${DEF_LISP} - fi -} - -src_prepare() { - local n PATCHES v - PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 db-0 ) - - n=${#PATCHES[*]} - for ((n--; n >= 0; n--)); do - epatch "${FILESDIR}"/${PATCHES[${n}]}.patch - done - - n=${#LISPS[*]} - for ((n--; n >= 0; n--)); do - v=${PATCH_V[${n}]} - if [ "${v}" != "." ]; then - epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch - fi - done - - # 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 "linguas_${lang}"; then - CONFS="${CONFS} --enable-lang-${lang}" - use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8" - fi - done - fi - - econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN} -} - -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" - - 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 - doins AUTHORS COPYING README README.lisps || die - dodir /usr/share/doc - dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die - - if use emacs; then - elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die - 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() { - use emacs && elisp-site-regen - use latex && mktexlsr -} - -pkg_postrm() { - use emacs && elisp-site-regen - use latex && mktexlsr -}