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 F07901382C5 for ; Tue, 22 May 2018 22:36:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7091FE09F8; Tue, 22 May 2018 22:34:59 +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 33606E09F8 for ; Tue, 22 May 2018 22:34:59 +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 4F708335C92 for ; Tue, 22 May 2018 22:34:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7340C37 for ; Tue, 22 May 2018 22:34:56 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1527028489.9730b699a2d2030ca21df76b0917eec71b4b3604.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/ansible/ansible-2.5.3-r1.ebuild app-admin/ansible/ansible-9999.ebuild X-VCS-Directories: app-admin/ansible/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 9730b699a2d2030ca21df76b0917eec71b4b3604 X-VCS-Branch: master Date: Tue, 22 May 2018 22:34:56 +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: 32aa6329-217e-425a-9c79-73dbb6098cdb X-Archives-Hash: 8308e3748f032d386e7083e798997e6f commit: 9730b699a2d2030ca21df76b0917eec71b4b3604 Author: Patrice Clement gentoo org> AuthorDate: Tue May 22 22:34:20 2018 +0000 Commit: Patrice Clement gentoo org> CommitDate: Tue May 22 22:34:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9730b699 app-admin/ansible: generate and install documentation using sphinx. Documentation generation and installation is now available when enabling the doc USE flag. Sphinx will generate the exact same website as the one available on http://docs.ansible.com. As to the manual pages installation, they are already installed automatically. Closes: https://bugs.gentoo.org/652376 Package-Manager: Portage-2.3.24, Repoman-2.3.6 ...ansible-9999.ebuild => ansible-2.5.3-r1.ebuild} | 27 ++++++++++++---------- app-admin/ansible/ansible-9999.ebuild | 16 +++++++++---- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-2.5.3-r1.ebuild similarity index 75% copy from app-admin/ansible/ansible-9999.ebuild copy to app-admin/ansible/ansible-2.5.3-r1.ebuild index cbb8b376728..8f63e854644 100644 --- a/app-admin/ansible/ansible-9999.ebuild +++ b/app-admin/ansible/ansible-2.5.3-r1.ebuild @@ -5,17 +5,16 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{5,6} ) -inherit distutils-r1 git-r3 eutils +inherit distutils-r1 eutils versionator DESCRIPTION="Model-driven deployment, config management, and command execution framework" HOMEPAGE="https://ansible.com/" -EGIT_REPO_URI="https://github.com/ansible/ansible.git" -EGIT_BRANCH="devel" +SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="test" +KEYWORDS="~amd64 ~x86 ~x64-macos" +IUSE="doc test" RDEPEND=" dev-python/paramiko[${PYTHON_USEDEP}] @@ -32,6 +31,7 @@ RDEPEND=" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/packaging-16.6[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] @@ -42,20 +42,23 @@ DEPEND=" dev-vcs/git )" -python_prepare_all() { - rm -fv MANIFEST.in || die - distutils-r1_python_prepare_all +# not included in release tarball +RESTRICT="test" + +python_compile_all() { + if use doc; then + cd docs/docsite || die + export CPUS=4 + emake -f Makefile.sphinx html + fi } python_test() { nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die } -python_compile_all() { - emake -j1 docs -} - python_install_all() { + use doc && local HTML_DOCS=( docs/docsite/_build/html/. ) distutils-r1_python_install_all doman docs/man/man1/*.1 diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild index cbb8b376728..0ca97a267cc 100644 --- a/app-admin/ansible/ansible-9999.ebuild +++ b/app-admin/ansible/ansible-9999.ebuild @@ -15,7 +15,7 @@ EGIT_BRANCH="devel" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="test" +IUSE="doc test" RDEPEND=" dev-python/paramiko[${PYTHON_USEDEP}] @@ -32,6 +32,7 @@ RDEPEND=" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/packaging-16.6[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] @@ -42,6 +43,14 @@ DEPEND=" dev-vcs/git )" +python_compile_all() { + if use doc; then + cd docs/docsite || die + export CPUS=4 + emake -f Makefile.sphinx html + fi +} + python_prepare_all() { rm -fv MANIFEST.in || die distutils-r1_python_prepare_all @@ -51,11 +60,8 @@ python_test() { nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die } -python_compile_all() { - emake -j1 docs -} - python_install_all() { + use doc && local HTML_DOCS=( docs/docsite/_build/html/. ) distutils-r1_python_install_all doman docs/man/man1/*.1