# ChangeLog for dev-python/jinja
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.11 2010/04/25 14:38:15 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.12 2010/05/21 20:52:00 arfrever Exp $
+
+ 21 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ -jinja2-2.3.1.ebuild, -jinja2-2.4.1.ebuild, +jinja-2.3.1.ebuild,
+ +jinja-2.4.1.ebuild, metadata.xml:
+ dev-python/jinja2 renamed to dev-python/jinja.
+
+ 19 May 2010; Raúl Porcel <armin76@gentoo.org> jinja2-2.3.1.ebuild:
+ alpha/arm/ia64/s390/sh/sparc stable wrt #310665
+
+ 11 May 2010; Brent Baude <ranger@gentoo.org> jinja2-2.3.1.ebuild:
+ stable ppc64, bug 310665
+
+ 30 Apr 2010; Fabian Groffen <grobian@gentoo.org> jinja2-2.4.1.ebuild:
+ Marked ~x64-macos (bug #316787) and ~ppc-macos
25 Apr 2010; Javier Villavicencio <the_paya@gentoo.org> jinja-1.2.ebuild:
Keyworded ~x86-fbsd.
+*jinja2-2.4.1 (20 Apr 2010)
+
+ 20 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ +jinja2-2.4.1.ebuild, +files/jinja2-2.4.1-object_type_repr.patch:
+ Version bump.
+
+ 18 Apr 2010; <nixnut@gentoo.org> jinja2-2.3.1.ebuild:
+ ppc stable #310665
+
+*jinja2-2.4 (13 Apr 2010)
+
+ 13 Apr 2010; Dirkjan Ochtman <djc@gentoo.org> +jinja2-2.4.ebuild:
+ Version bump to 2.4.
+
+ 09 Apr 2010; Dirkjan Ochtman <djc@gentoo.org> jinja2-2.3.1.ebuild:
+ amd64 stable, bug 310665
+
+ 05 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> jinja2-2.3.1.ebuild:
+ x86 stable wrt bug #310665
+
+ 02 Apr 2010; Jeroen Roovers <jer@gentoo.org> jinja2-2.3.1.ebuild:
+ Stable for HPPA (bug #310665).
+
+ 21 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ jinja2-2.3.1.ebuild, +files/jinja2-2.3.1-python-3.2.patch:
+ Fix tests with Python 3.2 (bug #306215).
+
+ 21 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ jinja2-2.3.1.ebuild, +files/jinja2-2.3.1-python-3.patch:
+ Support Python 3.
+
+*jinja2-2.3.1 (21 Feb 2010)
+
+ 21 Feb 2010; Patrick Lauer <patrick@gentoo.org> +jinja2-2.3.1.ebuild:
+ Bump for #306065, thanks to Priit Laes for the test fixes
+
+*jinja2-2.3 (10 Feb 2010)
+
+ 10 Feb 2010; Dirkjan Ochtman <djc@gentoo.org> +jinja2-2.3.ebuild:
+ Version bump to 2.3.
+
+ 14 Nov 2009; Raúl Porcel <armin76@gentoo.org> jinja2-2.2.1.ebuild:
+ ia64/s390/sh/sparc stable wrt #287618
+
+ 10 Nov 2009; Brent Baude <ranger@gentoo.org> jinja2-2.2.1.ebuild:
+ Marking jinja2-2.2.1 ppc64 for bug 287618
+
+ 30 Oct 2009; Markus Meier <maekke@gentoo.org> jinja2-2.2.1.ebuild:
+ arm stable, bug #287618
+
+ 18 Oct 2009; Tobias Klausmann <klausman@gentoo.org> jinja2-2.2.1.ebuild:
+ Stable on alpha, bug #287618
+
+ 12 Oct 2009; Jeroen Roovers <jer@gentoo.org> jinja2-2.2.1.ebuild:
+ Stable for HPPA (bug #287618).
+
+ 11 Oct 2009; Markus Meier <maekke@gentoo.org> jinja2-2.2.1.ebuild:
+ amd64/x86 stable, bug #287618
+
+ 10 Oct 2009; Fabian Groffen <grobian@gentoo.org> jinja2-2.2.1.ebuild:
+ Merge from Prefix
+
+ 10 Oct 2009; nixnut <nixnut@gentoo.org> jinja2-2.2.1.ebuild:
+ ppc stable #287618
+
+ 24 Sep 2009; Christian Faulhammer <fauli@gentoo.org>
+ jinja2-2.1.1-r1.ebuild:
+ stable x86, bug 285307
+
+ 22 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ jinja2-2.2.1.ebuild:
+ Update dependencies (bug #285939).
+
+ 21 Sep 2009; Tom Gall <tgall@gentoo.org> jinja2-2.2.1.ebuild,
+ jinja2-2.1.1-r1.ebuild:
+ keywording for ppc64
+
+ 17 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> jinja2-2.2.1.ebuild:
+ Keywording for ppc. Bug 263948
+
+*jinja2-2.2.1 (15 Sep 2009)
+
+ 15 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ -jinja2-2.2.ebuild, +jinja2-2.2.1.ebuild:
+ Version bump. Build C extensions (bug #284968).
+
+*jinja2-2.2 (13 Sep 2009)
+
+ 13 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ -jinja2-2.0.ebuild, -jinja2-2.1.ebuild, +jinja2-2.2.ebuild:
+ Version bump.
+
+ 10 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ jinja2-2.1.1-r1.ebuild:
+ Set SUPPORT_PYTHON_ABIS.
+
+ 09 Aug 2009; Raúl Porcel <armin76@gentoo.org> jinja2-2.1.1.ebuild:
+ alpha/arm/ia64/s390/sh/sparc stable wrt #278978
+
+ 28 Jul 2009; Jeroen Roovers <jer@gentoo.org> jinja2-2.1.1.ebuild:
+ Stable for HPPA (bug #278978).
+
18 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
jinja-1.2.ebuild:
Add dependency on dev-lang/python[threads] (bug #278207).
+*jinja2-2.1.1-r1 (13 Jul 2009)
+
+ 13 Jul 2009; Jesus Rivero <neurogeek@gentoo.org>
+ +files/jinja2_docs_sphinx.patch, +jinja2-2.1.1-r1.ebuild:
+ Added patch to make Jinja2 compile with doc USE flag. Closes bug #277462.
+ Thanks to plevine457@verizon.net for the heads up. Change to EAPI 2
+
+ 05 Jul 2009; Alexis Ballier <aballier@gentoo.org> jinja2-2.1.1.ebuild:
+ keyword ~x86-fbsd
+
+ 10 Jun 2009; Raúl Porcel <armin76@gentoo.org> jinja2-2.1.1.ebuild:
+ Add ~alpha
+
09 Jun 2009; Raúl Porcel <armin76@gentoo.org> jinja-1.2.ebuild:
sparc stable
23 May 2009; nixnut <nixnut@gentoo.org> jinja-1.2.ebuild:
ppc stable #270089
+ 21 May 2009; Raúl Porcel <armin76@gentoo.org> jinja2-2.1.1.ebuild:
+ Add ~arm/~sh/~sparc
+
+ 17 May 2009; Raúl Porcel <armin76@gentoo.org> jinja2-2.1.1.ebuild:
+ Add ~s390
+
+ 14 May 2009; Jeroen Roovers <jer@gentoo.org> jinja2-2.1.1.ebuild:
+ Marked ~hppa (bug #233554).
+
+ 15 Apr 2009; Markus Meier <maekke@gentoo.org> jinja2-2.1.1.ebuild:
+ amd64/x86 stable, bug #261887
+
15 Apr 2009; Markus Meier <maekke@gentoo.org> jinja-1.2.ebuild:
amd64/x86 stable, bug #261887
+ 02 Apr 2009; Raúl Porcel <armin76@gentoo.org> jinja2-2.1.1.ebuild:
+ Add ~ia64 wrt #263948
+
+*jinja2-2.1.1 (24 Jan 2009)
+
+ 24 Jan 2009; Patrick Lauer <patrick@gentoo.org> +jinja2-2.1.1.ebuild:
+ Bump to 2.1.1, fixes #255445
+
+*jinja2-2.1 (06 Dec 2008)
+
+ 06 Dec 2008; Patrick Lauer <patrick@gentoo.org> +jinja2-2.1.ebuild:
+ Bumping to 2.1, closing #248752
+
+ 18 Nov 2008; Jeremy Olexa <darkside@gentoo.org> jinja2-2.0.ebuild:
+ add ~amd64, bug #246605
+
+*jinja2-2.0 (24 Oct 2008)
+
+ 24 Oct 2008; Jesus Rivero <neurogeek@gentoo.org>
+ +files/jinja2-2.0_no_docs.patch, +metadata.xml, +jinja2-2.0.ebuild:
+ Initial commit. Bug #237036
+
06 Oct 2008; Brent Baude <ranger@gentoo.org> jinja-1.2.ebuild:
Marking jinja-1.2 ~ppc64 for bug 236705
--- /dev/null
+https://bugs.gentoo.org/show_bug.cgi?id=306215
+http://dev.pocoo.org/hg/jinja2-main/rev/2e4934235d58
+
+--- jinja2/testsuite/debug.py
++++ jinja2/testsuite/debug.py
+@@ -30,7 +30,7 @@
+ \{\{ fail\(\) \}\}
+ File ".*?debug.pyc?", line \d+, in <lambda>
+ tmpl\.render\(fail=lambda: 1 / 0\)
+-ZeroDivisionError: int(eger)? division or modulo by zero
++ZeroDivisionError: (int(eger)? )?division (or modulo )?by zero
+ ''')
+
+ def test_syntax_error(self):
--- /dev/null
+--- jinja2/_speedups.c
++++ jinja2/_speedups.c
+@@ -123,7 +123,10 @@
+ PyObject *s = NULL, *rv = NULL, *html;
+
+ /* we don't have to escape integers, bools or floats */
+- if (PyInt_CheckExact(text) || PyLong_CheckExact(text) ||
++ if (PyLong_CheckExact(text) ||
++#if PY_MAJOR_VERSION < 3
++ PyInt_CheckExact(text) ||
++#endif
+ PyFloat_CheckExact(text) || PyBool_Check(text) ||
+ text == Py_None)
+ return PyObject_CallFunctionObjArgs(markup, text, NULL);
+@@ -139,7 +142,11 @@
+ /* otherwise make the object unicode if it isn't, then escape */
+ PyErr_Clear();
+ if (!PyUnicode_Check(text)) {
++#if PY_MAJOR_VERSION >= 3
++ PyObject *unicode = PyObject_Str(text);
++#else
+ PyObject *unicode = PyObject_Unicode(text);
++#endif
+ if (!unicode)
+ return NULL;
+ s = escape_unicode((PyUnicodeObject*)unicode);
+@@ -159,7 +166,11 @@
+ soft_unicode(PyObject *self, PyObject *s)
+ {
+ if (!PyUnicode_Check(s))
++#if PY_MAJOR_VERSION >= 3
++ return PyObject_Str(s);
++#else
+ return PyObject_Unicode(s);
++#endif
+ Py_INCREF(s);
+ return s;
+ }
+@@ -207,15 +218,45 @@
+ {NULL, NULL, 0, NULL} /* Sentinel */
+ };
+
++#if PY_MAJOR_VERSION >= 3
++static struct PyModuleDef module_definition = {
++ PyModuleDef_HEAD_INIT,
++ "jinja2._speedups",
++ NULL,
++ -1,
++ module_methods,
++ NULL,
++ NULL,
++ NULL,
++ NULL
++};
++#endif
++
+
+ #ifndef PyMODINIT_FUNC /* declarations for DLL import/export */
+ #define PyMODINIT_FUNC void
+ #endif
+ PyMODINIT_FUNC
++#if PY_MAJOR_VERSION >= 3
++PyInit__speedups(void)
++#else
+ init_speedups(void)
++#endif
+ {
+ if (!init_constants())
++#if PY_MAJOR_VERSION >= 3
++ return NULL;
++#else
+ return;
++#endif
+
++#if PY_MAJOR_VERSION >= 3
++ PyObject *module = PyModule_Create(&module_definition);
++#else
+ Py_InitModule3("jinja2._speedups", module_methods, "");
++#endif
++
++#if PY_MAJOR_VERSION >= 3
++ return module;
++#endif
+ }
--- /dev/null
+http://dev.pocoo.org/hg/jinja2-main/rev/60f80722840b
+
+--- jinja2/utils.py
++++ jinja2/utils.py
+@@ -236,7 +236,8 @@
+ return 'None'
+ elif obj is Ellipsis:
+ return 'Ellipsis'
+- if obj.__class__.__module__ == '__builtin__':
++ # __builtin__ in 2.x, builtins in 3.x
++ if obj.__class__.__module__ in ('__builtin__', 'builtins'):
+ name = obj.__class__.__name__
+ else:
+ name = obj.__class__.__module__ + '.' + obj.__class__.__name__
--- /dev/null
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.3.1.ebuild,v 1.1 2010/05/21 20:52:00 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils eutils
+
+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="http://pypi.python.org/packages/source/J/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+SLOT="0"
+IUSE="doc examples i18n test"
+
+CDEPEND="dev-python/setuptools"
+DEPEND="${CDEPEND}
+ doc? ( >=dev-python/sphinx-0.6 )"
+RDEPEND="${CDEPEND}
+ i18n? ( >=dev-python/Babel-0.9.3 )"
+
+S="${WORKDIR}/${MY_P}"
+
+DISTUTILS_GLOBAL_OPTIONS=("--with-speedups")
+DOCS="CHANGES"
+
+src_prepare() {
+ distutils_src_prepare
+
+ epatch "${FILESDIR}/jinja2-2.3.1-python-3.patch"
+ epatch "${FILESDIR}/jinja2-2.3.1-python-3.2.patch"
+}
+
+src_compile(){
+ distutils_src_compile
+
+ if use doc; then
+ cd "${S}/docs"
+ PYTHONPATH=.. emake html || die "Building of documentation failed"
+ fi
+}
+
+src_install(){
+ distutils_src_install
+
+ # Don't install C sources.
+ find "${D}"usr/$(get_libdir)/python*/site-packages -name "*.c" | xargs rm -f
+
+ if use doc; then
+ dohtml -r docs/_build/html/* || die "Installation of documentation failed"
+ fi
+
+ if use examples; then
+ # Eliminate .pyc files going into /usr/share
+ find examples -name "*.pyc" -print0 | xargs -0 rm -fr
+
+ insinto "/usr/share/doc/${PF}"
+ doins -r examples || die "Failed to install examples"
+ fi
+}
--- /dev/null
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.4.1.ebuild,v 1.1 2010/05/21 20:52:00 arfrever Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils eutils
+
+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="http://pypi.python.org/packages/source/J/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples i18n test"
+
+RDEPEND="dev-python/setuptools
+ i18n? ( >=dev-python/Babel-0.9.3 )"
+DEPEND="${RDEPEND}
+ doc? ( >=dev-python/sphinx-0.6 )"
+
+S="${WORKDIR}/${MY_P}"
+
+DISTUTILS_GLOBAL_OPTIONS=("--with-speedups")
+DOCS="CHANGES"
+
+src_prepare() {
+ distutils_src_prepare
+ epatch "${FILESDIR}/jinja2-2.4.1-object_type_repr.patch"
+}
+
+src_compile(){
+ distutils_src_compile
+
+ if use doc; then
+ cd docs
+ einfo "Generation of documentation"
+ PYTHONPATH=".." emake html || die "Building of documentation failed"
+ fi
+}
+
+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
+ # Eliminate .pyc files going into /usr/share
+ find examples -name "*.pyc" -print0 | xargs -0 rm -fr
+
+ insinto "/usr/share/doc/${PF}"
+ doins -r examples || die "Failed to install examples"
+ fi
+}
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
+ <use>
+ <flag name='i18n'>Enables support for i18n with <pkg>dev-python/Babel</pkg></flag>
+ </use>
</pkgmetadata>
<use>
<flag name="cheetah">Add optional cheetah support</flag>
<flag name="genshi">Add optional genshi support</flag>
- <flag name="jinja2">Add optional jinja2 support</flag>
+ <flag name="jinja">Add optional jinja support</flag>
<flag name="kid">Add optional kid support</flag>
<flag name="mako">Add optional mako support</flag>
<flag name="myghty">Add optional myghty support</flag>
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylons/pylons-0.9.7.ebuild,v 1.3 2010/03/17 03:33:26 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylons/pylons-0.9.7.ebuild,v 1.4 2010/05/21 20:59:57 arfrever Exp $
EAPI="1"
SRC_URI="http://cheeseshop.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-IUSE="cheetah genshi jinja2 kid +mako myghty"
+IUSE="cheetah genshi jinja kid +mako myghty"
RDEPEND=">=dev-python/routes-1.10.3
>=dev-python/webhelpers-0.6.4
>=dev-python/turbocheetah-0.9.5
)
genshi? ( >=dev-python/genshi-0.4.4 )
- jinja2? ( dev-python/jinja2 )
+ jinja? ( >=dev-python/jinja-2 )
kid? (
>=dev-python/kid-0.9
>=dev-python/turbokid-0.9.1
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-0.6.5.ebuild,v 1.8 2010/05/11 21:13:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-0.6.5.ebuild,v 1.9 2010/05/21 20:56:18 arfrever Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
IUSE="doc test latex"
RDEPEND=">=dev-python/pygments-0.8
- >=dev-python/jinja2-2.1
+ >=dev-python/jinja-2.1
>=dev-python/docutils-0.4
latex? ( dev-texlive/texlive-latexextra )"
DEPEND="${RDEPEND}
projects / gentoo.git / commitdiff