summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Brandt <alunduil@gentoo.org>2014-10-11 21:14:04 +0000
committerAlex Brandt <alunduil@gentoo.org>2014-10-11 21:14:04 +0000
commit90373d9bb9f4ba7c5de31ac2eb959510b216e2b4 (patch)
tree76761f2fd8b80caf9cf09e6f3662213003d8078b /dev-python/pyhamcrest
parentStable for all (diff)
downloadgentoo-2-90373d9bb9f4ba7c5de31ac2eb959510b216e2b4.tar.gz
gentoo-2-90373d9bb9f4ba7c5de31ac2eb959510b216e2b4.tar.bz2
gentoo-2-90373d9bb9f4ba7c5de31ac2eb959510b216e2b4.zip
generalize dependence on dev-python/six
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 11A8217C!)
Diffstat (limited to 'dev-python/pyhamcrest')
-rw-r--r--dev-python/pyhamcrest/ChangeLog5
-rw-r--r--dev-python/pyhamcrest/pyhamcrest-1.8.1.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-python/pyhamcrest/ChangeLog b/dev-python/pyhamcrest/ChangeLog
index a842618952d8..3b25e2aa4a04 100644
--- a/dev-python/pyhamcrest/ChangeLog
+++ b/dev-python/pyhamcrest/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/pyhamcrest
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyhamcrest/ChangeLog,v 1.1 2014/10/11 15:39:46 alunduil Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyhamcrest/ChangeLog,v 1.2 2014/10/11 21:14:04 alunduil Exp $
+
+ 11 Oct 2014; Alex Brandt <alunduil@gentoo.org> pyhamcrest-1.8.1.ebuild:
+ generalize dependence on six
*pyhamcrest-1.8.1 (11 Oct 2014)
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.8.1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.8.1.ebuild
index 88fc4a6cddc5..176a703c2284 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.8.1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.8.1.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/dev-python/pyhamcrest/pyhamcrest-1.8.1.ebuild,v 1.1 2014/10/11 15:39:46 alunduil Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyhamcrest/pyhamcrest-1.8.1.ebuild,v 1.2 2014/10/11 21:14:04 alunduil Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
@@ -20,13 +20,15 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="doc examples numpy test"
-CDEPEND="$(python_gen_cond_dep 'numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )' 'python*')"
+CDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )' 'python*')
+"
DEPEND="
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
${CDEPEND}
dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
)
"
RDEPEND="${CDEPEND}"