Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/sshuttle/
Date: Fri, 28 May 2021 03:21:18
Message-Id: 1622172056.d8bf21023435bf6a40661890f8891b1ed05b5617.sam@gentoo
1 commit: d8bf21023435bf6a40661890f8891b1ed05b5617
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 28 03:19:40 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri May 28 03:20:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8bf2102
7
8 net-proxy/sshuttle: undo Sphinx 4.0.x workaround
9
10 They've reverted the change upstream in Sphinx 4.0.2.
11
12 See: b36fcb064c9d30014e4d77bb350f16dd34436cf5
13 Closes: https://bugs.gentoo.org/792402
14 Bug: https://bugs.gentoo.org/789417
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 net-proxy/sshuttle/sshuttle-1.0.5.ebuild | 8 +-------
18 1 file changed, 1 insertion(+), 7 deletions(-)
19
20 diff --git a/net-proxy/sshuttle/sshuttle-1.0.5.ebuild b/net-proxy/sshuttle/sshuttle-1.0.5.ebuild
21 index 5cc44739a20..06ad52f2a3b 100644
22 --- a/net-proxy/sshuttle/sshuttle-1.0.5.ebuild
23 +++ b/net-proxy/sshuttle/sshuttle-1.0.5.ebuild
24 @@ -48,13 +48,7 @@ python_compile_all() {
25 python_install_all() {
26 HTML_DOCS=( docs/_build/html/. )
27
28 - # Sphinx 4.0 changed the layout for installed man pages
29 - # https://bugs.gentoo.org/789417
30 - if has_version '>=dev-python/sphinx-4.0.0' ; then
31 - doman docs/_build/man/1/*
32 - else
33 - doman docs/_build/man/*
34 - fi
35 + doman docs/_build/man/*
36
37 distutils-r1_python_install_all
38 }