[gentoo-commits] proj/sci:ccp4 commit in: dev-python/astropy/

[gentoo-commits] proj/sci:ccp4 commit in: dev-python/astropy/

[Justin Lecher]

commit:     420e8d1e69dd03a9639f5425905e76ba2af12f0c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 10:31:06 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 10:31:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=420e8d1e

dev-python/astropy: Bump to EAPI=5 and distutils-r1.eclass

Package-Manager: portage-2.2.0_alpha179

---
 dev-python/astropy/ChangeLog           |  8 +++++++
 dev-python/astropy/astropy-9999.ebuild | 40 +++++++++++++++-------------------
 dev-python/astropy/metadata.xml        | 10 ++++-----
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/dev-python/astropy/ChangeLog b/dev-python/astropy/ChangeLog
new file mode 100644
index 0000000..2a1b16f
--- /dev/null
+++ b/dev-python/astropy/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for dev-python/astropy
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  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 4956a93..7b96ba9 100644
--- a/dev-python/astropy/astropy-9999.ebuild
+++ b/dev-python/astropy/astropy-9999.ebuild
@@ -1,54 +1,50 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.7-pypy-* *-jython"
-DISTUTILS_SRC_TEST=setup.py
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils git-2
+inherit distutils-r1 git-2
 
 DESCRIPTION="Python routines and common tools needed for performing astronomy and astrophysics"
 HOMEPAGE="http://astropy.org/ http://github.com/astropy/astropy"
 SRC_URI=""
+EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc test"
 
-RDEPEND="dev-python/numpy"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-devel/flex
 	doc? (
-		dev-python/sphinx
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		media-gfx/graphviz
 	)
-	test? ( dev-python/pytest )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-src_prepare() {
-	sed -e '/use_system_pytest/ s/False/True/' \
+python_prepare_all() {
+	sed \
+		-e '/use_system_pytest/ s/False/True/' \
 		-i astropy/tests/helper.py || die
-	distutils_src_prepare
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
-	distutils_src_compile
+python_compile_all() {
 	if use doc ; then
 		pushd docs &> /dev/null
-		PYTHONPATH="$(ls -d ../build-$(PYTHON --ABI -f)/lib.*)" \
+		PYTHONPATH="$(ls -d ${BUILD_DIR}/lib.*)" \
 			sphinx-build -b html -d _build/doctrees   . _build/html || die
 		popd &> /dev/null
 	fi
 }
 
-src_install() {
-	distutils_src_install
-	use doc && { dohtml -r docs/_build/html/* ; }
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_src_install_all
 }

diff --git a/dev-python/astropy/metadata.xml b/dev-python/astropy/metadata.xml
index 6aed3c8..24543d4 100644
--- a/dev-python/astropy/metadata.xml
+++ b/dev-python/astropy/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-astronomy</herd>
-	<maintainer>
-		<email>xarthisius@gentoo.org</email>
-		<name>Kacper Kowalik</name>
-	</maintainer>
+  <herd>sci-astronomy</herd>
+  <maintainer>
+    <email>xarthisius@gentoo.org</email>
+    <name>Kacper Kowalik</name>
+  </maintainer>
 </pkgmetadata>