fixed logic for lisp priorities. Now dependencies pull only the compiling lisp when 2 use flags are selected.

Package-Manager: portage-2.1.3.9

3 files changed, 30 insertions, 18 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 058fb12be6d0..d20d4dd8360e 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,10 @@
 # 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.35 2007/09/22 18:28:04 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.36 2007/09/23 11:46:13 bicatali Exp $
+
+  23 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org> maxima-5.13.0.ebuild:
+  fixed logic for lisp priorities. Now dependencies pull only the compiling
+  lisp when 2 use flags are selected.
 
   22 Sep 2007; Steve Arnold <nerdboy@gentoo.org> maxima-5.13.0.ebuild:
   updated desktop entry to match freedesktop spec (again)
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 69a4557c1d5d..94e964dc6911 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50maxima-gentoo.el 600 RMD160 c45cc012987d2a74670ad9aac2b019a1233bd151 SHA1 f05c4ce4f51f2e3d0399fa04de9d8fc8b0296386 SHA256 32cd4c9e958c96e93bb74ee324196efa8f88a90e4508c4c67733c691d6969dfe
 MD5 95fb9c201700548f3d70d62eed081a98 files/50maxima-gentoo.el 600
 RMD160 c45cc012987d2a74670ad9aac2b019a1233bd151 files/50maxima-gentoo.el 600
@@ -25,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 5419 RMD160 41c88dd253e4810b643e063db84f8743a809df60 SHA1 5d70093bc08db40746d5f36771e405717b39b2d0 SHA256 9bbb6ac0ff097dd1ea2b930a4abfadc301ec46da23940f972ca41a95500d2437
-MD5 21a519f94105137a2194aa31daf64589 maxima-5.13.0.ebuild 5419
-RMD160 41c88dd253e4810b643e063db84f8743a809df60 maxima-5.13.0.ebuild 5419
-SHA256 9bbb6ac0ff097dd1ea2b930a4abfadc301ec46da23940f972ca41a95500d2437 maxima-5.13.0.ebuild 5419
+EBUILD maxima-5.13.0.ebuild 5443 RMD160 ab92f15fa9193a6caadfffae1e133abf5764c848 SHA1 2790d1cde54dc4c6dfa7bd73cc205d1d3078997f SHA256 68625a42225620740e9adfb4026962d4e236691a49fd5b6a11fd02e00bed8764
+MD5 f6613fa3236d4130d70dfb2099cdf2bb maxima-5.13.0.ebuild 5443
+RMD160 ab92f15fa9193a6caadfffae1e133abf5764c848 maxima-5.13.0.ebuild 5443
+SHA256 68625a42225620740e9adfb4026962d4e236691a49fd5b6a11fd02e00bed8764 maxima-5.13.0.ebuild 5443
 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 10331 RMD160 cd65f79ecbcfe19d49186c0b4b32a50b015afa46 SHA1 7af106ec529b9455c379badac555723242cffc61 SHA256 3cf9ce6848af0bd8f3f4bc18e228a4decd0a59c273b7d404c8c513183f9a8785
-MD5 8bda3a3d3e218f4114336da1ff2652f4 ChangeLog 10331
-RMD160 cd65f79ecbcfe19d49186c0b4b32a50b015afa46 ChangeLog 10331
-SHA256 3cf9ce6848af0bd8f3f4bc18e228a4decd0a59c273b7d404c8c513183f9a8785 ChangeLog 10331
+MISC ChangeLog 10524 RMD160 6c1518c061be8abcacbe2939b2b4f57453dd1e8a SHA1 534c3a181b288b0412a657c4d1f622fcedf39753 SHA256 e9bc0af3c5bff81f711eca485877d4c03ef632086c5dbc21a7023da3237b22fb
+MD5 5ee49eba6c53181c71a399835132989e ChangeLog 10524
+RMD160 6c1518c061be8abcacbe2939b2b4f57453dd1e8a ChangeLog 10524
+SHA256 e9bc0af3c5bff81f711eca485877d4c03ef632086c5dbc21a7023da3237b22fb ChangeLog 10524
 MISC metadata.xml 737 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 SHA1 bff378e387662ce5e4c4168c74ee7ff1493c41a4 SHA256 9deb0b30538b6d35c0877384b97620eda2dde0bf3b4c702ccdadb007e868daef
 MD5 747fd88897ef9ae5002fa891864f42aa metadata.xml 737
 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 metadata.xml 737
@@ -50,3 +53,10 @@ SHA256 028f67a7e79b0da58e6801c926a0fddfa674e4ed45300a1a7f9d2eda64c263be files/di
 MD5 ef493f2f9d7c8570ac06239a94707fae files/digest-maxima-5.9.1 241
 RMD160 ca6bee5d10da060eff2d678ed90099d3f50fa198 files/digest-maxima-5.9.1 241
 SHA256 c9f64acc636ed728a8c03269f4e58f16cb6b335b25c49fc4f7e308d06629d687 files/digest-maxima-5.9.1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFG9lIM1ycZbhPLE2ARAvFzAJ426h8Tlhl94SeOX+Q5u4Cw/fB16QCdHJoe
+2NAwUFQRwMhEFG/wwpTj1do=
+=80FS
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/maxima/maxima-5.13.0.ebuild b/sci-mathematics/maxima/maxima-5.13.0.ebuild
index b2b99b036789..794e4a616c82 100644
--- a/sci-mathematics/maxima/maxima-5.13.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.13.0.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2007/09/22 18:28:04 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0.ebuild,v 1.7 2007/09/23 11:46:13 bicatali Exp $
 
 inherit eutils elisp-common
 
@@ -19,10 +19,10 @@ RDEPEND=">=sci-visualization/gnuplot-4.0
 	tetex? ( virtual/tetex )
 	emacs? ( virtual/emacs
 		 tetex? ( || ( app-emacs/auctex app-xemacs/auctex ) ) )
-	clisp? ( dev-lisp/clisp )
-	gcl?   ( dev-lisp/gcl )
+	clisp? ( !sbcl? ( dev-lisp/clisp ) )
+	gcl?   ( !sbcl? ( !clisp? ( !cmucl? ( dev-lisp/gcl ) ) ) )
 	sbcl?  ( dev-lisp/sbcl app-misc/rlwrap )
-	cmucl? ( >=dev-lisp/cmucl-19a app-misc/rlwrap )
+	cmucl? ( !sbcl? ( !clisp? ( >=dev-lisp/cmucl-19a app-misc/rlwrap ) ) )
 	!clisp? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) )
 	tk? ( dev-lang/tk )"
 
@@ -79,13 +79,11 @@ pkg_setup() {
 
 	# lisp priorities
 	MAXIMA_LISP="sbcl"
-	if use clisp && use gcl && ! use sbcl; then
+	if use clisp && ! 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
+	elif use cmucl && ! use clisp && ! use sbcl; then
 		MAXIMA_LISP=cmucl
-	elif use gcl && ! use sbcl; then
+	elif use gcl && ! use cmucl && ! use clisp && ! use sbcl; then
 		MAXIMA_LISP=gcl
 	fi
 	einfo "Selected lisp: ${MAXIMA_LISP}"