| 1 |
commit: 97e0420ad66d0705edd16616dafa2654f9ec79cb |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 25 12:24:52 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 25 12:35:05 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e0420a |
| 7 |
|
| 8 |
dev-python/flask: Use distutils_enable_sphinx |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-python/flask/flask-1.1.1.ebuild | 19 ++----------------- |
| 13 |
dev-python/flask/flask-9999.ebuild | 21 +++------------------ |
| 14 |
2 files changed, 5 insertions(+), 35 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild |
| 17 |
index df477802402..3cfa9366453 100644 |
| 18 |
--- a/dev-python/flask/flask-1.1.1.ebuild |
| 19 |
+++ b/dev-python/flask/flask-1.1.1.ebuild |
| 20 |
@@ -22,7 +22,7 @@ fi |
| 21 |
|
| 22 |
LICENSE="BSD" |
| 23 |
SLOT="0" |
| 24 |
-IUSE="doc examples test" |
| 25 |
+IUSE="examples test" |
| 26 |
RESTRICT="!test? ( test )" |
| 27 |
|
| 28 |
RDEPEND="dev-python/click[${PYTHON_USEDEP}] |
| 29 |
@@ -32,7 +32,6 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}] |
| 30 |
>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]" |
| 31 |
DEPEND="${RDEPEND} |
| 32 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 33 |
- doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) |
| 34 |
test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
| 35 |
|
| 36 |
PATCHES=( |
| 37 |
@@ -40,20 +39,7 @@ PATCHES=( |
| 38 |
"${FILESDIR}/flask-1.1.1-py38.patch" |
| 39 |
) |
| 40 |
|
| 41 |
-python_check_deps() { |
| 42 |
- use doc || return 0 |
| 43 |
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 44 |
-} |
| 45 |
- |
| 46 |
-python_prepare_all() { |
| 47 |
- # Prevent un-needed d'loading |
| 48 |
- sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die |
| 49 |
- distutils-r1_python_prepare_all |
| 50 |
-} |
| 51 |
- |
| 52 |
-python_compile_all() { |
| 53 |
- use doc && emake -C docs html |
| 54 |
-} |
| 55 |
+distutils_enable_sphinx docs |
| 56 |
|
| 57 |
python_test() { |
| 58 |
PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \ |
| 59 |
@@ -62,7 +48,6 @@ python_test() { |
| 60 |
|
| 61 |
python_install_all() { |
| 62 |
use examples && dodoc -r examples |
| 63 |
- use doc && HTML_DOCS=( docs/_build/html/. ) |
| 64 |
|
| 65 |
distutils-r1_python_install_all |
| 66 |
} |
| 67 |
|
| 68 |
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild |
| 69 |
index 6c634728d16..ab417690d6f 100644 |
| 70 |
--- a/dev-python/flask/flask-9999.ebuild |
| 71 |
+++ b/dev-python/flask/flask-9999.ebuild |
| 72 |
@@ -3,7 +3,7 @@ |
| 73 |
|
| 74 |
EAPI=7 |
| 75 |
|
| 76 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) |
| 77 |
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) |
| 78 |
|
| 79 |
inherit distutils-r1 |
| 80 |
|
| 81 |
@@ -22,7 +22,7 @@ fi |
| 82 |
|
| 83 |
LICENSE="BSD" |
| 84 |
SLOT="0" |
| 85 |
-IUSE="doc examples test" |
| 86 |
+IUSE="examples test" |
| 87 |
RESTRICT="!test? ( test )" |
| 88 |
|
| 89 |
RDEPEND="dev-python/click[${PYTHON_USEDEP}] |
| 90 |
@@ -32,23 +32,9 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}] |
| 91 |
>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]" |
| 92 |
DEPEND="${RDEPEND} |
| 93 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 94 |
- doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) |
| 95 |
test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
| 96 |
|
| 97 |
-python_check_deps() { |
| 98 |
- use doc || return 0 |
| 99 |
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 100 |
-} |
| 101 |
- |
| 102 |
-python_prepare_all() { |
| 103 |
- # Prevent un-needed d'loading |
| 104 |
- sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die |
| 105 |
- distutils-r1_python_prepare_all |
| 106 |
-} |
| 107 |
- |
| 108 |
-python_compile_all() { |
| 109 |
- use doc && emake -C docs html |
| 110 |
-} |
| 111 |
+distutils_enable_sphinx docs |
| 112 |
|
| 113 |
python_test() { |
| 114 |
PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \ |
| 115 |
@@ -57,7 +43,6 @@ python_test() { |
| 116 |
|
| 117 |
python_install_all() { |
| 118 |
use examples && dodoc -r examples |
| 119 |
- use doc && HTML_DOCS=( docs/_build/html/. ) |
| 120 |
|
| 121 |
distutils-r1_python_install_all |
| 122 |
} |
Archives