Fixed swig python deps for newer swig versions (>=1.3.38), closing bug #259593

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 16 insertions, 11 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index ec60152f3dac..d238bb1c116b 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.40 2009/02/18 20:52:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.41 2009/02/20 10:29:30 bicatali Exp $
+
+  20 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  scipy-0.6.0-r6.ebuild, scipy-0.7.0.ebuild:
+  Fixed swig python deps for newer swig versions (>=1.3.38), closing bug
+  #259593
 
 *scipy-0.7.0 (18 Feb 2009)
 
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 7fe63de441a5..e2cb9f3dd624 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -11,14 +11,14 @@ AUX scipy-0.6.0-stsci.patch 2209 RMD160 c7c21a23aef7fff9318f224ef2383f7970c1caf9
 AUX scipy-0.7.0_beta1-implicit.patch 905 RMD160 a22d5b5c7a67b3a806b63d7708654562fc241300 SHA1 40239fd3a77dc6f8cf9914a266953fd7b4ef41fe SHA256 cbde48ba3e22ef994b4ae0744c6186ef6d3ec608a74b3d0082f22d0be9591b96
 DIST scipy-0.6.0.tar.gz 6572954 RMD160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b SHA1 65eff3e245f59b2af9adc70fad11daa40f0ba3e0 SHA256 5f70390963fb4e3ae8cf5effa301c160ef68c791098e2ea95b99380e298eac4f
 DIST scipy-0.7.0.tar.gz 4636167 RMD160 3583901f679cbc7f91560626f437d7edcd2bf6cf SHA1 7daef781253bafccf3be54b9eb3541f084503076 SHA256 fd788317cee1cd3be91699d88c813ad0d1190131851b04b025ac20a27b60467c
-EBUILD scipy-0.6.0-r6.ebuild 4179 RMD160 ce7bca0a3e6ed5786eac02617339762c0b7d4e92 SHA1 d5b80a0f319b76c666536f5fd4950286332c20bb SHA256 a7c4088c0d1cde1faba25986e3f8d3c570f4dbfc34284170f69a63d4e350c295
-EBUILD scipy-0.7.0.ebuild 3456 RMD160 a21b4ca8b1ca465a74d99882bd7fae5477ad2f57 SHA1 2f849aef6a8cf2cc922e75dda57ccd18d5535de3 SHA256 4724d465e7ca15c72120ffd712980bce041c86c91d9c8d3e5d5a51d426e7cd6d
-MISC ChangeLog 9059 RMD160 1478e52107f78a12318830fe109e53fae666af3f SHA1 16c41ed67f34d262e33eb70d060ef33b20d20dd2 SHA256 a3a538882b43bbdc23c13462ff45df3d0ef9515f10a482ce14e53e35417abed0
+EBUILD scipy-0.6.0-r6.ebuild 4218 RMD160 04d4f4fd46c0ce2ceb33f6e838c421cf902c7318 SHA1 7a633ba12f69f25cecbb3acbf1a1f8c98c54ba4e SHA256 4226fbd68fa3311aa6f1cfb51b1c18c85559405f2eb1c487711d5040d3c92bd4
+EBUILD scipy-0.7.0.ebuild 3495 RMD160 78385941029724181ada0f03a81320056d633178 SHA1 1e071c89ee0a41ad0069a537557f384edc256590 SHA256 bf13a122f21b64427843afb97180b390657d6e0ca7badafa15d493147cec67db
+MISC ChangeLog 9243 RMD160 7b81f64e216da3afc4210f6cd0ece3c89002d91a SHA1 560b4e3671405cff79db273de84b470d849c6ba5 SHA256 bbaf463651638fe3ec212766f56e6542b6f98a9e6059324df0c1b929c79b6884
 MISC metadata.xml 767 RMD160 40e85dc710adf535bdb947cf53cc0b733af047b2 SHA1 6541b0ddce3e394dbf79e86eea36a01bf4f6de55 SHA256 51cab078f50df6606d960384d9e66ccc13a3ba2c3a828c4a83e2c1beaf3116bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmcdRoACgkQ1ycZbhPLE2DkAwCeNcFoAV1y9FuvHMEfQVYpoxre
-1YcAoKPVtAwQmZ0cgIehQcUDC/RpceYm
-=7yci
+iEYEARECAAYFAkmehlAACgkQ1ycZbhPLE2CobgCeKRLChFMtBlKew/yTxpxCIhbQ
+kQ0An3sjQ+7Z7426L+OtYrRvGyC1kEyG
+=L3If
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.6.0-r6.ebuild b/sci-libs/scipy/scipy-0.6.0-r6.ebuild
index 53f06d2a4f0d..a347efe7a8e0 100644
--- a/sci-libs/scipy/scipy-0.6.0-r6.ebuild
+++ b/sci-libs/scipy/scipy-0.6.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.6.0-r6.ebuild,v 1.1 2009/01/14 18:11:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.6.0-r6.ebuild,v 1.2 2009/02/20 10:29:30 bicatali Exp $
 
 EAPI=2
 NEED_PYTHON=2.3
@@ -26,7 +26,7 @@ CDEPEND="dev-python/numpy
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
-	umfpack? ( dev-lang/swig[python] )"
+	umfpack? ( || ( >=dev-lang/swig-1.3.38 <=dev-lang/swig-1.3.36[python] ) )"
 
 RDEPEND="${CDEPEND}
 	dev-python/imaging"
diff --git a/sci-libs/scipy/scipy-0.7.0.ebuild b/sci-libs/scipy/scipy-0.7.0.ebuild
index fbf48d29baa0..f72a762010b5 100644
--- a/sci-libs/scipy/scipy-0.7.0.ebuild
+++ b/sci-libs/scipy/scipy-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.0.ebuild,v 1.1 2009/02/18 20:52:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.0.ebuild,v 1.2 2009/02/20 10:29:30 bicatali Exp $
 
 EAPI=2
 NEED_PYTHON=2.4
@@ -26,7 +26,7 @@ CDEPEND=">=dev-python/numpy-1.2
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	test? ( dev-python/nose )
-	umfpack? ( dev-lang/swig[python] )"
+	umfpack? ( || ( >=dev-lang/swig-1.3.38 <=dev-lang/swig-1.3.36[python] ) )"
 
 RDEPEND="${CDEPEND}
 	dev-python/imaging"