summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2010-02-02 21:45:29 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2010-02-02 21:45:29 +0000
commitbad07e76068e3c97032ef81c910b916b23965ef2 (patch)
tree3a9a0cff89f94da3c6782123e3b7fcd2e8244707 /dev-python/scientificpython
parentAnother split library from ccp4 (diff)
downloadhistorical-bad07e76068e3c97032ef81c910b916b23965ef2.tar.gz
historical-bad07e76068e3c97032ef81c910b916b23965ef2.tar.bz2
historical-bad07e76068e3c97032ef81c910b916b23965ef2.zip
Added netcdf-3.6 without mpi dependency for stable profiles
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'dev-python/scientificpython')
-rw-r--r--dev-python/scientificpython/Manifest8
-rw-r--r--dev-python/scientificpython/scientificpython-2.9.ebuild4
2 files changed, 6 insertions, 6 deletions
diff --git a/dev-python/scientificpython/Manifest b/dev-python/scientificpython/Manifest
index 387d122e93d9..912f8aa31084 100644
--- a/dev-python/scientificpython/Manifest
+++ b/dev-python/scientificpython/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
AUX scientificpython-2.9-mpi-netcdf.patch 1350 RMD160 c7b7b91806567b1f2c315d5b98512482a1f2a6d5 SHA1 666a6ecaa0de00ab890744d340f1fe372707117b SHA256 923952fac690c8adfca49d17bccb9d6d0a77810fc7adbafccb9af85251b1c2fd
AUX scientificpython-2.9-mpi.patch 1176 RMD160 cad462654d528591ce8dbf185cf21c14a58c31e0 SHA1 1f327805854e76ac8123f2b4f9ac0ce4cf05375b SHA256 de665a5fbf474253a1fff8b5a929cd68165e5d6dd0d9e0fe52b4ecd39bedc43f
DIST ScientificPython-2.9.tar.gz 593720 RMD160 2533879b64fcb17027b11784fc0cff4351284c98 SHA1 60fb1ec7c31c86b7e7a068ccda780197e1e95ad8 SHA256 4ffc33f211b9dc811af0aa82b74453f73c7f415c04352ac1cef92b95b12b74be
-EBUILD scientificpython-2.9.ebuild 2189 RMD160 2890735975f95b7f415b254caeba8a9c0cffa661 SHA1 524242f308cea773a185794343e5b3ad632d0a16 SHA256 c095e6ec7e00b3336734419b6d6b770992b30c723fbbe1f403b481d063a05fc5
+EBUILD scientificpython-2.9.ebuild 2222 RMD160 a7b15df6c53ace0d4197565aacc61f4fce4e558a SHA1 7dab95eb369586fc4205655770ef09f525602e73 SHA256 48d2c2423c5e5558bf0f0b635f8cca5a20d39365d2b9751bca838f6c642dd803
MISC ChangeLog 6601 RMD160 d6f0c25358a5541ccf76df37891c60d41d14f41c SHA1 11797d2d54b62916492f49b8fbb0bcc0d22a810a SHA256 5f1914c95fbd02a44bba58fb44588dfd0275a70a87a26a325d84d1f410c3de2b
MISC metadata.xml 734 RMD160 47baa4ca9756eff5e19c8f7b18f18054d5c3e1aa SHA1 aa3adb4221bc8997d68d01afa2ca8528ab579baf SHA256 6749ecfd7ae3f2ed8e9da27ad372d9f35023cdf3ea7ab0976b829460b1d03b2f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAktoWqQACgkQ1ycZbhPLE2ApLACcC6Gkay5beaVDTmsjqds74S1M
-Oh0AnR3s2PTt8l2z/C+vCvsGr2aIHjG5
-=HSJT
+iEYEARECAAYFAktonQIACgkQ1ycZbhPLE2CxSACghC8M1aweCmU+qewKjhCEmkMm
+OQoAnAw47pA0YcQ9WRGXmtZrWF5rV2Zq
+=UTBH
-----END PGP SIGNATURE-----
diff --git a/dev-python/scientificpython/scientificpython-2.9.ebuild b/dev-python/scientificpython/scientificpython-2.9.ebuild
index 2887519489ef..1bc296986a1f 100644
--- a/dev-python/scientificpython/scientificpython-2.9.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.ebuild,v 1.8 2010/02/02 17:02:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.ebuild,v 1.9 2010/02/02 21:45:29 bicatali Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
@@ -20,7 +20,7 @@ KEYWORDS="alpha amd64 ia64 ppc sparc x86"
IUSE="doc mpi test"
RDEPEND="dev-python/numpy
- sci-libs/netcdf[mpi=]
+ || ( =sci-libs/netcdf-3.6* >=sci-libs/netcdf-4[mpi=] )
mpi? ( virtual/mpi )"
DEPEND="${RDEPEND}
test? ( dev-python/nose )"