diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-04-21 11:27:38 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-04-21 11:27:38 +0000 |
| commit | 1abb975f5edf19e536e5bbaf6aa3c3924ef240ca (patch) | |
| tree | cf3636c7da01a6c4dac59fe41af13e0fd2a2ad73 /dev-python/mock | |
| parent | Fix wrong BINHOST, reported by ulm. (diff) | |
| download | gentoo-2-1abb975f5edf19e536e5bbaf6aa3c3924ef240ca.tar.gz gentoo-2-1abb975f5edf19e536e5bbaf6aa3c3924ef240ca.tar.bz2 gentoo-2-1abb975f5edf19e536e5bbaf6aa3c3924ef240ca.zip | |
Require unittest2 for Python 2.7 as well, bug #482488.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-python/mock')
| -rw-r--r-- | dev-python/mock/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/mock/mock-1.0.1-r2.ebuild | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-python/mock/ChangeLog b/dev-python/mock/ChangeLog index 4e647fdf14e1..d1b4749345d0 100644 --- a/dev-python/mock/ChangeLog +++ b/dev-python/mock/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/mock # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.75 2014/04/11 02:00:05 sdamashek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.76 2014/04/21 11:27:38 mgorny Exp $ + + 21 Apr 2014; Michał Górny <mgorny@gentoo.org> mock-1.0.1-r2.ebuild: + Require unittest2 for Python 2.7 as well, bug #482488. *mock-1.0.1-r2 (11 Apr 2014) diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild index d2ee79f0f2ec..601951dab64a 100644 --- a/dev-python/mock/mock-1.0.1-r2.ebuild +++ b/dev-python/mock/mock-1.0.1-r2.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/mock/mock-1.0.1-r2.ebuild,v 1.1 2014/04/11 02:00:05 sdamashek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r2.ebuild,v 1.2 2014/04/21 11:27:38 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 ) @@ -18,8 +18,10 @@ IUSE="doc test" # dev-python/unittest2 is not required with Python >=3.2. DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] - virtual/python-unittest2[${PYTHON_USEDEP}] )" + test? ( + dev-python/nose[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2*) + )" RDEPEND="" src_prepare() { |