commit: 06a590281fea9f16d68bd96d1ee9a3718cdebc37 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Mon Nov 6 05:45:03 2017 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Mon Nov 6 05:47:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a59028
app-admin/ansible: install examples via dodoc bug 635990 Package-Manager: Portage-2.3.8, Repoman-2.3.4 ...sible-9999.ebuild => ansible-2.4.1.0-r1.ebuild} | 44 ++++++++-------------- app-admin/ansible/ansible-9999.ebuild | 29 ++++++-------- 2 files changed, 26 insertions(+), 47 deletions(-) diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-2.4.1.0-r1.ebuild similarity index 53% copy from app-admin/ansible/ansible-9999.ebuild copy to app-admin/ansible/ansible-2.4.1.0-r1.ebuild index 114b173baee..682eaf4749b 100644 --- a/app-admin/ansible/ansible-9999.ebuild +++ b/app-admin/ansible/ansible-2.4.1.0-r1.ebuild @@ -3,69 +3,55 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_5 python3_6 ) +PYTHON_COMPAT=( python2_7 python3_5 ) -inherit distutils-r1 git-r3 +inherit distutils-r1 eutils versionator DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://www.ansible.com/"; -EGIT_REPO_URI="https://github.com/ansible/ansible.git"; -EGIT_BRANCH="devel" +HOMEPAGE="http://ansible.com/"; +SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"; LICENSE="GPL-3" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86 ~x64-macos" IUSE="test" RDEPEND=" - <dev-python/jinja-2.9[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] dev-python/httplib2[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/netaddr[${PYTHON_USEDEP}] - app-text/asciidoc net-misc/sshpass virtual/ssh " - DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/packaging-16.6[${PYTHON_USEDEP}] test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] + <dev-python/mock-1.1[${PYTHON_USEDEP}] dev-python/passlib[${PYTHON_USEDEP}] dev-python/coverage[${PYTHON_USEDEP}] dev-python/unittest2[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] dev-vcs/git -)" + )" -python_prepare_all() { - rm -fv MANIFEST.in || die - distutils-r1_python_prepare_all -} +# not included in release tarball +RESTRICT="test" python_test() { - sed -e "s:pwd_entry.pw_dir:os.environ['HOME']:" \ - -e "s:~%s/local:~%s/${CATEGORY}/${PF}/homedir/local:" \ - -i test/units/test_constants.py || die - - emake tests || die "Tests fail with ${EPYTHON}" -} - -python_compile_all() { - emake -j1 docs + nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die } python_install_all() { distutils-r1_python_install_all - doman docs/man/man1/${PN}*.1 + doman docs/man/man1/*.1 dodoc -r examples } diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild index 114b173baee..258cf6798cf 100644 --- a/app-admin/ansible/ansible-9999.ebuild +++ b/app-admin/ansible/ansible-9999.ebuild @@ -3,12 +3,12 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_5 python3_6 ) +PYTHON_COMPAT=( python2_7 python3_5 ) -inherit distutils-r1 git-r3 +inherit distutils-r1 git-r3 eutils DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://www.ansible.com/"; +HOMEPAGE="http://ansible.com/"; EGIT_REPO_URI="https://github.com/ansible/ansible.git"; EGIT_BRANCH="devel" @@ -18,33 +18,30 @@ KEYWORDS="" IUSE="test" RDEPEND=" - <dev-python/jinja-2.9[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] dev-python/httplib2[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/netaddr[${PYTHON_USEDEP}] - app-text/asciidoc net-misc/sshpass virtual/ssh " - DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/packaging-16.6[${PYTHON_USEDEP}] test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] + <dev-python/mock-1.1[${PYTHON_USEDEP}] dev-python/passlib[${PYTHON_USEDEP}] dev-python/coverage[${PYTHON_USEDEP}] dev-python/unittest2[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] dev-vcs/git -)" + )" python_prepare_all() { rm -fv MANIFEST.in || die @@ -52,11 +49,7 @@ python_prepare_all() { } python_test() { - sed -e "s:pwd_entry.pw_dir:os.environ['HOME']:" \ - -e "s:~%s/local:~%s/${CATEGORY}/${PF}/homedir/local:" \ - -i test/units/test_constants.py || die - - emake tests || die "Tests fail with ${EPYTHON}" + nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die } python_compile_all() { @@ -66,6 +59,6 @@ python_compile_all() { python_install_all() { distutils-r1_python_install_all - doman docs/man/man1/${PN}*.1 + doman docs/man/man1/*.1 dodoc -r examples }
