app-admin/ansible: install examples via dodoc bug 635990

Package-Manager: Portage-2.3.8, Repoman-2.3.4

diff --git a/app-admin/ansible/ansible-2.4.1.0-r1.ebuild b/app-admin/ansible/ansible-2.4.1.0-r1.ebuild
new file mode 100644 (file)
index 0000000..682eaf4
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.1.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+       dev-python/paramiko[${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}]
+       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-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-vcs/git
+       )"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+       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/*.1
+       dodoc -r examples
+}

diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 114b173baeeef2f77d2b64c8a0e676ba5b9c67b3..258cf6798cfb87f813e6a1141bad9dfd24e26f66 100644 (file)
--- 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
 }