From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E6FFF138334 for ; Mon, 25 Nov 2019 12:35:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22A4CE0A80; Mon, 25 Nov 2019 12:35:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8B7BE0A80 for ; Mon, 25 Nov 2019 12:35:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F15D34D390 for ; Mon, 25 Nov 2019 12:35:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 946788D6 for ; Mon, 25 Nov 2019 12:35:31 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1574685319.4f35947dee4e5b3dd50f3590244d5b2db0f7082c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/urllib3/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/urllib3/urllib3-1.24.2.ebuild dev-python/urllib3/urllib3-1.25.7.ebuild X-VCS-Directories: dev-python/urllib3/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4f35947dee4e5b3dd50f3590244d5b2db0f7082c X-VCS-Branch: master Date: Mon, 25 Nov 2019 12:35:31 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f89ce988-9062-4cc8-901b-de2df6b4c0aa X-Archives-Hash: 091574a1a42196a4d7ff9b644bfb5ae6 commit: 4f35947dee4e5b3dd50f3590244d5b2db0f7082c Author: Michał Górny gentoo org> AuthorDate: Mon Nov 25 12:25:23 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Nov 25 12:35:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f35947d dev-python/urllib3: Use distutils_enable_sphinx Signed-off-by: Michał Górny gentoo.org> dev-python/urllib3/urllib3-1.24.2.ebuild | 18 ++---------------- dev-python/urllib3/urllib3-1.25.7.ebuild | 17 ++--------------- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild index b1598117c52..cf59c0ffa92 100644 --- 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 5795ab0d02a..036868ec5be 100644 --- 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