(#144744) Block out >=numpy-1_beta and newer.

Package-Manager: portage-2.1.2_pre1-r1

5 files changed, 27 insertions, 20 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index a19c75019bb5..b107c08f650e 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.11 2006/09/24 07:29:56 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.12 2006/09/24 07:31:47 dberkholz Exp $
+
+  24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; scipy-0.4.8.ebuild,
+  scipy-0.4.8-r1.ebuild, scipy-0.4.9.ebuild:
+  (#144744) Block out >=numpy-1_beta and newer.
 
 *scipy-0.5.1 (24 Sep 2006)
 
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 3dce514e6623..576a43f26dca 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -10,26 +10,26 @@ EBUILD scipy-0.3.2.ebuild 1414 RMD160 e7fd43cd1417934fa3afc9e42c7ee60857dee7d5 S
 MD5 c48241d7cc7765759cf9eb54bbdff32f scipy-0.3.2.ebuild 1414
 RMD160 e7fd43cd1417934fa3afc9e42c7ee60857dee7d5 scipy-0.3.2.ebuild 1414
 SHA256 fbe8720d7d1cbf9260d6f0b0914ce53e630c7cb75a77ce79cee8007414e22f4c scipy-0.3.2.ebuild 1414
-EBUILD scipy-0.4.8-r1.ebuild 3619 RMD160 aee82ae25bdb4d232c3c271ea9cca97b671ae4e7 SHA1 ec7cbc73da205ea277e302aac493f558155bcb8f SHA256 e07f41060e44acb835f304c89c12a41da51ad76d17cffa72c417ffae666b7356
-MD5 c09c03a3ca6a266e64453526c2736c8b scipy-0.4.8-r1.ebuild 3619
-RMD160 aee82ae25bdb4d232c3c271ea9cca97b671ae4e7 scipy-0.4.8-r1.ebuild 3619
-SHA256 e07f41060e44acb835f304c89c12a41da51ad76d17cffa72c417ffae666b7356 scipy-0.4.8-r1.ebuild 3619
-EBUILD scipy-0.4.8.ebuild 2033 RMD160 21fef90ef50cbe13cfa8dacf1dfcebcee5d37c11 SHA1 1d9bc9d4b8043ff2e6e7c552925de20c49dc495e SHA256 c9073fc47828b83d466e973149b29c95c76c474ceb9422edf7901c9c91114b3b
-MD5 a464eb04b95a4627c0e9f519a8e40b1d scipy-0.4.8.ebuild 2033
-RMD160 21fef90ef50cbe13cfa8dacf1dfcebcee5d37c11 scipy-0.4.8.ebuild 2033
-SHA256 c9073fc47828b83d466e973149b29c95c76c474ceb9422edf7901c9c91114b3b scipy-0.4.8.ebuild 2033
-EBUILD scipy-0.4.9.ebuild 3471 RMD160 aca47f2a436620063af1f5362eb404ee51e02b6c SHA1 a0e3ca48d84618762afd7c9902e31b17ad1ef5af SHA256 03de74191adaf833acad3a359910b1e2fdacb75351d1de62172c8d3dee59778c
-MD5 979f1d7ee2280d2bb19cb78223497552 scipy-0.4.9.ebuild 3471
-RMD160 aca47f2a436620063af1f5362eb404ee51e02b6c scipy-0.4.9.ebuild 3471
-SHA256 03de74191adaf833acad3a359910b1e2fdacb75351d1de62172c8d3dee59778c scipy-0.4.9.ebuild 3471
+EBUILD scipy-0.4.8-r1.ebuild 3645 RMD160 f457314f28164fb800aab024d909d32ce47fef05 SHA1 77969ecd629273d26a29519e5c4f2c0c910ab4f8 SHA256 43875d6b2d07f1a5de3c1601cbe7b47f0a56765cfc03ed4bdd1ca98b70ffd444
+MD5 c607a80f5184ca57361b452fb80f232f scipy-0.4.8-r1.ebuild 3645
+RMD160 f457314f28164fb800aab024d909d32ce47fef05 scipy-0.4.8-r1.ebuild 3645
+SHA256 43875d6b2d07f1a5de3c1601cbe7b47f0a56765cfc03ed4bdd1ca98b70ffd444 scipy-0.4.8-r1.ebuild 3645
+EBUILD scipy-0.4.8.ebuild 2060 RMD160 4f6e57b03ec71864dd0e9196804b6a136122de5f SHA1 6631d6d2d47c8afc74257dfa42d6939604544458 SHA256 497f59a84f1b19a2811b41b36d69f74c81b2eddd554b461511949ce4cf54083b
+MD5 ba8c2ece70a3d73d629f4c5c4798c2f5 scipy-0.4.8.ebuild 2060
+RMD160 4f6e57b03ec71864dd0e9196804b6a136122de5f scipy-0.4.8.ebuild 2060
+SHA256 497f59a84f1b19a2811b41b36d69f74c81b2eddd554b461511949ce4cf54083b scipy-0.4.8.ebuild 2060
+EBUILD scipy-0.4.9.ebuild 3497 RMD160 13f6aaa31e2854bf2e741a4ad962547fec858421 SHA1 7e9eb00a56802d13b6e2667ea4ae59ff54624295 SHA256 615c959bc05c5af88f9ef256c1cce26f47be55d92c3203c92f12a5c070788d59
+MD5 0c39cf027eaa3cdeea4ea25df05859d5 scipy-0.4.9.ebuild 3497
+RMD160 13f6aaa31e2854bf2e741a4ad962547fec858421 scipy-0.4.9.ebuild 3497
+SHA256 615c959bc05c5af88f9ef256c1cce26f47be55d92c3203c92f12a5c070788d59 scipy-0.4.9.ebuild 3497
 EBUILD scipy-0.5.1.ebuild 3567 RMD160 8a5323e7ec1d1673214fc6a466793825c375986c SHA1 08b4366d5131b667960ad2e3c157bc9991b66e7a SHA256 667cf11bf97e9fa3747a9b363bb2518d5e496313f5003c08b0d4881c6e8f441b
 MD5 edfcd340eccdbbd888969bac55397818 scipy-0.5.1.ebuild 3567
 RMD160 8a5323e7ec1d1673214fc6a466793825c375986c scipy-0.5.1.ebuild 3567
 SHA256 667cf11bf97e9fa3747a9b363bb2518d5e496313f5003c08b0d4881c6e8f441b scipy-0.5.1.ebuild 3567
-MISC ChangeLog 2067 RMD160 cf4ecda204b3f2080c624178f97f5532cbf22271 SHA1 087496196ed4237e9b17c1e379781f6e0b422d38 SHA256 12469f9a77da4c2559a9be0ee1700706cae30985ddc99ec8776cf41bc1086269
-MD5 7a03fbca7fdbb0dc671e2c7a93688637 ChangeLog 2067
-RMD160 cf4ecda204b3f2080c624178f97f5532cbf22271 ChangeLog 2067
-SHA256 12469f9a77da4c2559a9be0ee1700706cae30985ddc99ec8776cf41bc1086269 ChangeLog 2067
+MISC ChangeLog 2236 RMD160 99bb1f815b5ce0bc0225c38f9b0469d7e39fd495 SHA1 fa3aca375bbe42763a5adb78dda312a8b9a19c19 SHA256 8d59259d94cadf724510b55d12693e734da6fc4fe760c5725ec39f3442295997
+MD5 f07d4fb6258090bb01f5f0f136e91bd2 ChangeLog 2236
+RMD160 99bb1f815b5ce0bc0225c38f9b0469d7e39fd495 ChangeLog 2236
+SHA256 8d59259d94cadf724510b55d12693e734da6fc4fe760c5725ec39f3442295997 ChangeLog 2236
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-libs/scipy/scipy-0.4.8-r1.ebuild b/sci-libs/scipy/scipy-0.4.8-r1.ebuild
index a8f17ea2fbff..36ffea3bbbbc 100644
--- a/sci-libs/scipy/scipy-0.4.8-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.4.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.4.8-r1.ebuild,v 1.6 2006/06/14 00:35:35 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.4.8-r1.ebuild,v 1.7 2006/09/24 07:31:47 dberkholz Exp $
 
 inherit distutils fortran
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 # because doc says scipy needs to compile all libraries with the same compiler
 RDEPEND=">=dev-lang/python-2.3.3
 	>=dev-python/numpy-0.9.6-r1
+	!>dev-python/numpy-0.9.9
 	sci-libs/blas-atlas
 	sci-libs/lapack-atlas
 	fftw? ( =sci-libs/fftw-2.1* )"
diff --git a/sci-libs/scipy/scipy-0.4.8.ebuild b/sci-libs/scipy/scipy-0.4.8.ebuild
index 47205e28045a..47c2ef6b1296 100644
--- a/sci-libs/scipy/scipy-0.4.8.ebuild
+++ b/sci-libs/scipy/scipy-0.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.4.8.ebuild,v 1.2 2006/05/02 22:24:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.4.8.ebuild,v 1.3 2006/09/24 07:31:47 dberkholz Exp $
 
 inherit distutils fortran
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 # because doc says scipy needs to compile all libraries with the same compiler
 RDEPEND=">=dev-lang/python-2.3.3
 	>=dev-python/numpy-0.9.6
+	!>dev-python/numpy-0.9.9
 	sci-libs/blas-atlas
 	sci-libs/lapack-atlas
 	fftw? ( =sci-libs/fftw-2.1* )"
diff --git a/sci-libs/scipy/scipy-0.4.9.ebuild b/sci-libs/scipy/scipy-0.4.9.ebuild
index 2012cbd2ee3f..112fa48a6330 100644
--- a/sci-libs/scipy/scipy-0.4.9.ebuild
+++ b/sci-libs/scipy/scipy-0.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.4.9.ebuild,v 1.3 2006/09/24 01:10:06 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.4.9.ebuild,v 1.4 2006/09/24 07:31:47 dberkholz Exp $
 
 inherit distutils fortran
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 # because doc says scipy needs to compile all libraries with the same compiler
 RDEPEND=">=dev-lang/python-2.3.3
 	>=dev-python/numpy-0.9.8
+	!>dev-python/numpy-0.9.9
 	sci-libs/blas-atlas
 	sci-libs/blas-config
 	sci-libs/lapack-config