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 A738D138334 for ; Tue, 10 Sep 2019 14:55:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4589E095F; Tue, 10 Sep 2019 14:55:50 +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 A78CBE0951 for ; Tue, 10 Sep 2019 14:55:50 +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 5171C34AF9A for ; Tue, 10 Sep 2019 14:55:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95DEE780 for ; Tue, 10 Sep 2019 14:55:46 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1568127338.85544b5dcfc5a4b97b8a8b595d34abeca820305b.prometheanfire@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.7.13-r1.ebuild app-admin/ansible/ansible-2.8.4-r1.ebuild app-admin/ansible/ansible-9999.ebuild X-VCS-Directories: app-admin/ansible/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 85544b5dcfc5a4b97b8a8b595d34abeca820305b X-VCS-Branch: master Date: Tue, 10 Sep 2019 14:55:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a19ba4a3-5466-42db-b190-398cd956666e X-Archives-Hash: 332de009a66cb17722b410760dae1e59 commit: 85544b5dcfc5a4b97b8a8b595d34abeca820305b Author: Matthew Thode gentoo org> AuthorDate: Tue Sep 10 14:47:55 2019 +0000 Commit: Matthew Thode gentoo org> CommitDate: Tue Sep 10 14:55:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85544b5d app-admin/ansible: fix missing dep on pexpect Fixes: https://bugs.gentoo.org/693972 Package-Manager: Portage-2.3.69, Repoman-2.3.17 Signed-off-by: Matthew Thode gentoo.org> ...nsible-9999.ebuild => ansible-2.7.13-r1.ebuild} | 24 ++++++++-------------- ...ansible-9999.ebuild => ansible-2.8.4-r1.ebuild} | 9 ++++---- app-admin/ansible/ansible-9999.ebuild | 1 + 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-2.7.13-r1.ebuild similarity index 79% copy from app-admin/ansible/ansible-9999.ebuild copy to app-admin/ansible/ansible-2.7.13-r1.ebuild index c35e90491f7..401feb026c7 100644 --- a/app-admin/ansible/ansible-9999.ebuild +++ b/app-admin/ansible/ansible-2.7.13-r1.ebuild @@ -5,18 +5,16 @@ EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) -inherit distutils-r1 git-r3 eutils +inherit distutils-r1 eutils 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="" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" IUSE="doc test" -RESTRICT="test" RDEPEND=" dev-python/paramiko[${PYTHON_USEDEP}] @@ -27,17 +25,14 @@ RDEPEND=" dev-python/httplib2[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/netaddr[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] net-misc/sshpass virtual/ssh " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-notfound-page[${PYTHON_USEDEP}] - >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}] - ) + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] @@ -48,6 +43,9 @@ DEPEND=" dev-vcs/git )" +# not included in release tarball +RESTRICT="test" + python_compile_all() { if use doc; then cd docs/docsite || die @@ -56,11 +54,6 @@ python_compile_all() { fi } -python_prepare_all() { - rm -fv MANIFEST.in || die - distutils-r1_python_prepare_all -} - python_test() { nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die } @@ -69,5 +62,6 @@ python_install_all() { use doc && local HTML_DOCS=( docs/docsite/_build/html/. ) 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-2.8.4-r1.ebuild similarity index 90% copy from app-admin/ansible/ansible-9999.ebuild copy to app-admin/ansible/ansible-2.8.4-r1.ebuild index c35e90491f7..b078e69e7bf 100644 --- a/app-admin/ansible/ansible-9999.ebuild +++ b/app-admin/ansible/ansible-2.8.4-r1.ebuild @@ -5,16 +5,15 @@ EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) -inherit distutils-r1 git-r3 eutils +inherit distutils-r1 eutils 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="" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" IUSE="doc test" RESTRICT="test" @@ -27,6 +26,7 @@ RDEPEND=" dev-python/httplib2[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/netaddr[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] net-misc/sshpass virtual/ssh " @@ -36,7 +36,6 @@ DEPEND=" doc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/sphinx-notfound-page[${PYTHON_USEDEP}] - >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}] ) test? ( ${RDEPEND} diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild index c35e90491f7..64bfd803760 100644 --- a/app-admin/ansible/ansible-9999.ebuild +++ b/app-admin/ansible/ansible-9999.ebuild @@ -27,6 +27,7 @@ RDEPEND=" dev-python/httplib2[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/netaddr[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] net-misc/sshpass virtual/ssh "