Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: /
Date: Mon, 20 Nov 2017 01:45:03
Message-Id: 1511142203.6c1bfe7aad832a794c84792aa7bdfc1cb7767773.zmedico@gentoo
1 commit: 6c1bfe7aad832a794c84792aa7bdfc1cb7767773
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 20 01:37:47 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 20 01:43:23 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6c1bfe7a
7
8 setup.py: add htmldir opt to install_*doc* (bug 638046)
9
10 The htmldir option is needed so that python_install_all
11 can override the htmldir (it needs to be overridden in
12 order to install docs in /usr/share/doc/${PF} which may
13 include an ebuild revision like -r1).
14
15 Bug: https://bugs.gentoo.org/638046
16
17 setup.py | 8 ++++++--
18 1 file changed, 6 insertions(+), 2 deletions(-)
19
20 diff --git a/setup.py b/setup.py
21 index cc7bbcf4f..d25a8a4c9 100755
22 --- a/setup.py
23 +++ b/setup.py
24 @@ -173,7 +173,9 @@ class epydoc(Command):
25 class install_docbook(install_data):
26 """ install_data for docbook docs """
27
28 - user_options = install_data.user_options
29 + user_options = install_data.user_options + [
30 + ('htmldir=', None, "HTML documentation install directory"),
31 + ]
32
33 def initialize_options(self):
34 install_data.initialize_options(self)
35 @@ -195,7 +197,9 @@ class install_docbook(install_data):
36 class install_epydoc(install_data):
37 """ install_data for epydoc docs """
38
39 - user_options = install_data.user_options
40 + user_options = install_data.user_options + [
41 + ('htmldir=', None, "HTML documentation install directory"),
42 + ]
43
44 def initialize_options(self):
45 install_data.initialize_options(self)