summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/jinja')
-rw-r--r--dev-python/jinja/ChangeLog5
-rw-r--r--dev-python/jinja/jinja-2.7.3.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-python/jinja/ChangeLog b/dev-python/jinja/ChangeLog
index afd66d0ea841..2c58e21cc08a 100644
--- a/dev-python/jinja/ChangeLog
+++ b/dev-python/jinja/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/jinja
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.122 2014/08/19 16:45:18 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.123 2014/08/19 23:31:16 floppym Exp $
+
+ 19 Aug 2014; Mike Gilbert <floppym@gentoo.org> jinja-2.7.3.ebuild:
+ Add blocker on compat slot.
19 Aug 2014; Dirkjan Ochtman <djc@gentoo.org> jinja-2.7.3.ebuild:
Hack python 3.2 compatibility into Jinja 2.7
diff --git a/dev-python/jinja/jinja-2.7.3.ebuild b/dev-python/jinja/jinja-2.7.3.ebuild
index 969bd098b079..fb58b808f625 100644
--- a/dev-python/jinja/jinja-2.7.3.ebuild
+++ b/dev-python/jinja/jinja-2.7.3.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/jinja/jinja-2.7.3.ebuild,v 1.11 2014/08/19 16:45:18 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.7.3.ebuild,v 1.12 2014/08/19 23:31:16 floppym Exp $
EAPI=5
@@ -21,7 +21,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
IUSE="doc examples"
RDEPEND="dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ !dev-python/jinja:compat"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-0.6 )"