dev-python/vo: Correct blocker against astropy and fix distutils-r1.eclass usage

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec@gentoo.org>

diff --git a/dev-python/vo/metadata.xml b/dev-python/vo/metadata.xml
index 1fec8de53fcc8ad9c4e3bbc9f8eb002e91289d1a..fc6a46123b321f7a0ba4580df90a4f7eb19d6a47 100644 (file)
--- a/dev-python/vo/metadata.xml
+++ b/dev-python/vo/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
+  <herd>sci-astronomy</herd>
+  <longdescription lang="en">
   vo.table is a Python package to read and write astronomical VOTable
   files into Numpy record arrays.
   vo.table supports the VOTable Format Definition Version 1.1. Some

diff --git a/dev-python/vo/vo-0.8-r1.ebuild b/dev-python/vo/vo-0.8-r1.ebuild
index 1af5073133d6bb497884030bc1a3f15924b7c53a..bc97f1dfb698a82b158ca668c2bbf7046e5eb2e5 100644 (file)
--- a/dev-python/vo/vo-0.8-r1.ebuild
+++ b/dev-python/vo/vo-0.8-r1.ebuild
@@ -6,11 +6,12 @@ EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 DESCRIPTION="Python module to read VO tables into a numpy array"
 HOMEPAGE="https://trac6.assembla.com/astrolib/wiki"
-SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz
+SRC_URI="
+       http://stsdas.stsci.edu/astrolib/${P}.tar.gz
        test? ( http://svn6.assembla.com/svn/astrolib/trunk/vo/test/wfpc2_all.xml.gz )"
 
 IUSE="examples test"
@@ -20,26 +21,25 @@ LICENSE="BSD"
 
 RDEPEND="
        dev-libs/expat
-       !<dev-python/astropy-0.3"
+       !dev-python/astropy"
 DEPEND="${RDEPEND}"
 
 # slow and buggy tests
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.6-expat.patch )
+
 python_prepare_all() {
-       epatch "${FILESDIR}"/${PN}-0.6-expat.patch
        use test && cp "${WORKDIR}"/wfpc2_all.xml test
 }
 
 python_test() {
        cd test || die
        ln -s "${S}"/lib/data "${BUILD_DIR}/lib/vo/data" || die
-       PYTHONPATH="${BUILD_DIR}/lib" "${EPYTHON}" benchmarks.py || die
+       "${EPYTHON}" benchmarks.py || die
 }
 
 python_install_all() {
-       if use examples; then
-               insinto /usr/share/doc/${PF}/
-               doins -r examples
-       fi
+       use examples && EXAMPLES=( examples/. )
+       distutils-r1_python_install_all
 }