3 files changed, 16 insertions, 88 deletions
diff --git a/dev-python/jinja/ChangeLog b/dev-python/jinja/ChangeLog
index 141869135657..e5998f4c15a3 100644
--- a/dev-python/jinja/ChangeLog
+++ b/dev-python/jinja/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/jinja
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.58 2012/03/10 17:48:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.59 2012/05/01 08:35:11 xarthisius Exp $
+
+  01 May 2012; Kacper Kowalik <xarthisius@gentoo.org> -jinja-2.5.5.ebuild,
+  jinja-2.6.ebuild:
+  Fix building docs with python3 wrt #410873 by Ian Abbott <ian@abbott.org>.
+  Thanks to Arfrever and Ian Delaney for solution and patch respectively. Drop
+  old
 
   10 Mar 2012; Justin Lecher <jlec@gentoo.org> jinja-2.6.ebuild, metadata.xml:
   Move to EAPI=4 and import pypy fixes from progress overlay, thanks Arfrever
diff --git a/dev-python/jinja/jinja-2.5.5.ebuild b/dev-python/jinja/jinja-2.5.5.ebuild
deleted file mode 100644
index 2d0f0fa1f8e8..000000000000
--- a/dev-python/jinja/jinja-2.5.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.5.5.ebuild,v 1.12 2012/02/21 04:11:11 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_PN="Jinja2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure python."
-HOMEPAGE="http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc examples i18n vim-syntax"
-
-RDEPEND="dev-python/markupsafe
-	dev-python/setuptools
-	i18n? ( >=dev-python/Babel-0.9.3 )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6 )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES"
-PYTHON_MODNAME="jinja2"
-
-set_global_options() {
-	if [[ "$(python_get_implementation)" != "Jython" ]]; then
-		DISTUTILS_GLOBAL_OPTIONS=("--with-debugsupport")
-	else
-		DISTUTILS_GLOBAL_OPTIONS=()
-	fi
-}
-
-distutils_src_compile_pre_hook() {
-	set_global_options
-}
-
-src_compile(){
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		cd docs
-		PYTHONPATH=".." emake html || die "Building of documentation failed"
-	fi
-}
-
-distutils_src_test_pre_hook() {
-	set_global_options
-}
-
-distutils_src_install_pre_hook() {
-	set_global_options
-}
-
-src_install(){
-	distutils_src_install
-	python_clean_installation_image
-
-	if use doc; then
-		dohtml -r docs/_build/html/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "Installation of examples failed"
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ext/Vim/* || die "Installation of Vim syntax files failed"
-	fi
-}
diff --git a/dev-python/jinja/jinja-2.6.ebuild b/dev-python/jinja/jinja-2.6.ebuild
index 93da37ea6f84..73d8c00b664b 100644
--- a/dev-python/jinja/jinja-2.6.ebuild
+++ b/dev-python/jinja/jinja-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild,v 1.12 2012/03/10 17:48:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild,v 1.13 2012/05/01 08:35:11 xarthisius Exp $
 
 EAPI=4
 
@@ -9,8 +9,8 @@ DISTUTILS_SRC_TEST="setup.py"
 
 inherit distutils
 
-MY_PN="Jinja2"
-MY_P="${MY_PN}-${PV}"
+MY_PN=Jinja2
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure python."
 HOMEPAGE="http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2"
@@ -27,7 +27,7 @@ RDEPEND="dev-python/markupsafe
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.6 )"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 DOCS="CHANGES"
 PYTHON_MODNAME="jinja2"
@@ -40,7 +40,11 @@ src_compile(){
 	if use doc; then
 		einfo "Generation of documentation"
 		pushd docs > /dev/null
-		PYTHONPATH=".." emake html
+		if [[ "$(python_get_version -f -l --major)" == "3" ]]; then
+			# https://github.com/mitsuhiko/jinja2/issues/115
+			2to3-$(PYTHON -f --ABI) -nw --no-diffs jinjaext.py || die
+		fi
+		PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib*)" emake html
 		popd > /dev/null
 	fi
 }