Support Python 3.

Package-Manager: portage-15417-svn/cvs/Linux x86_64

4 files changed, 104 insertions, 13 deletions

diff --git a/dev-python/jinja2/ChangeLog b/dev-python/jinja2/ChangeLog
index c6c11baeae8f..9f72eba9a115 100644
--- a/dev-python/jinja2/ChangeLog
+++ b/dev-python/jinja2/ChangeLog
@@ -1,6 +1,10 @@
 # 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.33 2010/02/21 11:35:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/ChangeLog,v 1.34 2010/02/21 16:06:15 arfrever Exp $
+
+  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)
 
diff --git a/dev-python/jinja2/Manifest b/dev-python/jinja2/Manifest
index 05921c3d63be..4d23101846fc 100644
--- a/dev-python/jinja2/Manifest
+++ b/dev-python/jinja2/Manifest
@@ -1,8 +1,9 @@
+AUX jinja2-2.3.1-python-3.patch 1832 RMD160 55ef4dac02be3fb11f9e8d222c46d49fd5d1ef59 SHA1 c58ea05910dd41e853f601b2ef2a70e913626537 SHA256 91953e320b219949ee0d15f66311e7ff33ebadbf8d46a0ffd8de8e7299e35653
 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.3.tar.gz 675996 RMD160 6988ecf0115dd7829eac7c2e4b5d5bd1a17b6c8e SHA1 556e9eacdf79961e6f2eb938b2c2299e342d49f5 SHA256 58a257e26a53919058a27eb9aa3d74e29d5983dba82290fc1c1898f4ea249535
 EBUILD jinja2-2.2.1.ebuild 1731 RMD160 7502b7bc4b4a1f3fdec95be1059def656df5fba4 SHA1 fffc7c136f32b4e940cb134c1b6500a5cd3cf7ef SHA256 3664144512cb7dd48937e2d723ce583bac7dd9a2f6c2100128674fe96eff9d7b
-EBUILD jinja2-2.3.1.ebuild 1707 RMD160 a8d8864b851bab2d1d88b2069a6c8c93a432f320 SHA1 1947c8e94ba874fe0990ce7ab60443a39e9ed4ee SHA256 262ad47cd5e9e5c406ab78c06b40a59f9de1c783fcf07afd008c1ea68963c770
+EBUILD jinja2-2.3.1.ebuild 1716 RMD160 48b48fbaf6bc1c4a86a8cce950075a28cc7b87b9 SHA1 b795718ddc1408ccd0037e57dd35505299bd92aa SHA256 d2e1b9921a98e05cbdd0ff2926b73fcaa13edb10438041b6b33afe333399de80
 EBUILD jinja2-2.3.ebuild 1723 RMD160 15e4bd717f9620dc0be848b6ad7a82736254b078 SHA1 3d3fb7b070a48ed52647be64398cd25d2b46ca6e SHA256 2955afdc7b29c90aa8d4a1e6203e6af3cf45b2fbaebc45f3b7dff84d55cb91dd
-MISC ChangeLog 3967 RMD160 44a4073899cac47d482c646c4c72ba1ffc71d8d7 SHA1 148d6d60a02ec6d2a58457f6b164fa8d58208fda SHA256 df9ae4d375c26d98d5129dbc2e0c4f0312be4213af048a9412934ec41926d5a3
+MISC ChangeLog 4121 RMD160 0eb4d3585a779b254a3339b121f8ca9b8f92f1f3 SHA1 c4d6f33b5b338b10cabfe4c036d2718b3fe70313 SHA256 a0976831435d4192f4f769b27df70f1d143e250f50e41c2541f37e9175bbec50
 MISC metadata.xml 260 RMD160 73b34094a529f5ab0dcf98717fe00e6759dfb397 SHA1 48e84c78c92d7b5cdadb9db94c7c5681158ab498 SHA256 02bf37f6abc119298b0af0cfc3ce295479e514b0c1b39465e2c4e8f1b1628f7c
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
new file mode 100644
index 000000000000..fd161a07753c
--- /dev/null
+++ b/dev-python/jinja2/files/jinja2-2.3.1-python-3.patch
@@ -0,0 +1,84 @@
+--- 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/jinja2-2.3.1.ebuild b/dev-python/jinja2/jinja2-2.3.1.ebuild
index 00a1c4447c96..4079dc4dfb94 100644
--- a/dev-python/jinja2/jinja2-2.3.1.ebuild
+++ b/dev-python/jinja2/jinja2-2.3.1.ebuild
@@ -1,11 +1,12 @@
 # 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.1 2010/02/21 11:35:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/jinja2-2.3.1.ebuild,v 1.2 2010/02/21 16:06:15 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN="Jinja2"
 MY_P="${MY_PN}-${PV}"
@@ -23,13 +24,18 @@ DEPEND="${CDEPEND}
 	doc? ( >=dev-python/sphinx-0.6 )"
 RDEPEND="${CDEPEND}
 	i18n? ( >=dev-python/Babel-0.9.3 )"
-RESTRICT_PYTHON_ABIS="3.*" # test suite doesn't work on 3.x
 
 S="${WORKDIR}/${MY_P}"
 
 DISTUTILS_GLOBAL_OPTIONS=("--with-speedups")
 DOCS="CHANGES"
 
+src_prepare() {
+	distutils_src_prepare
+
+	epatch "${FILESDIR}/${P}-python-3.patch"
+}
+
 src_compile(){
 	distutils_src_compile
 
@@ -39,16 +45,12 @@ src_compile(){
 	fi
 }
 
-src_test(){
-	testing() {
-		PYTHONPATH="$(dir -d build-${PYTHON_ABI}/lib.*)" ${python} setup.py test || die "tests failed"
-	}
-	python_execute_function testing
-}
-
 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