From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 59A2858974 for ; Wed, 3 Feb 2016 09:05:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27DF021C010; Wed, 3 Feb 2016 09:05:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3492C21C010 for ; Wed, 3 Feb 2016 09:05:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5B1E340E8C for ; Wed, 3 Feb 2016 09:05:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F871CEC for ; Wed, 3 Feb 2016 09:05:38 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1454490333.b980a45336b89398ce931ec1e37a51805d9d731c.jlec@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.10-r1.ebuild dev-python/networkx/networkx-1.10.ebuild dev-python/networkx/networkx-1.11.ebuild X-VCS-Directories: dev-python/networkx/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: b980a45336b89398ce931ec1e37a51805d9d731c X-VCS-Branch: master Date: Wed, 3 Feb 2016 09:05:38 +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: a23c3f57-250b-452c-a44e-540391210adc X-Archives-Hash: 6ecf7542f3d4f6154cb9445f48b7bf20 commit: b980a45336b89398ce931ec1e37a51805d9d731c Author: Justin Lecher gentoo org> AuthorDate: Wed Feb 3 09:05:09 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Feb 3 09:05:33 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b980a453 dev-python/networkx: Use python2.7 for doc building Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=571044 Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> dev-python/networkx/networkx-1.10-r1.ebuild | 8 +++++++- dev-python/networkx/networkx-1.10.ebuild | 11 +++++++++-- dev-python/networkx/networkx-1.11.ebuild | 6 ++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild index 9770aae..b6b73f9 100644 --- a/dev-python/networkx/networkx-1.10-r1.ebuild +++ b/dev-python/networkx/networkx-1.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,6 +17,8 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples test" +REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" + COMMON_DEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}]" @@ -42,6 +44,10 @@ RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] )" +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 diff --git a/dev-python/networkx/networkx-1.10.ebuild b/dev-python/networkx/networkx-1.10.ebuild index 95ff6a2..23f681f 100644 --- a/dev-python/networkx/networkx-1.10.ebuild +++ b/dev-python/networkx/networkx-1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,10 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples test" -COMMON_DEPEND="dev-python/matplotlib[${PYTHON_USEDEP}] +REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" + +COMMON_DEPEND=" + dev-python/matplotlib[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}]" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] @@ -41,6 +44,10 @@ RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] )" +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 diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild index 4508dcd..0c22174 100644 --- a/dev-python/networkx/networkx-1.11.ebuild +++ b/dev-python/networkx/networkx-1.11.ebuild @@ -17,6 +17,8 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples test" +REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" + COMMON_DEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}]" @@ -42,6 +44,10 @@ RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] )" +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