Version bump.

Package-Manager: portage-HEAD/cvs/Linux x86_64

4 files changed, 88 insertions, 2 deletions

diff --git a/dev-python/jinja2/ChangeLog b/dev-python/jinja2/ChangeLog
index 6d470ce2bb15..9cc17717fd0b 100644
--- a/dev-python/jinja2/ChangeLog
+++ b/dev-python/jinja2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.40 2010/04/18 16:57:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/ChangeLog,v 1.41 2010/04/20 19:42:17 arfrever Exp $
+
+*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
diff --git a/dev-python/jinja2/Manifest b/dev-python/jinja2/Manifest
index 4fd75a37d2db..e81db691b0b4 100644
--- a/dev-python/jinja2/Manifest
+++ b/dev-python/jinja2/Manifest
@@ -1,10 +1,13 @@
 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.2.1.tar.gz 771552 RMD160 bdee3ef806bc25f9eef388af2529bebdd44c1cf4 SHA1 e6b6ef07ba2e1c463120db134cec477abc4b723b SHA256 b90e99f12c035f67bcf9f865c46bb7048d62fbcadd892f5ae7633a4e53e01df3
 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
 DIST Jinja2-2.4.tar.gz 688892 RMD160 ad3ae297a7f61749c6e92d5298cebe4187279063 SHA1 ddd5436749838ec90e53e3463a21daafe7e21c77 SHA256 767418380bf7ec1701414f9f361ca6c261f705dbb576f52366f7d5ebc1b25f1d
 EBUILD jinja2-2.2.1.ebuild 1731 RMD160 7502b7bc4b4a1f3fdec95be1059def656df5fba4 SHA1 fffc7c136f32b4e940cb134c1b6500a5cd3cf7ef SHA256 3664144512cb7dd48937e2d723ce583bac7dd9a2f6c2100128674fe96eff9d7b
 EBUILD jinja2-2.3.1.ebuild 1754 RMD160 c00d96ee4d676178924958d9f5e89fd1deda8362 SHA1 f6371386ff8fb190f5a1be269a30fe3129f09e5c SHA256 2ebf5422b3ef5e330cd1924a7433b2308bf9b5c8f1ce2d213e004df55e9e054a
+EBUILD jinja2-2.4.1.ebuild 1652 RMD160 894419c74d31d82fd1cd8c61494326c98aff52ce SHA1 2803e58592900d4d881252b6e978d052a5780034 SHA256 a9dd211d83cf0009f101872ef45dd6383d328308c80a57a62d0c44b14cdd4746
 EBUILD jinja2-2.4.ebuild 1513 RMD160 b706a0cdf872f477e0f87a19372d4e59c7ef1f89 SHA1 4c679263d60c2191fd86cb417b4832ce61fac4f0 SHA256 fd60705f553dc676ade7b74855756a2ade790d4bc3635d30f962d0c190560a1c
-MISC ChangeLog 4799 RMD160 a462166a5e3ba1124dcbcb32623e7c7167ffb17c SHA1 43a8e00ab89fadaef21c65914aebdd09848dfb61 SHA256 7dac2ee2d93a4f50cac1c65430f0a274170d3735a3214c4933de01a70f360caf
+MISC ChangeLog 4988 RMD160 62f1f1157762fe411da295ea8f7be655408d9110 SHA1 b7bca33550058451b40f124956cd2e1b80cca2d7 SHA256 2c36c11fe98c633cf4524bedc1cdca82a43e6b81c669bff699198d699b38277e
 MISC metadata.xml 260 RMD160 73b34094a529f5ab0dcf98717fe00e6759dfb397 SHA1 48e84c78c92d7b5cdadb9db94c7c5681158ab498 SHA256 02bf37f6abc119298b0af0cfc3ce295479e514b0c1b39465e2c4e8f1b1628f7c
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
new file mode 100644
index 000000000000..cb6b1de84a71
--- /dev/null
+++ b/dev-python/jinja2/files/jinja2-2.4.1-object_type_repr.patch
@@ -0,0 +1,14 @@
+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.4.1.ebuild b/dev-python/jinja2/jinja2-2.4.1.ebuild
new file mode 100644
index 000000000000..96bdbd280eea
--- /dev/null
+++ b/dev-python/jinja2/jinja2-2.4.1.ebuild
@@ -0,0 +1,63 @@
+# 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.1 2010/04/20 19:42:17 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 ~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_sitedirs
+
+	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
+}