| 1 |
commit: 85544b5dcfc5a4b97b8a8b595d34abeca820305b |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 10 14:47:55 2019 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 10 14:55:38 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85544b5d |
| 7 |
|
| 8 |
app-admin/ansible: fix missing dep on pexpect |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/693972 |
| 11 |
Package-Manager: Portage-2.3.69, Repoman-2.3.17 |
| 12 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 13 |
|
| 14 |
...nsible-9999.ebuild => ansible-2.7.13-r1.ebuild} | 24 ++++++++-------------- |
| 15 |
...ansible-9999.ebuild => ansible-2.8.4-r1.ebuild} | 9 ++++---- |
| 16 |
app-admin/ansible/ansible-9999.ebuild | 1 + |
| 17 |
3 files changed, 14 insertions(+), 20 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-2.7.13-r1.ebuild |
| 20 |
similarity index 79% |
| 21 |
copy from app-admin/ansible/ansible-9999.ebuild |
| 22 |
copy to app-admin/ansible/ansible-2.7.13-r1.ebuild |
| 23 |
index c35e90491f7..401feb026c7 100644 |
| 24 |
--- a/app-admin/ansible/ansible-9999.ebuild |
| 25 |
+++ b/app-admin/ansible/ansible-2.7.13-r1.ebuild |
| 26 |
@@ -5,18 +5,16 @@ EAPI=7 |
| 27 |
|
| 28 |
PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
| 29 |
|
| 30 |
-inherit distutils-r1 git-r3 eutils |
| 31 |
+inherit distutils-r1 eutils |
| 32 |
|
| 33 |
DESCRIPTION="Model-driven deployment, config management, and command execution framework" |
| 34 |
HOMEPAGE="https://ansible.com/" |
| 35 |
-EGIT_REPO_URI="https://github.com/ansible/ansible.git" |
| 36 |
-EGIT_BRANCH="devel" |
| 37 |
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz" |
| 38 |
|
| 39 |
LICENSE="GPL-3" |
| 40 |
SLOT="0" |
| 41 |
-KEYWORDS="" |
| 42 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" |
| 43 |
IUSE="doc test" |
| 44 |
-RESTRICT="test" |
| 45 |
|
| 46 |
RDEPEND=" |
| 47 |
dev-python/paramiko[${PYTHON_USEDEP}] |
| 48 |
@@ -27,17 +25,14 @@ RDEPEND=" |
| 49 |
dev-python/httplib2[${PYTHON_USEDEP}] |
| 50 |
dev-python/six[${PYTHON_USEDEP}] |
| 51 |
dev-python/netaddr[${PYTHON_USEDEP}] |
| 52 |
+ dev-python/pexpect[${PYTHON_USEDEP}] |
| 53 |
net-misc/sshpass |
| 54 |
virtual/ssh |
| 55 |
" |
| 56 |
DEPEND=" |
| 57 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 58 |
>=dev-python/packaging-16.6[${PYTHON_USEDEP}] |
| 59 |
- doc? ( |
| 60 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
| 61 |
- dev-python/sphinx-notfound-page[${PYTHON_USEDEP}] |
| 62 |
- >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}] |
| 63 |
- ) |
| 64 |
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
| 65 |
test? ( |
| 66 |
${RDEPEND} |
| 67 |
dev-python/nose[${PYTHON_USEDEP}] |
| 68 |
@@ -48,6 +43,9 @@ DEPEND=" |
| 69 |
dev-vcs/git |
| 70 |
)" |
| 71 |
|
| 72 |
+# not included in release tarball |
| 73 |
+RESTRICT="test" |
| 74 |
+ |
| 75 |
python_compile_all() { |
| 76 |
if use doc; then |
| 77 |
cd docs/docsite || die |
| 78 |
@@ -56,11 +54,6 @@ python_compile_all() { |
| 79 |
fi |
| 80 |
} |
| 81 |
|
| 82 |
-python_prepare_all() { |
| 83 |
- rm -fv MANIFEST.in || die |
| 84 |
- distutils-r1_python_prepare_all |
| 85 |
-} |
| 86 |
- |
| 87 |
python_test() { |
| 88 |
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die |
| 89 |
} |
| 90 |
@@ -69,5 +62,6 @@ python_install_all() { |
| 91 |
use doc && local HTML_DOCS=( docs/docsite/_build/html/. ) |
| 92 |
distutils-r1_python_install_all |
| 93 |
|
| 94 |
+ doman docs/man/man1/*.1 |
| 95 |
dodoc -r examples |
| 96 |
} |
| 97 |
|
| 98 |
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-2.8.4-r1.ebuild |
| 99 |
similarity index 90% |
| 100 |
copy from app-admin/ansible/ansible-9999.ebuild |
| 101 |
copy to app-admin/ansible/ansible-2.8.4-r1.ebuild |
| 102 |
index c35e90491f7..b078e69e7bf 100644 |
| 103 |
--- a/app-admin/ansible/ansible-9999.ebuild |
| 104 |
+++ b/app-admin/ansible/ansible-2.8.4-r1.ebuild |
| 105 |
@@ -5,16 +5,15 @@ EAPI=7 |
| 106 |
|
| 107 |
PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
| 108 |
|
| 109 |
-inherit distutils-r1 git-r3 eutils |
| 110 |
+inherit distutils-r1 eutils |
| 111 |
|
| 112 |
DESCRIPTION="Model-driven deployment, config management, and command execution framework" |
| 113 |
HOMEPAGE="https://ansible.com/" |
| 114 |
-EGIT_REPO_URI="https://github.com/ansible/ansible.git" |
| 115 |
-EGIT_BRANCH="devel" |
| 116 |
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz" |
| 117 |
|
| 118 |
LICENSE="GPL-3" |
| 119 |
SLOT="0" |
| 120 |
-KEYWORDS="" |
| 121 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" |
| 122 |
IUSE="doc test" |
| 123 |
RESTRICT="test" |
| 124 |
|
| 125 |
@@ -27,6 +26,7 @@ RDEPEND=" |
| 126 |
dev-python/httplib2[${PYTHON_USEDEP}] |
| 127 |
dev-python/six[${PYTHON_USEDEP}] |
| 128 |
dev-python/netaddr[${PYTHON_USEDEP}] |
| 129 |
+ dev-python/pexpect[${PYTHON_USEDEP}] |
| 130 |
net-misc/sshpass |
| 131 |
virtual/ssh |
| 132 |
" |
| 133 |
@@ -36,7 +36,6 @@ DEPEND=" |
| 134 |
doc? ( |
| 135 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 136 |
dev-python/sphinx-notfound-page[${PYTHON_USEDEP}] |
| 137 |
- >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}] |
| 138 |
) |
| 139 |
test? ( |
| 140 |
${RDEPEND} |
| 141 |
|
| 142 |
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild |
| 143 |
index c35e90491f7..64bfd803760 100644 |
| 144 |
--- a/app-admin/ansible/ansible-9999.ebuild |
| 145 |
+++ b/app-admin/ansible/ansible-9999.ebuild |
| 146 |
@@ -27,6 +27,7 @@ RDEPEND=" |
| 147 |
dev-python/httplib2[${PYTHON_USEDEP}] |
| 148 |
dev-python/six[${PYTHON_USEDEP}] |
| 149 |
dev-python/netaddr[${PYTHON_USEDEP}] |
| 150 |
+ dev-python/pexpect[${PYTHON_USEDEP}] |
| 151 |
net-misc/sshpass |
| 152 |
virtual/ssh |
| 153 |
" |
Archives