From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70CC9139694 for ; Sat, 3 Jun 2017 16:40:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B870BE0BB3; Sat, 3 Jun 2017 16:40:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F970E0BB3 for ; Sat, 3 Jun 2017 16:40:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85DDB3416DD for ; Sat, 3 Jun 2017 16:40:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E12E6746E for ; Sat, 3 Jun 2017 16:40:24 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1496508020.1e2da8f885a70ef64a5ff51a7f191f771c121182.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/networkx/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/networkx/networkx-1.11.ebuild X-VCS-Directories: dev-python/networkx/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 1e2da8f885a70ef64a5ff51a7f191f771c121182 X-VCS-Branch: master Date: Sat, 3 Jun 2017 16:40:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9a2405e6-2d3b-4cf8-829a-a9b60e00cb88 X-Archives-Hash: 62314ad25ca58a981b0bfd668484ee88 commit: 1e2da8f885a70ef64a5ff51a7f191f771c121182 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jun 3 16:40:20 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jun 3 16:40:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2da8f8 dev-python/networkx: modernize python function calls Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69 dev-python/networkx/networkx-1.11.ebuild | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild index a07a2d223c8..b9580300abd 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() {