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 9F8D91396D9 for ; Mon, 20 Nov 2017 01:47:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9247E0F12; Mon, 20 Nov 2017 01:47:31 +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 9F557E0F12 for ; Mon, 20 Nov 2017 01:47:31 +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 8B16333BEC7 for ; Mon, 20 Nov 2017 01:47:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FEE9A0C8 for ; Mon, 20 Nov 2017 01:47:29 +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: <1511142443.f56e082cc2c2960031a34bb45c801ad23465bab8.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage/portage-2.3.13-r1.ebuild sys-apps/portage/portage-2.3.14.ebuild sys-apps/portage/portage-9999.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f56e082cc2c2960031a34bb45c801ad23465bab8 X-VCS-Branch: master Date: Mon, 20 Nov 2017 01:47:29 +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: e6425d62-9321-411a-9c6a-a20cdeebeb09 X-Archives-Hash: c35839fd065722b4fac1c6ee507f99a3 commit: f56e082cc2c2960031a34bb45c801ad23465bab8 Author: Zac Medico gentoo org> AuthorDate: Mon Nov 20 01:34:55 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Nov 20 01:47:23 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56e082c sys-apps/portage: fix -r1 htmldir (bug 638046) Closes: https://bugs.gentoo.org/638046 Package-Manager: Portage-2.3.14, Repoman-2.3.6 sys-apps/portage/portage-2.3.13-r1.ebuild | 14 ++++++++++++-- sys-apps/portage/portage-2.3.14.ebuild | 14 ++++++++++++-- sys-apps/portage/portage-9999.ebuild | 10 ++++++++-- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild index b4ff41814d5..9cd00377973 100644 --- a/sys-apps/portage/portage-2.3.13-r1.ebuild +++ b/sys-apps/portage/portage-2.3.13-r1.ebuild @@ -87,6 +87,10 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all + sed -e "s|user_options = install_data.user_options$|\0 + [\n\ + ('htmldir=', None, 'HTML documentation install directory')]|" -i \ + setup.py || die #638046 + if use native-extensions; then printf "[build_ext]\nportage-ext-modules=true\n" >> \ setup.cfg || die @@ -189,8 +193,14 @@ python_install_all() { distutils-r1_python_install_all local targets=() - use doc && targets+=( install_docbook ) - use epydoc && targets+=( install_epydoc ) + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) # install docs if [[ ${targets[@]} ]]; then diff --git a/sys-apps/portage/portage-2.3.14.ebuild b/sys-apps/portage/portage-2.3.14.ebuild index 7ee7d2c75f3..e0d4b1ef1b3 100644 --- a/sys-apps/portage/portage-2.3.14.ebuild +++ b/sys-apps/portage/portage-2.3.14.ebuild @@ -87,6 +87,10 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all + sed -e "s|user_options = install_data.user_options$|\0 + [\n\ + ('htmldir=', None, 'HTML documentation install directory')]|" -i \ + setup.py || die #638046 + if use native-extensions; then printf "[build_ext]\nportage-ext-modules=true\n" >> \ setup.cfg || die @@ -189,8 +193,14 @@ python_install_all() { distutils-r1_python_install_all local targets=() - use doc && targets+=( install_docbook ) - use epydoc && targets+=( install_epydoc ) + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) # install docs if [[ ${targets[@]} ]]; then diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index c7453d27b01..adb4f2b5bde 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -188,8 +188,14 @@ python_install_all() { distutils-r1_python_install_all local targets=() - use doc && targets+=( install_docbook ) - use epydoc && targets+=( install_epydoc ) + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) # install docs if [[ ${targets[@]} ]]; then