dev-python/networkx: modernize python function calls

Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69

diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index a07a2d223c8e978e49197e659fb2e1ee400bfaeb..b9580300abd0ab0254494b686d6ebda7c380ef9d 100644 (file)
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
 
 COMMON_DEPEND="
        dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -32,7 +32,7 @@ DEPEND="
        test? (
                ${COMMON_DEPEND}
                dev-python/nose[${PYTHON_USEDEP}]
-               $(python_gen_cond_dep 'media-gfx/pydot[${PYTHON_USEDEP}]' python2_7)
+               $(python_gen_cond_dep 'media-gfx/pydot[${PYTHON_USEDEP}]' -2)
        )"
 RDEPEND="
        >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
@@ -47,10 +47,6 @@ PATCHES=(
        "${FILESDIR}"/1.11-sphinx-pngmath.patch
 )
 
-pkg_setup() {
-       use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
 python_prepare_all() {
        # Avoid d'loading of file objects.inv from 2 sites of python docs
        sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
@@ -58,7 +54,10 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-       use doc && emake -C doc html
+       if use doc; then
+               python_setup -2
+               emake -C doc html
+       fi
 }
 
 python_test() {