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 67BD51382C5 for ; Mon, 17 May 2021 01:09:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92143E0814; Mon, 17 May 2021 01:09:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7128EE0809 for ; Mon, 17 May 2021 01:09:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 079DC340F2D for ; Mon, 17 May 2021 01:09:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69DB177E for ; Mon, 17 May 2021 01:09:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1621212739.b36fcb064c9d30014e4d77bb350f16dd34436cf5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/sshuttle/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/sshuttle/sshuttle-1.0.5.ebuild X-VCS-Directories: net-proxy/sshuttle/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b36fcb064c9d30014e4d77bb350f16dd34436cf5 X-VCS-Branch: master Date: Mon, 17 May 2021 01:09:01 +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: 55c88f87-616b-4ab0-91ca-5ebd90c55074 X-Archives-Hash: bc04d4d12ce61eb5fa23821f8cba68ae commit: b36fcb064c9d30014e4d77bb350f16dd34436cf5 Author: Sam James gentoo org> AuthorDate: Mon May 17 00:52:19 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 17 00:52:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b36fcb06 net-proxy/sshuttle: fix installation with Sphinx 4.0 Sphinx 4.0 has changed the installation layout for man pages. Closes: https://bugs.gentoo.org/789417 Signed-off-by: Sam James gentoo.org> net-proxy/sshuttle/sshuttle-1.0.5.ebuild | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/net-proxy/sshuttle/sshuttle-1.0.5.ebuild b/net-proxy/sshuttle/sshuttle-1.0.5.ebuild index 888000fa91a..5cc44739a20 100644 --- a/net-proxy/sshuttle/sshuttle-1.0.5.ebuild +++ b/net-proxy/sshuttle/sshuttle-1.0.5.ebuild @@ -32,10 +32,10 @@ CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~N distutils_enable_tests pytest python_prepare_all() { - # don't run tests via setup.py pytest + # Don't run tests via setup.py pytest sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die - # don't require pytest-cov when running tests + # Don't require pytest-cov when running tests sed -i "s/^addopts =/#\0/" setup.cfg || die distutils-r1_python_prepare_all @@ -47,6 +47,14 @@ python_compile_all() { python_install_all() { HTML_DOCS=( docs/_build/html/. ) - doman docs/_build/man/* + + # Sphinx 4.0 changed the layout for installed man pages + # https://bugs.gentoo.org/789417 + if has_version '>=dev-python/sphinx-4.0.0' ; then + doman docs/_build/man/1/* + else + doman docs/_build/man/* + fi + distutils-r1_python_install_all }