From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 21 May 2010 20:53:40 +0000 (+0000) Subject: dev-python/jinja2 renamed to dev-python/jinja. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79b0cfdbf591e736a06616dc067f74321b285825;p=gentoo.git dev-python/jinja2 renamed to dev-python/jinja. --- diff --git a/dev-python/jinja2/ChangeLog b/dev-python/jinja2/ChangeLog deleted file mode 100644 index 9c98e4910956..000000000000 --- a/dev-python/jinja2/ChangeLog +++ /dev/null @@ -1,162 +0,0 @@ -# ChangeLog for dev-python/jinja2 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/ChangeLog,v 1.44 2010/05/19 19:54:48 armin76 Exp $ - - 19 May 2010; Raúl Porcel jinja2-2.3.1.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #310665 - - 11 May 2010; Brent Baude jinja2-2.3.1.ebuild: - stable ppc64, bug 310665 - - 30 Apr 2010; Fabian Groffen jinja2-2.4.1.ebuild: - Marked ~x64-macos (bug #316787) and ~ppc-macos - -*jinja2-2.4.1 (20 Apr 2010) - - 20 Apr 2010; Arfrever Frehtes Taifersar Arahesis - +jinja2-2.4.1.ebuild, +files/jinja2-2.4.1-object_type_repr.patch: - Version bump. - - 18 Apr 2010; jinja2-2.3.1.ebuild: - ppc stable #310665 - -*jinja2-2.4 (13 Apr 2010) - - 13 Apr 2010; Dirkjan Ochtman +jinja2-2.4.ebuild: - Version bump to 2.4. - - 09 Apr 2010; Dirkjan Ochtman jinja2-2.3.1.ebuild: - amd64 stable, bug 310665 - - 05 Apr 2010; Pawel Hajdan jr jinja2-2.3.1.ebuild: - x86 stable wrt bug #310665 - - 02 Apr 2010; Jeroen Roovers jinja2-2.3.1.ebuild: - Stable for HPPA (bug #310665). - - 21 Feb 2010; Arfrever Frehtes Taifersar Arahesis - 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 - 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 +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 +jinja2-2.3.ebuild: - Version bump to 2.3. - - 14 Nov 2009; Raúl Porcel jinja2-2.2.1.ebuild: - ia64/s390/sh/sparc stable wrt #287618 - - 10 Nov 2009; Brent Baude jinja2-2.2.1.ebuild: - Marking jinja2-2.2.1 ppc64 for bug 287618 - - 30 Oct 2009; Markus Meier jinja2-2.2.1.ebuild: - arm stable, bug #287618 - - 18 Oct 2009; Tobias Klausmann jinja2-2.2.1.ebuild: - Stable on alpha, bug #287618 - - 12 Oct 2009; Jeroen Roovers jinja2-2.2.1.ebuild: - Stable for HPPA (bug #287618). - - 11 Oct 2009; Markus Meier jinja2-2.2.1.ebuild: - amd64/x86 stable, bug #287618 - - 10 Oct 2009; Fabian Groffen jinja2-2.2.1.ebuild: - Merge from Prefix - - 10 Oct 2009; nixnut jinja2-2.2.1.ebuild: - ppc stable #287618 - - 24 Sep 2009; Christian Faulhammer - jinja2-2.1.1-r1.ebuild: - stable x86, bug 285307 - - 22 Sep 2009; Arfrever Frehtes Taifersar Arahesis - jinja2-2.2.1.ebuild: - Update dependencies (bug #285939). - - 21 Sep 2009; Tom Gall jinja2-2.2.1.ebuild, - jinja2-2.1.1-r1.ebuild: - keywording for ppc64 - - 17 Sep 2009; Mounir Lamouri jinja2-2.2.1.ebuild: - Keywording for ppc. Bug 263948 - -*jinja2-2.2.1 (15 Sep 2009) - - 15 Sep 2009; Arfrever Frehtes Taifersar Arahesis - -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 - -jinja2-2.0.ebuild, -jinja2-2.1.ebuild, +jinja2-2.2.ebuild: - Version bump. - - 10 Aug 2009; Arfrever Frehtes Taifersar Arahesis - jinja2-2.1.1-r1.ebuild: - Set SUPPORT_PYTHON_ABIS. - - 09 Aug 2009; Raúl Porcel jinja2-2.1.1.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #278978 - - 28 Jul 2009; Jeroen Roovers jinja2-2.1.1.ebuild: - Stable for HPPA (bug #278978). - -*jinja2-2.1.1-r1 (13 Jul 2009) - - 13 Jul 2009; Jesus Rivero - +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 jinja2-2.1.1.ebuild: - keyword ~x86-fbsd - - 10 Jun 2009; Raúl Porcel jinja2-2.1.1.ebuild: - Add ~alpha - - 21 May 2009; Raúl Porcel jinja2-2.1.1.ebuild: - Add ~arm/~sh/~sparc - - 17 May 2009; Raúl Porcel jinja2-2.1.1.ebuild: - Add ~s390 - - 14 May 2009; Jeroen Roovers jinja2-2.1.1.ebuild: - Marked ~hppa (bug #233554). - - 15 Apr 2009; Markus Meier jinja2-2.1.1.ebuild: - amd64/x86 stable, bug #261887 - - 02 Apr 2009; Raúl Porcel jinja2-2.1.1.ebuild: - Add ~ia64 wrt #263948 - -*jinja2-2.1.1 (24 Jan 2009) - - 24 Jan 2009; Patrick Lauer +jinja2-2.1.1.ebuild: - Bump to 2.1.1, fixes #255445 - -*jinja2-2.1 (06 Dec 2008) - - 06 Dec 2008; Patrick Lauer +jinja2-2.1.ebuild: - Bumping to 2.1, closing #248752 - - 18 Nov 2008; Jeremy Olexa jinja2-2.0.ebuild: - add ~amd64, bug #246605 - -*jinja2-2.0 (24 Oct 2008) - - 24 Oct 2008; Jesus Rivero - +files/jinja2-2.0_no_docs.patch, +metadata.xml, +jinja2-2.0.ebuild: - Initial commit. Bug #237036 - diff --git a/dev-python/jinja2/Manifest b/dev-python/jinja2/Manifest deleted file mode 100644 index 8a7e19508fb0..000000000000 --- a/dev-python/jinja2/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX jinja2-2.3.1-python-3.2.patch 454 RMD160 80c271131fb7ed7cd182d8226abd710a92540da4 SHA1 05024ddc85297cde6bbf3861fac468df152f9f41 SHA256 0e7babebbf9cd10b3f878dc17872aa436116535db4ccc8f5702f20cdd076728f -AUX jinja2-2.3.1-python-3.patch 1832 RMD160 55ef4dac02be3fb11f9e8d222c46d49fd5d1ef59 SHA1 c58ea05910dd41e853f601b2ef2a70e913626537 SHA256 91953e320b219949ee0d15f66311e7ff33ebadbf8d46a0ffd8de8e7299e35653 -AUX jinja2-2.4.1-object_type_repr.patch 472 RMD160 55e45fecbc94267b16b21af9e2022c7c9455a67c SHA1 f105304d083511b7ea43d29ab4bedc61285bb1fe SHA256 945334f92de362e2ea58247060b78710655c3607f1d20556d2f7906c8413f0e1 -DIST Jinja2-2.3.1.tar.gz 428770 RMD160 0e8331aa7af21b2b14d8983d4e3f96236d810ece SHA1 86db46f3f7afbc7b7fa27497359b498de07be0ec SHA256 012dad09654e76ccb2e1bddbddb8073009b42cd4a92021b6206db69e616bd66c -DIST Jinja2-2.4.1.tar.gz 689032 RMD160 5bd2d475e2b57963cc2a64874e9caa6dd73115cf SHA1 9c9ffd0002cbe11f0c5f86731a6920fb1485f44f SHA256 a90b3f18ccbb50c0a0fb3eaff23d60b7664e3e447c676a2cd21459a257574b38 -EBUILD jinja2-2.3.1.ebuild 1748 RMD160 55c94ed64582e2c8569650f5d2c732a6d6651178 SHA1 7b0ff59de2e1abf80057184ed6aba0db347c3704 SHA256 2a719d38d71509fc3c9ef07bb28dd7d857c786dd786dd095e00d659111ed8254 -EBUILD jinja2-2.4.1.ebuild 1684 RMD160 2f74db3ff4519be2399221dffdc357b5546f0576 SHA1 bda2e17270596294e7d131f551268646ef7b21db SHA256 4f2b59ba8f8e6c2d15d914bfbc63eafafeb0c6ba05af80a71bbec8ef44e719ee -MISC ChangeLog 5326 RMD160 b411f4bb2842c0865dbb53494f05cd51c5b79847 SHA1 1094c468601e435bf2bdfe9ac5cbd4209f6dda9a SHA256 42f0c89e952e814e0dd93e406f5d3cb8644c79eb53f358459c5a30d0bfd1604a -MISC metadata.xml 260 RMD160 73b34094a529f5ab0dcf98717fe00e6759dfb397 SHA1 48e84c78c92d7b5cdadb9db94c7c5681158ab498 SHA256 02bf37f6abc119298b0af0cfc3ce295479e514b0c1b39465e2c4e8f1b1628f7c diff --git a/dev-python/jinja2/files/jinja2-2.3.1-python-3.2.patch b/dev-python/jinja2/files/jinja2-2.3.1-python-3.2.patch deleted file mode 100644 index ae5cee1ccea4..000000000000 --- a/dev-python/jinja2/files/jinja2-2.3.1-python-3.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 - 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): diff --git a/dev-python/jinja2/files/jinja2-2.3.1-python-3.patch b/dev-python/jinja2/files/jinja2-2.3.1-python-3.patch deleted file mode 100644 index fd161a07753c..000000000000 --- a/dev-python/jinja2/files/jinja2-2.3.1-python-3.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- 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 - } diff --git a/dev-python/jinja2/files/jinja2-2.4.1-object_type_repr.patch b/dev-python/jinja2/files/jinja2-2.4.1-object_type_repr.patch deleted file mode 100644 index cb6b1de84a71..000000000000 --- a/dev-python/jinja2/files/jinja2-2.4.1-object_type_repr.patch +++ /dev/null @@ -1,14 +0,0 @@ -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__ diff --git a/dev-python/jinja2/jinja2-2.3.1.ebuild b/dev-python/jinja2/jinja2-2.3.1.ebuild deleted file mode 100644 index 65b5fb6faaf6..000000000000 --- a/dev-python/jinja2/jinja2-2.3.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/jinja2-2.3.1.ebuild,v 1.9 2010/05/19 19:54:48 armin76 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}/${P}-python-3.patch" - epatch "${FILESDIR}/${P}-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 -} diff --git a/dev-python/jinja2/jinja2-2.4.1.ebuild b/dev-python/jinja2/jinja2-2.4.1.ebuild deleted file mode 100644 index 59b52e8ff4e6..000000000000 --- a/dev-python/jinja2/jinja2-2.4.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/jinja2-2.4.1.ebuild,v 1.3 2010/05/17 18:25:20 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}/${P}-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 -} diff --git a/dev-python/jinja2/metadata.xml b/dev-python/jinja2/metadata.xml deleted file mode 100644 index aca2dd1d2030..000000000000 --- a/dev-python/jinja2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - python - - Enables support for i18n with dev-python/Babel - -