summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/ansible')
-rw-r--r--app-admin/ansible/ChangeLog7
-rw-r--r--app-admin/ansible/ansible-1.8.1-r1.ebuild16
-rw-r--r--app-admin/ansible/ansible-9999.ebuild3
3 files changed, 12 insertions, 14 deletions
diff --git a/app-admin/ansible/ChangeLog b/app-admin/ansible/ChangeLog
index 08f920ec8b1d..4985ccdac87f 100644
--- a/app-admin/ansible/ChangeLog
+++ b/app-admin/ansible/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/ansible
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.54 2014/12/02 07:57:26 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.55 2014/12/02 08:23:05 pinkbyte Exp $
+
+ 02 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> ansible-1.8.1-r1.ebuild,
+ ansible-9999.ebuild:
+ Restrict testing, cause it's broken in release tarball. Add missing test
+ dependency on dev-python/mock to live ebuild
*ansible-1.8.1-r1 (02 Dec 2014)
diff --git a/app-admin/ansible/ansible-1.8.1-r1.ebuild b/app-admin/ansible/ansible-1.8.1-r1.ebuild
index 4028b82c3dba..8f0cca51e172 100644
--- a/app-admin/ansible/ansible-1.8.1-r1.ebuild
+++ b/app-admin/ansible/ansible-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.8.1-r1.ebuild,v 1.1 2014/12/02 07:57:26 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.8.1-r1.ebuild,v 1.2 2014/12/02 08:23:05 pinkbyte Exp $
EAPI=5
@@ -15,14 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
+
RDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -30,9 +23,8 @@ RDEPEND="
virtual/ssh
"
-python_test() {
- make tests || die "tests failed"
-}
+# Tests are broken in release tarball
+RESTRICT="test"
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 5c70fcfe255c..14bf7b9f8dcb 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-9999.ebuild,v 1.22 2014/11/30 13:32:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-9999.ebuild,v 1.23 2014/12/02 08:23:05 pinkbyte Exp $
EAPI=5
@@ -21,6 +21,7 @@ IUSE="test"
DEPEND="
test? (
+ dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/passlib[${PYTHON_USEDEP}]
dev-vcs/git