Fix building with Python 3.2 (bug #364521).

(Portage version: 2.2.0_alpha30_p1/cvs/Linux x86_64)

3 files changed, 67 insertions, 8 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/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
 }