dev-python/astropy: fix for EAPI6 doc building

Documentation build fix, and using newer python-r1 routines.
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=575222

Package-Manager: portage-2.2.27

diff --git a/dev-python/astropy/astropy-1.1.1.ebuild b/dev-python/astropy/astropy-1.1.1.ebuild
index cbe12838cef20d46eb4d0100817e15ea767055f1..656fb4aaa6a972b6e557c463daef35ccb532d793 100644 (file)
--- a/dev-python/astropy/astropy-1.1.1.ebuild
+++ b/dev-python/astropy/astropy-1.1.1.ebuild
@@ -33,8 +33,8 @@ DEPEND="${RDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]
        virtual/pkgconfig
        doc? (
-               dev-python/matplotlib[${PYTHON_USEDEP}]
-               dev-python/sphinx[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep 'dev-python/matplotlib[${PYTHON_USEDEP}]' python2_7)
+               $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
                media-gfx/graphviz
        )
        test? (
@@ -45,6 +45,8 @@ DEPEND="${RDEPEND}
                sci-libs/scipy[${PYTHON_USEDEP}]
        )"
 
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
 PATCHES=(
        "${FILESDIR}/${PN}-1.0.4-system-six.patch"
        "${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
@@ -52,6 +54,10 @@ PATCHES=(
        "${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch"
 )
 
+pkg_setup() {
+       use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_prepare_all() {
        export mydistutilsargs="--offline"
        export ASTROPY_USE_SYSTEM_PYTEST=True
@@ -60,17 +66,15 @@ python_prepare_all() {
        rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
        sed -i -e '/auto_use/s/True/False/' setup.cfg || die
        cat >> setup.cfg <<-EOF
-
        [build]
        use_system_libraries=1
        EOF
-
        distutils-r1_python_prepare_all
 }
 
 python_compile_all() {
        if use doc; then
-               python_export_best
+               python_setup "python2*"
                VARTEXFONTS="${T}"/fonts \
                        MPLCONFIGDIR="${BUILD_DIR}" \
                        PYTHONPATH="${BUILD_DIR}"/lib \