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 5E5671396D9 for ; Mon, 20 Nov 2017 01:45:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89890E0F12; Mon, 20 Nov 2017 01:45:02 +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 60876E0F12 for ; Mon, 20 Nov 2017 01:45:01 +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 727D533BEC7 for ; Mon, 20 Nov 2017 01:45:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 093ADA0EB for ; Mon, 20 Nov 2017 01:44:59 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1511142203.6c1bfe7aad832a794c84792aa7bdfc1cb7767773.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: / X-VCS-Repository: proj/portage X-VCS-Files: setup.py X-VCS-Directories: / X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6c1bfe7aad832a794c84792aa7bdfc1cb7767773 X-VCS-Branch: master Date: Mon, 20 Nov 2017 01:44:59 +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-Archives-Salt: 9ff8ff64-677c-4df1-86fa-91c942e5c2a0 X-Archives-Hash: 9cc332fbeef6ec8115514896d5a58fa6 commit: 6c1bfe7aad832a794c84792aa7bdfc1cb7767773 Author: Zac Medico gentoo org> AuthorDate: Mon Nov 20 01:37:47 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Nov 20 01:43:23 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6c1bfe7a setup.py: add htmldir opt to install_*doc* (bug 638046) The htmldir option is needed so that python_install_all can override the htmldir (it needs to be overridden in order to install docs in /usr/share/doc/${PF} which may include an ebuild revision like -r1). Bug: https://bugs.gentoo.org/638046 setup.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index cc7bbcf4f..d25a8a4c9 100755 --- a/setup.py +++ b/setup.py @@ -173,7 +173,9 @@ class epydoc(Command): class install_docbook(install_data): """ install_data for docbook docs """ - user_options = install_data.user_options + user_options = install_data.user_options + [ + ('htmldir=', None, "HTML documentation install directory"), + ] def initialize_options(self): install_data.initialize_options(self) @@ -195,7 +197,9 @@ class install_docbook(install_data): class install_epydoc(install_data): """ install_data for epydoc docs """ - user_options = install_data.user_options + user_options = install_data.user_options + [ + ('htmldir=', None, "HTML documentation install directory"), + ] def initialize_options(self): install_data.initialize_options(self)