summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-06-03 12:40:20 -0400
committerMike Gilbert <floppym@gentoo.org>2017-06-03 12:40:20 -0400
commit1e2da8f885a70ef64a5ff51a7f191f771c121182 (patch)
treefbb405650395b485deedb623483dbfd1a08e9d85
parentdev-python/networkx: fix sphinx error (diff)
downloadgentoo-1e2da8f885a70ef64a5ff51a7f191f771c121182.tar.gz
gentoo-1e2da8f885a70ef64a5ff51a7f191f771c121182.tar.bz2
gentoo-1e2da8f885a70ef64a5ff51a7f191f771c121182.zip
dev-python/networkx: modernize python function calls
Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69
-rw-r--r--dev-python/networkx/networkx-1.11.ebuild13
1 files changed, 6 insertions, 7 deletions
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index a07a2d223c8e..b9580300abd0 100644
--- 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() {