public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-mathematics/maxima: maxima-5.13.0-r1.ebuild ChangeLog maxima-5.14.0.ebuild
@ 2008-01-29 16:50 Sebastien Fabbro (bicatali)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2008-01-29 16:50 UTC (permalink / raw
  To: gentoo-commits

bicatali    08/01/29 16:50:39

  Modified:             maxima-5.13.0-r1.ebuild ChangeLog
  Added:                maxima-5.14.0.ebuild
  Log:
  Version bump. Now supports again multiple lisp simultaneously. Thanks much to Andrey Grozin <A.G.Grozin@inp.nsk.su> to update the ebuild and maintain it in the science overlay.
  (Portage version: 2.1.4)

Revision  Changes    Path
1.10                 sci-mathematics/maxima/maxima-5.13.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild?r1=1.9&r2=1.10

Index: maxima-5.13.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maxima-5.13.0-r1.ebuild	8 Jan 2008 01:23:19 -0000	1.9
+++ maxima-5.13.0-r1.ebuild	29 Jan 2008 16:50:38 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild,v 1.9 2008/01/08 01:23:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild,v 1.10 2008/01/29 16:50:38 bicatali Exp $
 
 inherit eutils elisp-common
 
@@ -22,14 +22,14 @@
 				app-text/ptex ) )
 	emacs? ( virtual/emacs
 		 latex? ( || ( app-emacs/auctex app-xemacs/auctex ) ) )
-	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
+	sbcl? ( <dev-lisp/sbcl-1.0.12 app-misc/rlwrap )
 	!sbcl? (
 		clisp? ( dev-lisp/clisp )
 		!clisp? (
 			cmucl? ( >=dev-lisp/cmucl-19a app-misc/rlwrap )
 			!cmucl? (
 				gcl? ( dev-lisp/gcl )
-				!gcl? ( dev-lisp/sbcl app-misc/rlwrap )
+				!gcl? ( <dev-lisp/sbcl-1.0.12 app-misc/rlwrap )
 			)
 		)
 	)



1.47                 sci-mathematics/maxima/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/ChangeLog?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/ChangeLog?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/ChangeLog?r1=1.46&r2=1.47

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog	8 Jan 2008 01:23:19 -0000	1.46
+++ ChangeLog	29 Jan 2008 16:50:38 -0000	1.47
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.46 2008/01/08 01:23:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.47 2008/01/29 16:50:38 bicatali Exp $
+
+*maxima-5.14.0 (29 Jan 2008)
+
+  29 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/maxima-5.14.0-xdg-utils.patch, +maxima-5.14.0.ebuild:
+  Version bump.  Now supports again multiple lisp simultaneously.
+  Thanks much to Andrey Grozin <A.G.Grozin@inp.nsk.su> to 
+  update the ebuild and maintain it in the science overlay.
 
   08 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
   -files/maxima-emacs.patch, -maxima-5.9.1.ebuild, maxima-5.13.0-r1.ebuild:



1.1                  sci-mathematics/maxima/maxima-5.14.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild?rev=1.1&content-type=text/plain

Index: maxima-5.14.0.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild,v 1.1 2008/01/29 16:50:38 bicatali Exp $
inherit eutils elisp-common

DESCRIPTION="Free computer algebra environment based on Macsyma"
HOMEPAGE="http://maxima.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

LICENSE="GPL-2 AECA"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"

# Supported lisps with readline
SUPP_RL="gcl clisp"
# Supported lisps without readline
SUPP_NORL="cmucl sbcl"
SUPP_LISPS="${SUPP_RL} ${SUPP_NORL}"
# Default lisp if none selected
DEF_LISP="sbcl"

IUSE="latex emacs tk nls unicode X ${SUPP_LISPS} ${IUSE}"

# Languages
LANGS="es pt pt_BR"
for lang in ${LANGS}; do
	IUSE="${IUSE} linguas_${lang}"
done

# tetex>=3, so no use of virtual/latex-base (bug #203558)
RDEPEND="X? ( x11-misc/xdg-utils
			  sci-visualization/gnuplot
			  tk? ( dev-lang/tk ) )
	latex? ( || ( dev-texlive/texlive-latexrecommended
				  >=app-text/tetex-3
				  app-text/ptex ) )
	emacs? ( virtual/emacs latex? ( app-emacs/auctex ) )
	xemacs? ( virtual/xemacs latex? ( app-xemacs/auctex ) )"

# create lisp dependencies
for LISP in ${SUPP_LISPS}; do
	RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )"
	DEF_DEP="${DEF_DEP} !${LISP}? ( "
done
for LISP in ${SUPP_NORL}; do
	RDEPEND="${RDEPEND} ${LISP}? ( app-misc/rlwrap )"
	[[ ${LISP} = ${DEF_LISP} ]] && \
		DEF_DEP="${DEF_DEP} app-misc/rlwrap"
