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 6CACD58973 for ; Sat, 30 Jan 2016 15:47:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FBC021C00C; Sat, 30 Jan 2016 15:47:12 +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 AF19921C00C for ; Sat, 30 Jan 2016 15:47:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7288034092E for ; Sat, 30 Jan 2016 15:47:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DBE1C0 for ; Sat, 30 Jan 2016 15:47:08 +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: <1454168825.da661fc9f247f8b46ab6ec86c92805eb12081cca.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sympy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/sympy/sympy-0.7.6.1-r1.ebuild dev-python/sympy/sympy-0.7.6.1.ebuild X-VCS-Directories: dev-python/sympy/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: da661fc9f247f8b46ab6ec86c92805eb12081cca X-VCS-Branch: master Date: Sat, 30 Jan 2016 15:47:08 +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: caa46014-ef5a-457d-93fa-f54f455ef3d7 X-Archives-Hash: cb59766164e664c58fcbd49e36c55f47 commit: da661fc9f247f8b46ab6ec86c92805eb12081cca Author: Justin Lecher gentoo org> AuthorDate: Sat Jan 30 15:41:43 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Jan 30 15:47:05 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da661fc9 dev-python/sympy: Better doc building and update virtualx.eclas usage Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> dev-python/sympy/sympy-0.7.6.1-r1.ebuild | 18 ++++++++++++------ dev-python/sympy/sympy-0.7.6.1.ebuild | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dev-python/sympy/sympy-0.7.6.1-r1.ebuild b/dev-python/sympy/sympy-0.7.6.1-r1.ebuild index 6a0f6dd..c69a900 100644 --- a/dev-python/sympy/sympy-0.7.6.1-r1.ebuild +++ b/dev-python/sympy/sympy-0.7.6.1-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) inherit distutils-r1 eutils virtualx @@ -19,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos" IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano" REQUIRED_USE="${PYTHON_REQUIRED_USE} - doc? ( python_targets_python2_7 )" + doc? ( || ( $(python_gen_useflags 'python2*') ) )" RDEPEND=" $(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7) @@ -46,6 +45,10 @@ DEPEND="${RDEPEND} doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )" +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + python_prepare_all() { epatch "${FILESDIR}"/${PN}-0.7.6-doc-makefile.patch epatch "${FILESDIR}"/${P}-sphinx-1.3.1.patch @@ -67,7 +70,7 @@ python_compile_all() { } python_test() { - VIRTUALX_COMMAND="./setup.py" virtualmake test + virtx "${PYTHON}" setup.py test } python_install() { @@ -77,8 +80,11 @@ python_install() { python_install_all() { local DOCS=( AUTHORS README.rst ) use doc &&\ - DOCS=( ${DOCS[*]} doc/_build/cheatsheet/cheatsheet.pdf doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) &&\ - local HTML_DOCS=( doc/_build/html/. ) &&\ + DOCS+=( + doc/_build/cheatsheet/cheatsheet.pdf + doc/_build/cheatsheet/combinatoric_cheatsheet.pdf + ) && \ + local HTML_DOCS=( doc/_build/html/. ) && \ doinfo doc/_build/texinfo/${PN}.info use examples && local EXAMPLES=( examples/. ) distutils-r1_python_install_all diff --git a/dev-python/sympy/sympy-0.7.6.1.ebuild b/dev-python/sympy/sympy-0.7.6.1.ebuild index 15a78b6..6ae4e9f 100644 --- a/dev-python/sympy/sympy-0.7.6.1.ebuild +++ b/dev-python/sympy/sympy-0.7.6.1.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$ @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos" IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano" REQUIRED_USE="${PYTHON_REQUIRED_USE} - doc? ( python_targets_python2_7 )" + doc? ( || ( $(python_gen_useflags 'python2*') ) )" RDEPEND=" $(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7) @@ -45,6 +45,10 @@ DEPEND="${RDEPEND} doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )" +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + python_prepare_all() { epatch "${FILESDIR}"/${PN}-0.7.6-doc-makefile.patch epatch "${FILESDIR}"/${P}-sphinx-1.3.1.patch @@ -65,7 +69,7 @@ python_compile_all() { } python_test() { - VIRTUALX_COMMAND="./setup.py" virtualmake test + virtx "${PYTHON}" setup.py test } python_install() { @@ -75,8 +79,11 @@ python_install() { python_install_all() { local DOCS=( AUTHORS README.rst ) use doc &&\ - DOCS=( ${DOCS[*]} doc/_build/cheatsheet/cheatsheet.pdf doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) &&\ - local HTML_DOCS=( doc/_build/html/. ) &&\ + DOCS+=( + doc/_build/cheatsheet/cheatsheet.pdf + doc/_build/cheatsheet/combinatoric_cheatsheet.pdf + ) && \ + local HTML_DOCS=( doc/_build/html/. ) && \ doinfo doc/_build/texinfo/${PN}.info use examples && local EXAMPLES=( examples/. ) distutils-r1_python_install_all