dev-python/astropy: Update astropy live ebuild deps and python support

Package-Manager: portage-2.2.11-r1

2 files changed, 40 insertions, 16 deletions

diff --git a/dev-python/astropy/ChangeLog b/dev-python/astropy/ChangeLog
index 725b1d138..231b56e3e 100644
--- a/dev-python/astropy/ChangeLog
+++ b/dev-python/astropy/ChangeLog
@@ -2,10 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Aug 2014; Joseph Jon Booker <joe@neoturbine.net> astropy-9999.ebuild:
+  dev-python/astropy: Update astropy live ebuild deps and python support
+
   06 Jan 2014; Justin Lecher <jlec@gentoo.org> astropy-9999.ebuild:
   Switch from git-2 to git-r3
 
   13 Jun 2013; Justin Lecher <jlec@gentoo.org> astropy-9999.ebuild,
   metadata.xml:
   Bump to EAPI=5 and distutils-r1.eclass
-
diff --git a/dev-python/astropy/astropy-9999.ebuild b/dev-python/astropy/astropy-9999.ebuild
index ac26d8267..6cfdc6758 100644
--- a/dev-python/astropy/astropy-9999.ebuild
+++ b/dev-python/astropy/astropy-9999.ebuild
@@ -4,12 +4,12 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
 inherit distutils-r1 git-r3
 
-DESCRIPTION="Python routines and common tools needed for performing astronomy and astrophysics"
-HOMEPAGE="http://astropy.org/ http://github.com/astropy/astropy"
+DESCRIPTION="Core functionality for performing astrophysics with Python"
+HOMEPAGE="http://astropy.org/"
 SRC_URI=""
 EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
 
@@ -18,32 +18,54 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc test"
 
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-libs/expat:0=
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-astronomy/erfa:0=
+	sci-astronomy/wcslib:0=
+	>=sci-libs/cfitsio-3.350:0=
+	sys-libs/zlib:0="
 DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-devel/flex
+	virtual/pkgconfig
 	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/matplotlib
+		dev-python/sphinx
 		media-gfx/graphviz
 	)
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? (
+		dev-libs/libxml2
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
 
 python_prepare_all() {
-	sed \
-		-e '/use_system_pytest/ s/False/True/' \
-		-i astropy/tests/helper.py || die
 	distutils-r1_python_prepare_all
+	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
+}
+
+python_compile() {
+	distutils-r1_python_compile --use-system-libraries
 }
 
 python_compile_all() {
-	if use doc ; then
-		pushd docs &> /dev/null
-		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib.*)" \
-			sphinx-build -b html -d _build/doctrees . _build/html || die
-		popd &> /dev/null
+	if use doc; then
+		python_export_best
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx
 	fi
 }
 
+python_test() {
+	esetup.py test
+}
+
 python_install_all() {
 	use doc && HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_src_install_all