done
for LISP in ${SUPP_LISPS}; do
	DEF_DEP="${DEF_DEP} )"
done

# nasty hack for sbcl while bug #203748 is not fixed
RDEPEND="${RDEPEND//dev-lisp\/sbcl/<dev-lisp/sbcl-1.0.12}"

RDEPEND="${RDEPEND}
	${DEF_DEP}"

DEPEND="${RDEPEND}
	sys-apps/texinfo"

pkg_setup() {
	LISPS=""

	for LISP in ${SUPP_LISPS}; do
		use ${LISP} && LISPS="${LISPS} ${LISP}"
	done

	if [ -z "${LISPS}" ]; then
		ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default"
		LISPS="${DEF_LISP}"
	fi

	RL=""

	for LISP in ${SUPP_NORL}; do
		use ${LISP} && RL="yes"
	done

	if use gcl; then
		if ! built_with_use dev-lisp/gcl ansi; then
			eerror "gcl must be emerged with the USE flag ansi"
			die "This package needs gcl with USE=ansi"
		fi
	fi

	# Calculating MAXIMA_TEXMFDIR
	if use latex; then
		local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)"
		local TEXMFCONFIGFILE="$(kpsewhich texmf.cnf)"

		if [ -z "${TEXMFPATH}" ]; then
			eerror "You haven't defined the TEXMFSITE variable in your TeX config."
			eerror "Please do so in the file ${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf}"
			die "Define TEXMFSITE in TeX configuration!"
		else
			# go through the colon separated list of directories
			# (maybe only one) provided in the variable
			# TEXMFPATH (generated from TEXMFSITE from TeX's config)
			# and choose only the first entry.
			# All entries are separated by colons, even when defined
			# with semi-colons, kpsewhich changes
			# the output to a generic format, so IFS has to be redefined.
			local IFS="${IFS}:"

			for strippedpath in ${TEXMFPATH}; do
				if [ -d ${strippedpath} ]; then
					MAXIMA_TEXMFDIR="${strippedpath}"
					break
				fi
			done

			# verify if an existing path was chosen to prevent from
			# installing into the wrong directory
			if [ -z ${MAXIMA_TEXMFDIR} ]; then
				eerror "TEXMFSITE does not contain any existing directory."
				eerror "Please define an existing directory in your TeX config file"
				eerror "${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf} or create at least one of the there specified directories"
				die "TEXMFSITE variable did not contain an existing directory"
			fi
		fi
	fi

	if use X && ! built_with_use sci-visualization/gnuplot gd; then
		elog "To benefit full plotting capability of maxima,"
		elog "enable the gd USE flag for sci-visualization/gnuplot"
		elog "Then re-emerge maxima"
		epause 5
	fi
}

src_unpack() {
	unpack ${A}
	# use xdg-open to view ps, pdf
	epatch "${FILESDIR}"/${P}-xdg-utils.patch
	# remove rmaxima if neither cmucl nor sbcl
	if [ -z "${RL}" ]; then
		sed -i \
			-e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
			"${S}"/src/Makefile.in \
			|| die "sed for rmaxima failed"
	fi
}

src_compile() {
	local myconf=""
	for LISP in ${LISPS}; do
		myconf="${myconf} --enable-${LISP}"
	done

	# remove xmaxima if no tk
	if use tk; then
		myconf="${myconf} --with-wish=wish"
	else
		myconf="${myconf} --with-wish=none"
		sed -i \
			-e '/^SUBDIRS/s/xmaxima//' \
			interfaces/Makefile.in || die "sed for tk failed"
	fi

	# enable existing translated doc
	if use nls; then
		for lang in ${LANGS}; do
			if use "linguas_${lang}"; then
				myconf="${myconf} --enable-lang-${lang}"
				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
			fi
		done
	fi

	econf ${myconf} || die "econf failed"
	emake || die "emake failed"
}

src_install() {
	einstall emacsdir="${D}${SITELISP}/${PN}" || die "einstall failed"

	use tk && make_desktop_entry xmaxima xmaxima \
		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
		"Science;Math;Education"

	use emacs && \
		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el

	if use latex; then
		insinto "${MAXIMA_TEXMFDIR}"/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
	insinto /usr/share/${PN}/${PV}/doc
	doins AUTHORS COPYING README README.lisps || die
	dodir /usr/share/doc
	dosym /usr/share/${PN}/${PV}/doc /usr/share/doc/${PF}
}

