Enabling only one lisp. Priority are: 1.sbcl, 2.clisp, 3.

Package-Manager: portage-2.1.3.9

3 files changed, 48 insertions, 37 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 9c81a08af5ad..2fc79624d676 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.33 2007/09/14 08:39:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.34 2007/09/20 11:13:42 bicatali Exp $
+
+  20 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org> maxima-5.13.0.ebuild:
+  Enabling only one lisp. Priority are: 1.sbcl, 2.clisp, 3.
+  cmucl, 4. gcl, since gcl-2.6.7 is fairly unstable for maxima. Hopefully
+  taking care of bug #192613. General cleaning and commenting, removed
+  useless eautoreconf.
 
   14 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org> maxima-5.9.1.ebuild:
   fixed a doc link (bug #182643)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 84139c99b463..6040410a24a7 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -28,18 +28,18 @@ EBUILD maxima-5.11.0-r2.ebuild 5224 RMD160 5c818c91d34191f46d0bf0132bff2caacf480
 MD5 0b8dce2d4c1e5b477b07b0d439e09b04 maxima-5.11.0-r2.ebuild 5224
 RMD160 5c818c91d34191f46d0bf0132bff2caacf480f58 maxima-5.11.0-r2.ebuild 5224
 SHA256 1013bdc9df10b895dbed820013e18f6d52636f39027224a7e17239fa277a41e5 maxima-5.11.0-r2.ebuild 5224
-EBUILD maxima-5.13.0.ebuild 5139 RMD160 91c025002a0207a82e1256602f46588089fe2ae4 SHA1 7740968a1073f023b0ff566b59b12c549e25d2fd SHA256 3535e1a46d3b460892db5c6b745f3bd57883a37a164812a98f8e5441699185de
-MD5 caa1d227bb042a2d2b16b5792cccffeb maxima-5.13.0.ebuild 5139
-RMD160 91c025002a0207a82e1256602f46588089fe2ae4 maxima-5.13.0.ebuild 5139
-SHA256 3535e1a46d3b460892db5c6b745f3bd57883a37a164812a98f8e5441699185de maxima-5.13.0.ebuild 5139
+EBUILD maxima-5.13.0.ebuild 5391 RMD160 9762e2abc3731d8d432b99601a104656bd6b4e53 SHA1 9cf7ff8ec860d5b9bdc2883a0f72017b820ce0e8 SHA256 c6ecbb82afaee6a191de49022e57e6d27a9f8f121f5fd9142786fd86768148ee
+MD5 740c2106ceadd52506e8ab9f26506495 maxima-5.13.0.ebuild 5391
+RMD160 9762e2abc3731d8d432b99601a104656bd6b4e53 maxima-5.13.0.ebuild 5391
+SHA256 c6ecbb82afaee6a191de49022e57e6d27a9f8f121f5fd9142786fd86768148ee maxima-5.13.0.ebuild 5391
 EBUILD maxima-5.9.1.ebuild 2587 RMD160 2a0eb043f7a62a9c9f7fb88691df18cbf4cca663 SHA1 506a95b8edde59d80b820ec270e5a1332a8737f5 SHA256 06686d8d425575df0998727e59373215e10f732595452ab6a76af228925f5da5
 MD5 c3060fe6f3d8e9936f7167f10ea35369 maxima-5.9.1.ebuild 2587
 RMD160 2a0eb043f7a62a9c9f7fb88691df18cbf4cca663 maxima-5.9.1.ebuild 2587
 SHA256 06686d8d425575df0998727e59373215e10f732595452ab6a76af228925f5da5 maxima-5.9.1.ebuild 2587
-MISC ChangeLog 9896 RMD160 28bcf8f859947283200f58c9073e2c7f46f64850 SHA1 9aa60927fddfb9c9a50cfb3f65d04aba1b97a995 SHA256 b8bddb2ed44ef5323870426764bd0b3a9953b329def4be791d1ae21ee02575d1
-MD5 c41ba3d9857be5cd2efaadcb9590e3ab ChangeLog 9896
-RMD160 28bcf8f859947283200f58c9073e2c7f46f64850 ChangeLog 9896
-SHA256 b8bddb2ed44ef5323870426764bd0b3a9953b329def4be791d1ae21ee02575d1 ChangeLog 9896
+MISC ChangeLog 10202 RMD160 5f0b58dfe768c9cb380102e9d798f8bbefa02c27 SHA1 425c4bf6e5f5b63bae9ec8e605b0c22c24351d09 SHA256 b052f748c0c7ac7de082c0bb668400a6a3e2099ae0cfdccb8f214581dc3ea175
+MD5 4a4434468f243335004ef886f118951d ChangeLog 10202
+RMD160 5f0b58dfe768c9cb380102e9d798f8bbefa02c27 ChangeLog 10202
+SHA256 b052f748c0c7ac7de082c0bb668400a6a3e2099ae0cfdccb8f214581dc3ea175 ChangeLog 10202
 MISC metadata.xml 737 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 SHA1 bff378e387662ce5e4c4168c74ee7ff1493c41a4 SHA256 9deb0b30538b6d35c0877384b97620eda2dde0bf3b4c702ccdadb007e868daef
 MD5 747fd88897ef9ae5002fa891864f42aa metadata.xml 737
 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 metadata.xml 737
@@ -56,7 +56,7 @@ SHA256 c9f64acc636ed728a8c03269f4e58f16cb6b335b25c49fc4f7e308d06629d687 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG7DLi1ycZbhPLE2ARAnh+AKCJ79pk3z41OSuZ9scJiY+ODhIeRACeM7zg
-i5rU5SsO+LS1aXqCvAbWXwA=
-=vJ4d
+iD8DBQFG8lXs1ycZbhPLE2ARApCEAKCHrU/2Har5Es8r+mtIqqwmQw6FpgCfeY2l
+6cQn6ccoOdeqOK/fN7AGCdk=
+=AqIy
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/maxima/maxima-5.13.0.ebuild b/sci-mathematics/maxima/maxima-5.13.0.ebuild
index bccbcae90f30..79b07e815712 100644
--- a/sci-mathematics/maxima/maxima-5.13.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.13.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 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.ebuild,v 1.4 2007/09/15 19:30:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0.ebuild,v 1.5 2007/09/20 11:13:42 bicatali Exp $
 
-inherit eutils elisp-common autotools
+inherit eutils elisp-common
 
 DESCRIPTION="Free computer algebra environment based on Macsyma"
 HOMEPAGE="http://maxima.sourceforge.net/"
@@ -34,6 +34,8 @@ for lang in ${LANGS}; do
 	IUSE="${IUSE} linguas_${lang}"
 done
 
+RESTRICT="clisp? ( strip )"
+
 pkg_setup() {
 	# Don't install in the main tree, as this may cause file collisions
 	if use tetex; then
@@ -68,20 +70,28 @@ pkg_setup() {
 		fi
 	fi
 
-	if ! built_with_use -a sci-visualization/gnuplot gd; then
+	if ! built_with_use sci-visualization/gnuplot gd; then
 		elog "To benefit full plotting capability of maxima,"
 		elog "enable the gd USE flag enabled for sci-visualization/gnuplot"
 		elog "Then re-emerge maxima"
 		epause 5
 	fi
 
-	# enable gcl if no other lisp selected
-	if use sbcl || (! use cmucl && ! use clisp && ! use gcl ); then
-		ENABLE_SBCL="--enable-sbcl"
+	# lisp priorities
+	MAXIMA_LISP="sbcl"
+	if use clisp && use gcl && ! use sbcl; then
+		MAXIMA_LISP=clisp
+	elif use clisp && use cmucl && ! use sbcl; then
+		MAXIMA_LISP=clisp
+	elif use cmucl && use gcl && ! use sbcl; then
+		MAXIMA_LISP=cmucl
+	elif use gcl && ! use sbcl; then
+		MAXIMA_LISP=gcl
 	fi
+	einfo "Selected lisp: ${MAXIMA_LISP}"
 
-	if use gcl; then
-		einfo "Using gcl: it might break, recompile with another lisp, or use default (sbcl)."
+	if [[ ${MAXIMA_LISP} == gcl ]]; then
+		ewarn "Using gcl: if it breaks, recompile with another lisp or use default (sbcl)."
 		if ! built_with_use dev-lisp/gcl ansi; then
 			eerror "GCL must be installed with ANSI."
 			eerror "Try USE=\"ansi\" emerge gcl"
@@ -94,20 +104,17 @@ src_unpack() {
 	unpack ${A}
 	# use xdg-open to view ps, pdf
 	epatch "${FILESDIR}"/${P}-xdg-utils.patch
-}
-
-src_compile() {
-	eautoreconf
-
 	# remove rmaxima if neither cmucl nor sbcl
-	if ! use sbcl && ! use cmucl && [[ -z ${ENABLE_SBCL} ]]; then
+	if [[ ${MAXIMA_LISP} != cmucl ]] || [[ ${MAXIMA_LISP} != sbcl ]]; then
 		sed -i \
 			-e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
-			src/Makefile.in || die "sed for rmaxima failed"
+			"${S}"/src/Makefile.in \
+			|| die "sed for rmaxima failed"
 	fi
+}
 
-	local myconf=${ENABLE_SBCL}
-
+src_compile() {
+	local myconf="--enable-${MAXIMA_LISP}"
 	# remove xmaxima if no tk
 	if use tk; then
 		myconf="${myconf} --with-wish=wish"
@@ -128,12 +135,7 @@ src_compile() {
 		done
 	fi
 
-	econf \
-		$(use_enable cmucl) \
-		$(use_enable clisp) \
-		$(use_enable gcl) \
-		${myconf} \
-		|| die "econf failed"
+	econf ${myconf} || die "econf failed"
 	emake || die "emake failed"
 }
 
@@ -160,10 +162,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	# all lisps do not bunzip2 info files on the fly
-	for infofile in $(ls ${D}/usr/share/info/*.bz2); do
+	# 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() {