Fix building with Python 3.2 (bug #364521).

Package-Manager: portage-2.2.0_alpha30_p1/cvs/Linux x86_64

4 files changed, 90 insertions, 10 deletions

diff --git a/www-apache/mod_wsgi/ChangeLog b/www-apache/mod_wsgi/ChangeLog
index 8debdbb8dda4..86c32867384a 100644
--- a/www-apache/mod_wsgi/ChangeLog
+++ b/www-apache/mod_wsgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_wsgi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/ChangeLog,v 1.29 2011/03/04 17:54:53 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/ChangeLog,v 1.30 2011/04/22 21:58:23 arfrever Exp $
+
+  22 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  mod_wsgi-3.3.ebuild, +files/mod_wsgi-3.3-python-3.2.patch:
+  Fix building with Python 3.2 (bug #364521).
 
   04 Mar 2011; Dirkjan Ochtman <djc@gentoo.org> -mod_wsgi-3.2.ebuild:
   Remove old version.
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index bb59fba55f35..61ea1bb8949b 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70_mod_wsgi.conf 100 RMD160 60c74317eded93c727cc5ebb74e33f1e040d4187 SHA1 cf23e48a59c624cfc021dda43f3d16a899f4be3a SHA256 a4c1b49eb8c6d6609ad8ae8a9f8d6621f9f2bbc2c99addef3e2d6404ac364ed7
+AUX mod_wsgi-3.3-python-3.2.patch 1514 RMD160 a2dcf7eb773269970d5b47849e671e4918a44d8c SHA1 c7b1c4256983ecb206f8d489befc301456cfd49d SHA256 a4f32c4391aeb7c41fe6e0e2becd93981ad4ec7795b61508fe3b466b3c5de7d2
 DIST mod_wsgi-3.3.tar.gz 117930 RMD160 759cf57d691924271fbc45af10596c033c063c89 SHA1 f32d38e5d3ed5de1efd5abefb52678f833dc9166 SHA256 d96e1078990484cfe5579df1e95dc73f009495e9c3f9a066b0983650bd9e3243
-EBUILD mod_wsgi-3.3.ebuild 737 RMD160 f97fc8a939e1845545fc34767ea80f482d03d355 SHA1 afd0318d86568970b0ea825f33a9aadffcb141c8 SHA256 e8dac437393164cdf86c339cd395ec74e5201a4d055cac6d77bc39e8db725f46
-MISC ChangeLog 3717 RMD160 10d32e9327bf1b53188e05423839602a47710b77 SHA1 fd5904de24d18283281dc70ada286259770b4d55 SHA256 22ccc552f90128ddc4fb3cf88ef498949355cdfb92578c4d7b18b873481367b2
+EBUILD mod_wsgi-3.3.ebuild 801 RMD160 cbfc68715573bf2a759cc58194b94d14039689b8 SHA1 52053953eda8b8bef87d5a3e54a00397056607cb SHA256 556d1a54bca96772a53fd2ef18eadc983bc77941501960e8e12a217e0e6aaf0a
+MISC ChangeLog 3903 RMD160 4338abbfc789a071aaebb358b73c41df253f9b0b SHA1 26d1e45801398853a455730be2da88020122d549 SHA256 69a780ae559f0405f01ebe1a0b70abf473fdb2ceb8fff0394ceb700f4ce62ea5
 MISC metadata.xml 259 RMD160 fdfb533f35254e0f704a6c83132a4bd2b65809f9 SHA1 3afaadaec126f2d24b4fe32a5d8870368f5d72e3 SHA256 5aa0df1f4a87632694a5d911aa6efc123c1c80aeb9ddf39d63de7ba9e0de8536
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNsfoMAAoJENgZr6v6gHY0jxYQAMIY1XWpNQ1njlbtaRA0QpnK
+Q7bua6JWkaFKnwhyjbgXRfPQWuV3h83pFkcwgTIR8tEGhzN1NjFS+gmeweAlzoZM
+Djs84xbjOXJrHzPEfbWADfdIEzQTGws/T4/tSzE+lUymFwdd56mVbg5PQpZcrrSf
+y1c0KDFr2cArwn7r+VzaVVdOuarxCN7CmU855ItO3RoCjhasv/IgnV31XglwB1cO
+Egl0eMESeg1y44lyy85FOLpdWP0YsBmV5AYgkolVUEjl9ib0bsPBR4SaZldQf2iK
+3j+yznZj5pBbf6d0Nt7mAudmWLo4BB3w37YRsRtC4gygMLU/XIo3EP7nQXOrjsXE
+ug+2c7xKh73k4ed9XQT31pjWBWnvbVplZQ+d7bGEI5DpL6w3BZf7fl8aa0yapSZR
+RMXi0mTaItq6D+o8ITVF/mpxukdSkreb4KBC2KtgFQRaSBILqH2fMNjMgoNYoX/M
+OaDnuzTx8V7L6TN5dASpnyIg6bNnhz25jfrOfnBth/qo6pjZkjyJcA3fAwGXjUPs
+AbjxJWZShOdAJjT9dyWfaCOXuhBne0gKZhRzYh+fdNNJHQit7/nvEtH4KXBGgAxT
+I090el6vbgZTPA2FxX5dX6T9wfQLedVFGHA1xUv7Gdnq5ILDjZBVRkI9nEH03oXj
+UqBfrSgBdufz1E+OvZ0X
+=y/5E
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_wsgi/files/mod_wsgi-3.3-python-3.2.patch b/www-apache/mod_wsgi/files/mod_wsgi-3.3-python-3.2.patch
new file mode 100644
index 000000000000..2f50954ca856
--- /dev/null
+++ b/www-apache/mod_wsgi/files/mod_wsgi-3.3-python-3.2.patch
@@ -0,0 +1,49 @@
+http://code.google.com/p/modwsgi/source/detail?r=637ee0510a49f5bf80fe49b2ee27158cf01855c6
+
+--- mod_wsgi.c
++++ mod_wsgi.c
+@@ -1,7 +1,7 @@
+ /* vim: set sw=4 expandtab : */
+ 
+ /*
+- * Copyright 2007-2010 GRAHAM DUMPLETON
++ * Copyright 2007-2011 GRAHAM DUMPLETON
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+@@ -3598,7 +3598,11 @@
+      */
+ 
+     if (!wsgi_daemon_pool && self->config->pass_apache_request) {
++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2
++        object = PyCapsule_New(self->r, 0, 0);
++#else
+         object = PyCObject_FromVoidPtr(self->r, 0);
++#endif
+         PyDict_SetItemString(vars, "apache.request_rec", object);
+         Py_DECREF(object);
+     }
+@@ -8369,7 +8373,11 @@
+      */
+ 
+     if (!wsgi_daemon_pool && self->config->pass_apache_request) {
++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2
++        object = PyCapsule_New(self->r, 0, 0);
++#else
+         object = PyCObject_FromVoidPtr(self->r, 0);
++#endif
+         PyDict_SetItemString(vars, "apache.request_rec", object);
+         Py_DECREF(object);
+     }
+@@ -13372,7 +13380,11 @@
+      */
+ 
+     if (!wsgi_daemon_pool && self->config->pass_apache_request) {
++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2
++        object = PyCapsule_New(self->r, 0, 0);
++#else
+         object = PyCObject_FromVoidPtr(self->r, 0);
++#endif
+         PyDict_SetItemString(vars, "apache.request_rec", object);
+         Py_DECREF(object);
+     }
diff --git a/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild b/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild
index 7c56f1e8348b..e30522e0fffa 100644
--- a/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild,v 1.4 2010/10/15 19:19:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/mod_wsgi-3.3.ebuild,v 1.5 2011/04/22 21:58:23 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="*"
+PYTHON_USE_WITH="threads"
 
-inherit apache-module
+inherit apache-module eutils python
 
 DESCRIPTION="An Apache2 module for running Python WSGI applications."
 HOMEPAGE="http://code.google.com/p/modwsgi/"
@@ -15,8 +17,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.3[threads]"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND=""
 
 APACHE2_MOD_CONF="70_${PN}"
 APACHE2_MOD_DEFINE="WSGI"
@@ -25,10 +27,14 @@ DOCFILES="README"
 
 need_apache2
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python-3.2.patch"
+}
+
 src_configure() {
 	econf --with-apxs=${APXS}
 }
 
 src_compile() {
-	emake || die "emake failed"
+	default
 }