pkg_preinst() {
	# some lisps do not read compress info files (bug #176411)
	for infofile in "${D}"/usr/share/info/*.bz2 ; do
		bunzip2 "${infofile}"
	done
	for infofile in "${D}"/usr/share/info/*.gz ; do
		gunzip "${infofile}"
	done
}

pkg_postinst() {
	use emacs && elisp-site-regen
	use latex && mktexlsr
}

pkg_postrm() {
	use emacs && elisp-site-regen
}



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-mathematics/maxima: maxima-5.13.0-r1.ebuild ChangeLog maxima-5.14.0.ebuild
@ 2008-02-07 13:22 Sebastien Fabbro (bicatali)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2008-02-07 13:22 UTC (permalink / raw
  To: gentoo-commits

bicatali    08/02/07 13:22:45

  Modified:             maxima-5.13.0-r1.ebuild ChangeLog
                        maxima-5.14.0.ebuild
  Log:
  Do not load host lisp init files, see bug #203748. Join xdg patches.
  (Portage version: 2.1.4.1)

Revision  Changes    Path
1.11                 sci-mathematics/maxima/maxima-5.13.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild?r1=1.10&r2=1.11

Index: maxima-5.13.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maxima-5.13.0-r1.ebuild	29 Jan 2008 16:50:38 -0000	1.10
+++ maxima-5.13.0-r1.ebuild	7 Feb 2008 13:22:45 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild,v 1.10 2008/01/29 16:50:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild,v 1.11 2008/02/07 13:22:45 bicatali Exp $
 
 inherit eutils elisp-common
 
@@ -22,14 +22,14 @@
 				app-text/ptex ) )
 	emacs? ( virtual/emacs
 		 latex? ( || ( app-emacs/auctex app-xemacs/auctex ) ) )
-	sbcl? ( <dev-lisp/sbcl-1.0.12 app-misc/rlwrap )
+	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
 	!sbcl? (
 		clisp? ( dev-lisp/clisp )
 		!clisp? (
 			cmucl? ( >=dev-lisp/cmucl-19a app-misc/rlwrap )
 			!cmucl? (
 				gcl? ( dev-lisp/gcl )
-				!gcl? ( <dev-lisp/sbcl-1.0.12 app-misc/rlwrap )
+				!gcl? ( dev-lisp/sbcl app-misc/rlwrap )
 			)
 		)
 	)
@@ -112,13 +112,16 @@
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${P}-xdg-utils.patch
+	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
+	# avoid bugs and warning at init (see bug #203748)
+	epatch "${FILESDIR}"/${PN}-no-init-files.patch
 	# remove rmaxima if neither cmucl nor sbcl
 	if [[ ${MAXIMA_LISP} != cmucl ]] || [[ ${MAXIMA_LISP} != sbcl ]]; then
 		sed -i \
 			-e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
-			"${S}"/src/Makefile.in \
+			src/Makefile.in \
 			|| die "sed for rmaxima failed"
 	fi
 }



1.49                 sci-mathematics/maxima/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/ChangeLog?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/ChangeLog?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/ChangeLog?r1=1.48&r2=1.49

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog	2 Feb 2008 15:39:31 -0000	1.48
+++ ChangeLog	7 Feb 2008 13:22:45 -0000	1.49
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.48 2008/02/02 15:39:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.49 2008/02/07 13:22:45 bicatali Exp $
+
+  07 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/maxima-5.13.0-xdg-utils.patch,
+  -files/maxima-5.14.0-xdg-utils.patch, +files/maxima-no-init-files.patch,
+  +files/maxima-xdg-utils.patch, maxima-5.13.0-r1.ebuild,
+  maxima-5.14.0.ebuild:
+  Do not load host lisp init files, see bug #203748. Join xdg patches.
 
   02 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org> maxima-5.14.0.ebuild:
   Fixed default lisp dependency (bug #208515)



1.4                  sci-mathematics/maxima/maxima-5.14.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild?r1=1.3&r2=1.4

Index: maxima-5.14.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maxima-5.14.0.ebuild	2 Feb 2008 15:39:31 -0000	1.3
+++ maxima-5.14.0.ebuild	7 Feb 2008 13:22:45 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild,v 1.3 2008/02/02 15:39:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild,v 1.4 2008/02/07 13:22:45 bicatali Exp $
 inherit eutils elisp-common
 
 DESCRIPTION="Free computer algebra environment based on Macsyma"
@@ -52,9 +52,6 @@
 	DEF_DEP="${DEF_DEP} )"
 done
 
-# nasty hack for sbcl while bug #203748 is not fixed
-RDEPEND="${RDEPEND//dev-lisp\/sbcl/<dev-lisp/sbcl-1.0.12}"
-
 RDEPEND="${RDEPEND}
 	${DEF_DEP}"
 
@@ -133,8 +130,10 @@
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${P}-xdg-utils.patch
+	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
+	epatch "${FILESDIR}"/${PN}-no-init-files.patch
 	# remove rmaxima if neither cmucl nor sbcl
 	if [ -z "${RL}" ]; then
 		sed -i \



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-02-07 13:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-29 16:50 [gentoo-commits] gentoo-x86 commit in sci-mathematics/maxima: maxima-5.13.0-r1.ebuild ChangeLog maxima-5.14.0.ebuild Sebastien Fabbro (bicatali)
  -- strict thread matches above, loose matches on Subject: below --
2008-02-07 13:22 Sebastien Fabbro (bicatali)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox