| 1 |
commit: 4f35947dee4e5b3dd50f3590244d5b2db0f7082c |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 25 12:25:23 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 25 12:35:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f35947d |
| 7 |
|
| 8 |
dev-python/urllib3: Use distutils_enable_sphinx |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-python/urllib3/urllib3-1.24.2.ebuild | 18 ++---------------- |
| 13 |
dev-python/urllib3/urllib3-1.25.7.ebuild | 17 ++--------------- |
| 14 |
2 files changed, 4 insertions(+), 31 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild |
| 17 |
index b1598117c52..cf59c0ffa92 100644 |
| 18 |
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild |
| 19 |
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild |
| 20 |
@@ -15,9 +15,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 21 |
LICENSE="MIT" |
| 22 |
SLOT="0" |
| 23 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 24 |
-IUSE="doc test" |
| 25 |
+IUSE="test" |
| 26 |
RESTRICT="!test? ( test )" |
| 27 |
-#RESTRICT="test" |
| 28 |
|
| 29 |
RDEPEND=" |
| 30 |
>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] |
| 31 |
@@ -37,15 +36,9 @@ DEPEND=" |
| 32 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 33 |
>=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})] |
| 34 |
) |
| 35 |
- doc? ( |
| 36 |
- $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') |
| 37 |
- ) |
| 38 |
" |
| 39 |
|
| 40 |
-python_check_deps() { |
| 41 |
- use doc || return 0 |
| 42 |
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 43 |
-} |
| 44 |
+distutils_enable_sphinx docs |
| 45 |
|
| 46 |
python_prepare_all() { |
| 47 |
# skip appengine tests |
| 48 |
@@ -54,13 +47,6 @@ python_prepare_all() { |
| 49 |
distutils-r1_python_prepare_all |
| 50 |
} |
| 51 |
|
| 52 |
-python_compile_all() { |
| 53 |
- if use doc; then |
| 54 |
- emake -C docs SPHINXOPTS= html |
| 55 |
- HTML_DOCS=( docs/_build/html/. ) |
| 56 |
- fi |
| 57 |
-} |
| 58 |
- |
| 59 |
python_test() { |
| 60 |
# FIXME: get tornado ported |
| 61 |
case ${EPYTHON} in |
| 62 |
|
| 63 |
diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild b/dev-python/urllib3/urllib3-1.25.7.ebuild |
| 64 |
index 5795ab0d02a..036868ec5be 100644 |
| 65 |
--- a/dev-python/urllib3/urllib3-1.25.7.ebuild |
| 66 |
+++ b/dev-python/urllib3/urllib3-1.25.7.ebuild |
| 67 |
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 68 |
LICENSE="MIT" |
| 69 |
SLOT="0" |
| 70 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 71 |
-IUSE="brotli doc test" |
| 72 |
+IUSE="brotli test" |
| 73 |
RESTRICT="!test? ( test )" |
| 74 |
|
| 75 |
RDEPEND=" |
| 76 |
@@ -39,15 +39,9 @@ BDEPEND=" |
| 77 |
>=dev-python/trustme-0.5.3[${PYTHON_USEDEP}] |
| 78 |
>=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})] |
| 79 |
) |
| 80 |
- doc? ( |
| 81 |
- $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') |
| 82 |
- ) |
| 83 |
" |
| 84 |
|
| 85 |
-python_check_deps() { |
| 86 |
- use doc || return 0 |
| 87 |
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 88 |
-} |
| 89 |
+distutils_enable_sphinx docs |
| 90 |
|
| 91 |
python_prepare_all() { |
| 92 |
# tests requiring a route to be present |
| 93 |
@@ -70,13 +64,6 @@ python_prepare_all() { |
| 94 |
distutils-r1_python_prepare_all |
| 95 |
} |
| 96 |
|
| 97 |
-python_compile_all() { |
| 98 |
- if use doc; then |
| 99 |
- emake -C docs SPHINXOPTS= html |
| 100 |
- HTML_DOCS=( docs/_build/html/. ) |
| 101 |
- fi |
| 102 |
-} |
| 103 |
- |
| 104 |
python_test() { |
| 105 |
# FIXME: get tornado ported |
| 106 |
case ${EPYTHON} in |
Archives