diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-02-05 23:47:37 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-02-05 23:47:37 +0000 |
| commit | 094a7ef3dccd6e02268367a0fc43ba6c4cc08707 (patch) | |
| tree | 9166c3b96b09ea8c33a4d8b45d3f5c86609181fb /dev-python | |
| parent | Reworked providers for pyvo for newer astropy (diff) | |
| download | gentoo-2-094a7ef3dccd6e02268367a0fc43ba6c4cc08707.tar.gz gentoo-2-094a7ef3dccd6e02268367a0fc43ba6c4cc08707.tar.bz2 gentoo-2-094a7ef3dccd6e02268367a0fc43ba6c4cc08707.zip | |
Conflicting only with older versions of astropy
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/vo/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/vo/vo-0.8-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-python/vo/vo-0.8.ebuild | 49 |
3 files changed, 9 insertions, 54 deletions
diff --git a/dev-python/vo/ChangeLog b/dev-python/vo/ChangeLog index 061d8631ca28..809ad8196767 100644 --- a/dev-python/vo/ChangeLog +++ b/dev-python/vo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/vo -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/vo/ChangeLog,v 1.13 2013/04/24 19:07:33 bicatali Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/vo/ChangeLog,v 1.14 2014/02/05 23:47:37 bicatali Exp $ + + 05 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> -vo-0.8.ebuild, + vo-0.8-r1.ebuild: + Conflicting only with older versions of astropy *vo-0.8-r1 (24 Apr 2013) diff --git a/dev-python/vo/vo-0.8-r1.ebuild b/dev-python/vo/vo-0.8-r1.ebuild index dfcb5a3fe8a5..0c031e5684b4 100644 --- a/dev-python/vo/vo-0.8-r1.ebuild +++ b/dev-python/vo/vo-0.8-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/vo/vo-0.8-r1.ebuild,v 1.1 2013/04/24 19:07:33 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/vo/vo-0.8-r1.ebuild,v 1.2 2014/02/05 23:47:37 bicatali Exp $ EAPI=5 @@ -20,7 +20,7 @@ LICENSE="BSD" RDEPEND=" dev-libs/expat - !dev-python/astropy" + !<dev-python/astropy-0.3" DEPEND="${RDEPEND}" # slow and buggy tests diff --git a/dev-python/vo/vo-0.8.ebuild b/dev-python/vo/vo-0.8.ebuild deleted file mode 100644 index 0c2b600ace95..000000000000 --- a/dev-python/vo/vo-0.8.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/vo/vo-0.8.ebuild,v 1.3 2012/08/08 19:13:19 bicatali Exp $ - -EAPI=4 - -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython" - -inherit distutils eutils - -DESCRIPTION="Python module to read VOTABLE into a Numpy recarray" -HOMEPAGE="https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib" -SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz" - -IUSE="examples" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="BSD" - -RDEPEND="dev-libs/expat - !dev-python/astropy" -DEPEND="${RDEPEND}" - -PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") - -# missing data to perform tests -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6-expat.patch -} - -src_test() { - cd test - testing() { - PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" \ - "$(PYTHON)" benchmarks.py - } - python_execute_function testing -} - -src_install() { - distutils_src_install - if use examples; then - insinto /usr/share/doc/${PF}/ - doins -r examples - fi -} |