diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2012-08-08 19:11:00 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-08-08 19:11:00 +0000 |
| commit | 7f678759f669fba4bb41a46625c5d363ae8e9822 (patch) | |
| tree | 4a736b3e67c8b40049a6258239b134801fe246d7 /dev-python | |
| parent | Blocking pyfits and vo (bug #426822 and bug #429148) (diff) | |
| download | gentoo-2-7f678759f669fba4bb41a46625c5d363ae8e9822.tar.gz gentoo-2-7f678759f669fba4bb41a46625c5d363ae8e9822.tar.bz2 gentoo-2-7f678759f669fba4bb41a46625c5d363ae8e9822.zip | |
Blocking astropy (bug #426822)
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pyfits/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/pyfits/pyfits-2.4.0.ebuild | 5 | ||||
| -rw-r--r-- | dev-python/pyfits/pyfits-3.0.8.ebuild | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/dev-python/pyfits/ChangeLog b/dev-python/pyfits/ChangeLog index 363dd67142d5..4c83393a6727 100644 --- a/dev-python/pyfits/ChangeLog +++ b/dev-python/pyfits/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pyfits # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.34 2012/06/26 23:58:07 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.35 2012/08/08 19:11:00 bicatali Exp $ + + 08 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> pyfits-2.4.0.ebuild, + pyfits-3.0.8.ebuild: + Blocking astropy (bug #426822) 26 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> pyfits-3.0.8.ebuild: keyword ~amd64-linux ~x86-linux @@ -151,4 +155,3 @@ 06 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml, +pyfits-1.0.1.ebuild: Initial import. Close bug #65691. - diff --git a/dev-python/pyfits/pyfits-2.4.0.ebuild b/dev-python/pyfits/pyfits-2.4.0.ebuild index 8def63687a6f..2396afab1b56 100644 --- a/dev-python/pyfits/pyfits-2.4.0.ebuild +++ b/dev-python/pyfits/pyfits-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-2.4.0.ebuild,v 1.4 2012/02/23 04:47:44 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-2.4.0.ebuild,v 1.5 2012/08/08 19:11:00 bicatali Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -17,7 +17,8 @@ SLOT="0" KEYWORDS="amd64 x86 ~x86-fbsd" LICENSE="BSD" -RDEPEND="dev-python/numpy" +RDEPEND="dev-python/numpy + !dev-python/astropy" DEPEND="${RDEPEND}" # current tests need data which are not in tar ball diff --git a/dev-python/pyfits/pyfits-3.0.8.ebuild b/dev-python/pyfits/pyfits-3.0.8.ebuild index cce55d5fba84..4e1829b84cc3 100644 --- a/dev-python/pyfits/pyfits-3.0.8.ebuild +++ b/dev-python/pyfits/pyfits-3.0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.0.8.ebuild,v 1.3 2012/06/26 23:58:07 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.0.8.ebuild,v 1.4 2012/08/08 19:11:00 bicatali Exp $ EAPI=4 @@ -21,7 +21,8 @@ KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="" RDEPEND="dev-python/numpy - dev-python/setuptools" + dev-python/setuptools + !dev-python/astropy" DEPEND="${RDEPEND} dev-python/stsci-distutils dev-python/d2to1" |