dev-python/urllib3: Use distutils_enable_sphinx

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index b1598117c52b94425dc7880ec1310d3fc21826b4..cf59c0ffa92f51bf6a07b8aac68cc6e57d356629 100644 (file)
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -15,9 +15,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 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"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
-#RESTRICT="test"
 
 RDEPEND="
        >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
@@ -37,15 +36,9 @@ DEPEND="
                dev-python/pytest[${PYTHON_USEDEP}]
                >=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})]
        )
-       doc? (
-               $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-       )
 "
 
-python_check_deps() {
-       use doc || return 0
-       has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
+distutils_enable_sphinx docs
 
 python_prepare_all() {
        # skip appengine tests
@@ -54,13 +47,6 @@ python_prepare_all() {
        distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-       if use doc; then
-               emake -C docs SPHINXOPTS= html
-               HTML_DOCS=( docs/_build/html/. )
-       fi
-}
-
 python_test() {
        # FIXME: get tornado ported
        case ${EPYTHON} in

diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild b/dev-python/urllib3/urllib3-1.25.7.ebuild
index 5795ab0d02a3761fcede591cca61d8634f8512e2..036868ec5be8acc9b30bdfd880f907a972b23b69 100644 (file)
--- a/dev-python/urllib3/urllib3-1.25.7.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="brotli doc test"
+IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -39,15 +39,9 @@ BDEPEND="
                >=dev-python/trustme-0.5.3[${PYTHON_USEDEP}]
                >=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})]
        )
-       doc? (
-               $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-       )
 "
 
-python_check_deps() {
-       use doc || return 0
-       has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
+distutils_enable_sphinx docs
 
 python_prepare_all() {
        # tests requiring a route to be present
@@ -70,13 +64,6 @@ python_prepare_all() {
        distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-       if use doc; then
-               emake -C docs SPHINXOPTS= html
-               HTML_DOCS=( docs/_build/html/. )
-       fi
-}
-
 python_test() {
        # FIXME: get tornado ported
        case ${EPYTHON} in