summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-12-19 19:45:22 +0000
committerMike Gilbert <floppym@gentoo.org>2014-12-19 19:45:22 +0000
commit2ab0a4c8849564d6842cc4b23043f3dedcd65a61 (patch)
treee68199c7afe41dafdf62b6685990e9f5342c2ac3 /dev-python/testtools
parentVersion bump, fixes bugs 376775, 526192, 376767 (diff)
downloadgentoo-2-2ab0a4c8849564d6842cc4b23043f3dedcd65a61.tar.gz
gentoo-2-2ab0a4c8849564d6842cc4b23043f3dedcd65a61.tar.bz2
gentoo-2-2ab0a4c8849564d6842cc4b23043f3dedcd65a61.zip
Unconditionally depend on unittest2 at run/build time, bug 532720.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/testtools')
-rw-r--r--dev-python/testtools/ChangeLog5
-rw-r--r--dev-python/testtools/testtools-1.2.0.ebuild8
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-python/testtools/ChangeLog b/dev-python/testtools/ChangeLog
index f13eac9cbcf3..abd81f14a38b 100644
--- a/dev-python/testtools/ChangeLog
+++ b/dev-python/testtools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/testtools
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.111 2014/12/16 23:04:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.112 2014/12/19 19:45:22 floppym Exp $
+
+ 19 Dec 2014; Mike Gilbert <floppym@gentoo.org> testtools-1.2.0.ebuild:
+ Unconditionally depend on unittest2 at run/build time, bug 532720.
16 Dec 2014; Ian Delaney <idella4@gentoo.org> testtools-1.1.0.ebuild,
testtools-1.2.0.ebuild:
diff --git a/dev-python/testtools/testtools-1.2.0.ebuild b/dev-python/testtools/testtools-1.2.0.ebuild
index e6ee6362135c..65aec6411102 100644
--- a/dev-python/testtools/testtools-1.2.0.ebuild
+++ b/dev-python/testtools/testtools-1.2.0.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/testtools/testtools-1.2.0.ebuild,v 1.2 2014/12/16 23:04:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.2.0.ebuild,v 1.3 2014/12/19 19:45:22 floppym Exp $
EAPI=5
@@ -21,12 +21,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
IUSE="doc test"
RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
- dev-python/extras[${PYTHON_USEDEP}]"
+ dev-python/extras[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7)
- dev-python/unittest2[${PYTHON_USEDEP}] )"
+ test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
python_compile_all() {
use doc && emake -C doc html