commit:     9730b699a2d2030ca21df76b0917eec71b4b3604
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 22:34:20 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> 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

Reply via email to