New ebuild with improved support for LISP compilers, fixes bug #98763.

(Portage version: 2.0.51.22-r2)

7 files changed, 34 insertions, 157 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 3eb1b2372e09..66300cac3015 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.9 2005/08/29 23:26:50 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.10 2005/09/19 04:24:15 ribosome Exp $
+
+*maxima-5.9.1-r4 (19 Sep 2005)
+
+  19 Sep 2005; Olivier Fisette <ribosome@gentoo.org>
+  -files/5.9.1-sbcl-gentoo.patch, -maxima-5.9.1-r2.ebuild,
+  -maxima-5.9.1-r3.ebuild, +maxima-5.9.1-r4.ebuild:
+  New ebuild with improved support for LISP compilers, thanks to Lucas Chiesa
+  <lucas.chiesa@gmail.com> (fixes bug #98763). Removed obsolete versions.
 
   29 Aug 2005; Olivier Fisette <ribosome@gentoo.org> maxima-5.9.1-r3.ebuild:
   Readded ~amd64 support, thanks to a patch by Matthew Kennedy
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index fd6db543e108..7147de8537af 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,11 +1,8 @@
-MD5 d18fa5be898380dc9f61ca9375a611c1 maxima-5.9.1-r2.ebuild 2632
+MD5 f71b28a44b1d63566cfe38745b2188c2 maxima-5.9.1-r4.ebuild 2333
 MD5 1a4d91430daee0b2899a662587093b22 maxima-5.9.1.ebuild 2494
-MD5 70ae78ce68ec5d8a871b57ba928d9617 maxima-5.9.1-r3.ebuild 2777
 MD5 a015b0bb08ca7c679c0c03f255ee897a ChangeLog 4370
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 65b7a40d91f001812e6d3563032ab298 files/5.9.1-sbcl-gentoo.patch 597
-MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r2 65
-MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r3 65
+MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r4 65
 MD5 6957a9bafd71a24b58e148bb2ee58257 files/50maxima-gentoo.el 346
 MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1 65
 MD5 9d2fde2c70ca34c55c220ac2e46fe463 files/maxima-5.9.1-unicode-fix.patch 9157
diff --git a/sci-mathematics/maxima/files/5.9.1-sbcl-gentoo.patch b/sci-mathematics/maxima/files/5.9.1-sbcl-gentoo.patch
deleted file mode 100644
index 327c25241fbc..000000000000
--- a/sci-mathematics/maxima/files/5.9.1-sbcl-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur maxima-5.9.1.orig/src/numerical/slatec/xerprn.lisp maxima-5.9.1/src/numerical/slatec/xerprn.lisp
---- maxima-5.9.1.orig/src/numerical/slatec/xerprn.lisp	2004-06-19 15:32:50.000000000 -0500
-+++ maxima-5.9.1/src/numerical/slatec/xerprn.lisp	2005-07-01 14:04:33.000000000 -0500
-@@ -9,7 +9,7 @@
- 
- 
- (let* ((newlin "$$"))
--  (declare (type (simple-array base-char (2)) newlin))
-+  (declare (type (simple-array character (2)) newlin))
-   (defun xerprn (prefix npref messg nwrap)
-     (declare (type f2cl-lib:integer4 nwrap npref)
-              (type (simple-array base-char (*)) messg prefix))
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.9.1-r3 b/sci-mathematics/maxima/files/digest-maxima-5.9.1-r3
deleted file mode 100644
index a849fad9cf86..000000000000
--- a/sci-mathematics/maxima/files/digest-maxima-5.9.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 659acfad1f61444cf5b38f6c28279d40 maxima-5.9.1.tar.gz 8093534
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.9.1-r2 b/sci-mathematics/maxima/files/digest-maxima-5.9.1-r4
index a849fad9cf86..a849fad9cf86 100644
--- a/sci-mathematics/maxima/files/digest-maxima-5.9.1-r2
+++ b/sci-mathematics/maxima/files/digest-maxima-5.9.1-r4
diff --git a/sci-mathematics/maxima/maxima-5.9.1-r3.ebuild b/sci-mathematics/maxima/maxima-5.9.1-r3.ebuild
deleted file mode 100644
index 59298bbbdf43..000000000000
--- a/sci-mathematics/maxima/maxima-5.9.1-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.1-r3.ebuild,v 1.2 2005/08/29 23:26:50 ribosome Exp $
-
-inherit eutils elisp-common
-
-DESCRIPTION="Free computer algebra environment, based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/maxima/${P}.tar.gz"
-
-LICENSE="GPL-2 AECA"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="cmucl clisp gcl sbcl tetex emacs auctex"
-
-DEPEND="tetex? ( virtual/tetex )
-	emacs? ( virtual/emacs )
-	auctex? ( app-emacs/auctex )
-	>=sys-apps/texinfo-4.3
-	x86? ( !clisp?  ( !sbcl? ( !gcl? ( !cmucl? ( dev-lisp/cmucl ) ) ) ) )
-	amd64? ( !gcl? ( dev-lisp/sbcl ) )
-	clisp? ( >=dev-lisp/clisp-2.33.2-r1 )
-	x86? ( cmucl? ( >=dev-lisp/cmucl-19a ) )
-	x86? ( gcl?   ( >=dev-lisp/gcl-2.6.7 ) )
-	x86? ( sbcl?  ( >=dev-lisp/sbcl-0.8.14 ) )
-	amd64? ( gcl? ( >=dev-lisp/gcl-2.6.7 ) )"
-RDEPEND=">=dev-lang/tk-8.3.3
-	 >=media-gfx/gnuplot-4.0-r1"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/maxima-${PV}-unicode-fix.patch
-	cd ${S}/interfaces/emacs/emaxima
-	epatch ${FILESDIR}/maxima-emacs.patch
-}
-
-src_compile() {
-	local myconf=""
-	if use cmucl || use clisp || use gcl || use sbcl; then
-		if use cmucl; then
-			myconf="${myconf} --enable-cmucl"
-		fi
-		if use clisp; then
-			myconf="${myconf} --enable-clisp"
-		fi
-		if use gcl; then
-			ewarn "Important - GCL must be installed with"
-			ewarn "ANSI support.  Otherwise this build will"
-			ewarn "fail.  To check this, start gcl and look"
-			ewarn "for a header like the following:"
-			ewarn "GCL (GNU Common Lisp)  2.6.5 ANSI"
-			ewarn "If you see CtL1 where ANSI is, then you"
-			ewarn "need to emerge gcl using something like"
-			ewarn "USE=\"ansi\" emerge gcl"
-			myconf="${myconf} --enable-gcl"
-		fi
-		if use sbcl; then
-			myconf="${myconf} --enable-sbcl"
-		fi
-	else
-		use x86 && myconf="${myconf} --enable-cmucl"
-		use amd64 && myconf="${myconf} --enable-sbcl"
-	fi
-
-	./configure --prefix=/usr ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	if use emacs
-	then
-		elisp-site-file-install ${FILESDIR}/50maxima-gentoo.el
-	fi
-	if use tetex
-	then
-		insinto /usr/share/texmf/tex/latex/emaxima
-		doins ${S}/interfaces/emacs/emaxima/emaxima.sty
-	fi
-
-	# Install documentation.
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS ChangeLog COPYING NEWS README*
-	dodir /usr/share/doc
-	dosym /usr/share/${PN}/${PV}/doc /usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	if use emacs
-	then
-		einfo "Running elisp-site-regen...."
-		elisp-site-regen
-	fi
-	if use tetex
-	then
-		einfo "Running mktexlsr to rebuild ls-R database...."
-		mktexlsr
-	fi
-}
-
-pkg_postrm() {
-	if use emacs
-	then
-		einfo "Running elisp-site-regen...."
-		elisp-site-regen
-	fi
-}
diff --git a/sci-mathematics/maxima/maxima-5.9.1-r2.ebuild b/sci-mathematics/maxima/maxima-5.9.1-r4.ebuild
index 31b9799149d0..e3608ae94c46 100644
--- a/sci-mathematics/maxima/maxima-5.9.1-r2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.9.1-r4.ebuild
@@ -1,78 +1,70 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.1-r2.ebuild,v 1.3 2005/08/20 18:16:23 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.1-r4.ebuild,v 1.1 2005/09/19 04:24:15 ribosome Exp $
 
 inherit eutils elisp-common
 
 DESCRIPTION="Free computer algebra environment, based on Macsyma"
 HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/maxima/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 AECA"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="cmucl clisp gcl sbcl tetex emacs auctex"
+KEYWORDS="~x86 ~amd64"
+IUSE="cmucl clisp sbcl tetex emacs auctex"
 
 DEPEND="tetex? ( virtual/tetex )
 	emacs? ( virtual/emacs )
 	auctex? ( app-emacs/auctex )
 	>=sys-apps/texinfo-4.3
-	x86? ( !clisp?	( !sbcl? ( !gcl? ( !cmucl? ( dev-lisp/cmucl ) ) ) ) )
+	!clisp? ( !sbcl? ( !cmucl? ( >=dev-lisp/gcl-2.6.7 ) ) )
+	cmucl? ( >=dev-lisp/cmucl-19a )
 	clisp? ( >=dev-lisp/clisp-2.33.2-r1 )
-	x86? ( cmucl? ( >=dev-lisp/cmucl-19a ) )
-	x86? ( gcl?	  ( >=dev-lisp/gcl-2.6.7 ) )
-	x86? ( sbcl?  ( >=dev-lisp/sbcl-0.8.14 ) )"
+	sbcl?  ( >=dev-lisp/sbcl-0.8.14 )"
 RDEPEND=">=dev-lang/tk-8.3.3
 	 >=media-gfx/gnuplot-4.0-r1"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PV}-sbcl-gentoo.patch || die
-	cd ${S}/interfaces/emacs/emaxima
-	epatch ${FILESDIR}/maxima-emacs.patch
+	epatch "${FILESDIR}"/maxima-${PV}-unicode-fix.patch
+	cd "${S}"/interfaces/emacs/emaxima
+	epatch "${FILESDIR}"/maxima-emacs.patch
 }
 
 src_compile() {
-	local myconf=""
-	if use cmucl || use clisp || use gcl || use sbcl; then
+	local myconf
+	if use cmucl || use clisp || use sbcl; then
 		if use cmucl; then
 			myconf="${myconf} --enable-cmucl"
 		fi
 		if use clisp; then
 			myconf="${myconf} --enable-clisp"
 		fi
-		if use gcl; then
-			ewarn "Important - GCL must be installed with"
-			ewarn "ANSI support.  Otherwise this build will"
-			ewarn "fail.  To check this, start gcl and look"
-			ewarn "for a header like the following:"
-			ewarn "GCL (GNU Common Lisp)  2.6.5 ANSI"
-			ewarn "If you see CtL1 where ANSI is, then you"
-			ewarn "need to emerge gcl using something like"
-			ewarn "USE=\"ansi\" emerge gcl"
-			myconf="${myconf} --enable-gcl"
-		fi
 		if use sbcl; then
 			myconf="${myconf} --enable-sbcl"
 		fi
 	else
-		myconf="${myconf} --enable-cmucl"
+		if ! built_with_use dev-lisp/gcl ansi; then
+			eerror "GCL must be installed with ANSI."
+			eerror "Try USE=\"ansi\" emerge gcl"
+			die "This package needs gcl with USE=ansi"
+		fi
+		myconf="${myconf} --enable-gcl"
 	fi
-
-	./configure --prefix=/usr ${myconf} || die
-	emake || die
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	if use emacs
 	then
-		elisp-site-file-install ${FILESDIR}/50maxima-gentoo.el
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el
 	fi
 	if use tetex
 	then
 		insinto /usr/share/texmf/tex/latex/emaxima
-		doins ${S}/interfaces/emacs/emaxima/emaxima.sty
+		doins "${S}"/interfaces/emacs/emaxima/emaxima.sty
 	fi
 
 	# Install documentation.