| 1 |
commit: da661fc9f247f8b46ab6ec86c92805eb12081cca |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 30 15:41:43 2016 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 30 15:47:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da661fc9 |
| 7 |
|
| 8 |
dev-python/sympy: Better doc building and update virtualx.eclas usage |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-python/sympy/sympy-0.7.6.1-r1.ebuild | 18 ++++++++++++------ |
| 14 |
dev-python/sympy/sympy-0.7.6.1.ebuild | 17 ++++++++++++----- |
| 15 |
2 files changed, 24 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/sympy/sympy-0.7.6.1-r1.ebuild b/dev-python/sympy/sympy-0.7.6.1-r1.ebuild |
| 18 |
index 6a0f6dd..c69a900 100644 |
| 19 |
--- a/dev-python/sympy/sympy-0.7.6.1-r1.ebuild |
| 20 |
+++ b/dev-python/sympy/sympy-0.7.6.1-r1.ebuild |
| 21 |
@@ -1,11 +1,10 @@ |
| 22 |
-# Copyright 1999-2015 Gentoo Foundation |
| 23 |
+# Copyright 1999-2016 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
EAPI=5 |
| 28 |
|
| 29 |
PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
| 30 |
-DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) |
| 31 |
|
| 32 |
inherit distutils-r1 eutils virtualx |
| 33 |
|
| 34 |
@@ -19,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos" |
| 35 |
IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano" |
| 36 |
|
| 37 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 38 |
- doc? ( python_targets_python2_7 )" |
| 39 |
+ doc? ( || ( $(python_gen_useflags 'python2*') ) )" |
| 40 |
|
| 41 |
RDEPEND=" |
| 42 |
$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7) |
| 43 |
@@ -46,6 +45,10 @@ DEPEND="${RDEPEND} |
| 44 |
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
| 45 |
test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )" |
| 46 |
|
| 47 |
+pkg_setup() { |
| 48 |
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) |
| 49 |
+} |
| 50 |
+ |
| 51 |
python_prepare_all() { |
| 52 |
epatch "${FILESDIR}"/${PN}-0.7.6-doc-makefile.patch |
| 53 |
epatch "${FILESDIR}"/${P}-sphinx-1.3.1.patch |
| 54 |
@@ -67,7 +70,7 @@ python_compile_all() { |
| 55 |
} |
| 56 |
|
| 57 |
python_test() { |
| 58 |
- VIRTUALX_COMMAND="./setup.py" virtualmake test |
| 59 |
+ virtx "${PYTHON}" setup.py test |
| 60 |
} |
| 61 |
|
| 62 |
python_install() { |
| 63 |
@@ -77,8 +80,11 @@ python_install() { |
| 64 |
python_install_all() { |
| 65 |
local DOCS=( AUTHORS README.rst ) |
| 66 |
use doc &&\ |
| 67 |
- DOCS=( ${DOCS[*]} doc/_build/cheatsheet/cheatsheet.pdf doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) &&\ |
| 68 |
- local HTML_DOCS=( doc/_build/html/. ) &&\ |
| 69 |
+ DOCS+=( |
| 70 |
+ doc/_build/cheatsheet/cheatsheet.pdf |
| 71 |
+ doc/_build/cheatsheet/combinatoric_cheatsheet.pdf |
| 72 |
+ ) && \ |
| 73 |
+ local HTML_DOCS=( doc/_build/html/. ) && \ |
| 74 |
doinfo doc/_build/texinfo/${PN}.info |
| 75 |
use examples && local EXAMPLES=( examples/. ) |
| 76 |
distutils-r1_python_install_all |
| 77 |
|
| 78 |
diff --git a/dev-python/sympy/sympy-0.7.6.1.ebuild b/dev-python/sympy/sympy-0.7.6.1.ebuild |
| 79 |
index 15a78b6..6ae4e9f 100644 |
| 80 |
--- a/dev-python/sympy/sympy-0.7.6.1.ebuild |
| 81 |
+++ b/dev-python/sympy/sympy-0.7.6.1.ebuild |
| 82 |
@@ -1,4 +1,4 @@ |
| 83 |
-# Copyright 1999-2015 Gentoo Foundation |
| 84 |
+# Copyright 1999-2016 Gentoo Foundation |
| 85 |
# Distributed under the terms of the GNU General Public License v2 |
| 86 |
# $Id$ |
| 87 |
|
| 88 |
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos" |
| 89 |
IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano" |
| 90 |
|
| 91 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 92 |
- doc? ( python_targets_python2_7 )" |
| 93 |
+ doc? ( || ( $(python_gen_useflags 'python2*') ) )" |
| 94 |
|
| 95 |
RDEPEND=" |
| 96 |
$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7) |
| 97 |
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND} |
| 98 |
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
| 99 |
test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )" |
| 100 |
|
| 101 |
+pkg_setup() { |
| 102 |
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) |
| 103 |
+} |
| 104 |
+ |
| 105 |
python_prepare_all() { |
| 106 |
epatch "${FILESDIR}"/${PN}-0.7.6-doc-makefile.patch |
| 107 |
epatch "${FILESDIR}"/${P}-sphinx-1.3.1.patch |
| 108 |
@@ -65,7 +69,7 @@ python_compile_all() { |
| 109 |
} |
| 110 |
|
| 111 |
python_test() { |
| 112 |
- VIRTUALX_COMMAND="./setup.py" virtualmake test |
| 113 |
+ virtx "${PYTHON}" setup.py test |
| 114 |
} |
| 115 |
|
| 116 |
python_install() { |
| 117 |
@@ -75,8 +79,11 @@ python_install() { |
| 118 |
python_install_all() { |
| 119 |
local DOCS=( AUTHORS README.rst ) |
| 120 |
use doc &&\ |
| 121 |
- DOCS=( ${DOCS[*]} doc/_build/cheatsheet/cheatsheet.pdf doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) &&\ |
| 122 |
- local HTML_DOCS=( doc/_build/html/. ) &&\ |
| 123 |
+ DOCS+=( |
| 124 |
+ doc/_build/cheatsheet/cheatsheet.pdf |
| 125 |
+ doc/_build/cheatsheet/combinatoric_cheatsheet.pdf |
| 126 |
+ ) && \ |
| 127 |
+ local HTML_DOCS=( doc/_build/html/. ) && \ |
| 128 |
doinfo doc/_build/texinfo/${PN}.info |
| 129 |
use examples && local EXAMPLES=( examples/. ) |
| 130 |
distutils-r1_python_install_all |
Archives