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 98FD41382C5 for ; Tue, 12 May 2020 22:07:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6BF9E0A8A; Tue, 12 May 2020 22:07:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 939CFE0A8A for ; Tue, 12 May 2020 22:07:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 778DC35034F for ; Tue, 12 May 2020 22:07:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A7C218F for ; Tue, 12 May 2020 22:07:33 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1589321240.d26d553656ab42e172b7dfe5b93ddea84911f071.dolsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/buildbot/buildbot-2.7.0.ebuild dev-util/buildbot/buildbot-9999.ebuild X-VCS-Directories: dev-util/buildbot/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: d26d553656ab42e172b7dfe5b93ddea84911f071 X-VCS-Branch: master Date: Tue, 12 May 2020 22:07:33 +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: 8af93a4a-ee5d-4238-b40c-f7a08832d24e X-Archives-Hash: baa066b673d09a1551bf831488a7412a commit: d26d553656ab42e172b7dfe5b93ddea84911f071 Author: Brian Dolbec gentoo org> AuthorDate: Tue May 12 21:58:16 2020 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue May 12 22:07:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26d5536 dev-util/buildbot: Fix dohtml usage, remove doc use flag Docs are missing files for releases, so clean out the ebuild. Update docs deps for 9999.ebuild, but not working yet. Keep "doc" use flag masked for buildbot. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Brian Dolbec gentoo.org> dev-util/buildbot/buildbot-2.7.0.ebuild | 28 +--------------------------- dev-util/buildbot/buildbot-9999.ebuild | 4 +++- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/dev-util/buildbot/buildbot-2.7.0.ebuild b/dev-util/buildbot/buildbot-2.7.0.ebuild index 38c6ccf3ffd..1769ba6f1d1 100644 --- a/dev-util/buildbot/buildbot-2.7.0.ebuild +++ b/dev-util/buildbot/buildbot-2.7.0.ebuild @@ -27,7 +27,7 @@ else KEYWORDS="~amd64 ~amd64-linux ~x86-linux" fi -IUSE="crypt doc docker examples irc test" +IUSE="crypt docker examples irc test" RESTRICT="!test? ( test )" RDEPEND=" @@ -59,14 +59,6 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - doc? ( - >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/sphinx-jinja[${PYTHON_USEDEP}] - ) test? ( >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] dev-python/moto[${PYTHON_USEDEP}] @@ -87,7 +79,6 @@ DEPEND="${RDEPEND} dev-python/service_identity[${PYTHON_USEDEP}] ) )" -# >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] S=${WORKDIR}/${MY_P} [[ ${PV} == *9999 ]] && S=${S}/master @@ -108,28 +99,11 @@ pkg_setup() { The scripts can run as a different user if desired." } -src_compile() { - distutils-r1_src_compile - - if use doc; then - einfo "Generation of documentation" - pushd docs > /dev/null - #'man' target is currently broken - emake html - popd > /dev/null - fi -} - src_install() { distutils-r1_src_install doman docs/buildbot.1 - if use doc; then - dohtml -r docs/_build/html/ - # TODO: install man pages - fi - if use examples; then insinto /usr/share/doc/${PF} doins -r docs/examples diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index 38c6ccf3ffd..cdce9bbe8ff 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -61,11 +61,13 @@ RDEPEND=" DEPEND="${RDEPEND} doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] + =dev-python/mock-2.0.0[${PYTHON_USEDEP}] @@ -126,7 +128,7 @@ src_install() { doman docs/buildbot.1 if use doc; then - dohtml -r docs/_build/html/ + HTML_DOCS=( docs/_build/html/ ) # TODO: install man pages fi