commit:     3ac045ae15028ccc9fe6bc95554d55464ab9e6e6
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 23:53:14 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 23:54:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac045ae

app-admin/ansible: uncap mock for bug 643504

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 ...ansible-9999.ebuild => ansible-2.4.2.0-r1.ebuild} | 20 ++++++--------------
 app-admin/ansible/ansible-9999.ebuild                |  3 +--
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/app-admin/ansible/ansible-9999.ebuild 
b/app-admin/ansible/ansible-2.4.2.0-r1.ebuild
similarity index 78%
copy from app-admin/ansible/ansible-9999.ebuild
copy to app-admin/ansible/ansible-2.4.2.0-r1.ebuild
index 3470c23efa9..346b2f5aea9 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-2.4.2.0-r1.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 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="http://ansible.com/";
-EGIT_REPO_URI="https://github.com/ansible/ansible.git";
-EGIT_BRANCH="devel"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
@@ -36,26 +35,19 @@ DEPEND="
                ${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
        )"
 
-python_prepare_all() {
-       rm -fv MANIFEST.in || die
-       distutils-r1_python_prepare_all
-}
+# not included in release tarball
+RESTRICT="test"
 
 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() {
        distutils-r1_python_install_all
 

diff --git a/app-admin/ansible/ansible-9999.ebuild 
b/app-admin/ansible/ansible-9999.ebuild
index 3470c23efa9..9e8e5bb04c6 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,6 @@ DEPEND="
                ${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}]

Reply via email to