[gentoo-commits] gentoo-x86 commit in dev-python/jinja: jinja-2.6.ebuild ChangeLog jinja-2.5.5.ebuild

[Kacper Kowalik (xarthisius)]

xarthisius    12/05/01 08:35:12

  Modified:             jinja-2.6.ebuild ChangeLog
  Removed:              jinja-2.5.5.ebuild
  Log:
  Fix building docs with python3 wrt #410873 by Ian Abbott <ian@××××××.org>. Thanks to Arfrever and Ian Delaney for solution and patch respectively. Drop old
  
  (Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

Revision  Changes    Path
1.13                 dev-python/jinja/jinja-2.6.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild?r1=1.12&r2=1.13

Index: jinja-2.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jinja-2.6.ebuild	10 Mar 2012 17:48:40 -0000	1.12
+++ jinja-2.6.ebuild	1 May 2012 08:35:11 -0000	1.13
@@ -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 @@
 
 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 @@
 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 @@
 	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
 }



1.59                 dev-python/jinja/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/ChangeLog?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/ChangeLog?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/ChangeLog?r1=1.58&r2=1.59

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ChangeLog	10 Mar 2012 17:48:40 -0000	1.58
+++ ChangeLog	1 May 2012 08:35:11 -0000	1.59
@@ -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@g.o> -jinja-2.5.5.ebuild,
+  jinja-2.6.ebuild:
+  Fix building docs with python3 wrt #410873 by Ian Abbott <ian@××××××.org>.
+  Thanks to Arfrever and Ian Delaney for solution and patch respectively. Drop
+  old
 
   10 Mar 2012; Justin Lecher <jlec@g.o> jinja-2.6.ebuild, metadata.xml:
   Move to EAPI=4 and import pypy fixes from progress overlay, thanks Arfrever