Fix building with Python 3.2 (bug #343385).

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

4 files changed, 88 insertions, 7 deletions

diff --git a/dev-python/greenlet/ChangeLog b/dev-python/greenlet/ChangeLog
index 4a3f16343972..84a3ef17ac10 100644
--- a/dev-python/greenlet/ChangeLog
+++ b/dev-python/greenlet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/greenlet
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/ChangeLog,v 1.1 2010/10/18 15:14:07 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/ChangeLog,v 1.2 2011/04/09 20:31:07 arfrever Exp $
+
+  09 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  greenlet-0.3.1.ebuild, +files/greenlet-0.3.1-python-3.2.patch:
+  Fix building with Python 3.2 (bug #343385).
 
 *greenlet-0.3.1 (18 Oct 2010)
 
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 812177d9c25e..ad955189c66a 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX greenlet-0.3.1-python-3.2.patch 1383 RMD160 40112501e154690d957ebe3c5ffe1ac410bbf7b9 SHA1 6e11397bbc4642619a9b8cfca2dfa9d4f52d9ce7 SHA256 31bfdfaee6f8ab51394063c0500fe0c13da9a5aa6cbd5bbe88d862221cccb753
 DIST greenlet-0.3.1.tar.gz 39037 RMD160 2a83538cea206b9aed03773331311ddbaf8616a5 SHA1 7e42d736dfbbd2f0b5ab7f78dc6fb65d966ca21e SHA256 63a0a9b3a59d5413741f81d021fc6c292364953ea8dddd71ac129d77b9b143da
-EBUILD greenlet-0.3.1.ebuild 641 RMD160 cd9ad11dba63aac92c4b474b482e4cce0569396e SHA1 c99a41dac3d1a096e257e49c311df3dc8e5b9523 SHA256 63afd00b3e25730035b65927119d06341740526f8670dd02706a70260d190110
-MISC ChangeLog 401 RMD160 0d977f05ce412e44610743b7e30b2287fa1e6e2d SHA1 edd8beb2d3ce088b0f695c063c1cdc5bf58f9ef6 SHA256 bdd508b293b8edd9fc0bd5533919844f0ad76d29cb6ac592bcf1f87a1c7ce2c9
+EBUILD greenlet-0.3.1.ebuild 766 RMD160 c2985924f55aae7ed0ae15cb0a87286b0e022140 SHA1 1a8001ef11eae0f4c63f6811c0d2a50324828f74 SHA256 a4ee21f5b317836dd434c98442704c912e3bc00aad3a032313964db01d03e212
+MISC ChangeLog 586 RMD160 91a12cf562b7157436fddfa04302e5f862c5a4ed SHA1 43a7a9d6d553e2ee2c04d8a67920c457cbacdd9e SHA256 c79d2eb6c4f14511de640295bbbda9553f7e178b1b45fe50f28307a15c39b2d4
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNoMIdAAoJENgZr6v6gHY0vwQQAKB/9XqWIs5Z9SKQyqXtrlTj
+Ar+vpa2+wBbniWOW1oh5cACzNC6fhjspAp194rF28EPGvLA4zazjzhJrnbFfFoIo
+NDe5qCjOM0rFnSm9IYPNQY8F0cdvwEhDouE/tpzdrbtXzEmWcvb2YCYziU0SQWVU
+O2b6ZLPMmelxaA0Ic+CEWdG7b753Zgc9j6F3FPeDq1t1RuWEc9zCGuK4DLyavX3N
+UTKwRxcDLKc2lEMVREWqi9k1pZvaW/k5q2tEavNR19Hpnz5Lb9IVVszeRjGYZj4c
+al7U/qATFPu97GnFWkPpwjqybhTDHa2SJT6LP6RkqRmI8GeiuWEEUe0++QnU+ttZ
+ghShNGFGcEDl6tpi4jhaf1bwTAPyqtCuUXhfv1mLb+rc4HeFf12jVUcCxnJjjmCh
+1AvJX2/awitBdpECYrCvx3ZOYXXtvX//vPPDVSdZuiVdKqsprAOmdIj2Hecn++JE
+GsM9Yb2jKodrTYJebmclvtpT6fr9f8ht+hZkW7ztI6NxHHrOz18cGbfuYVUZ/YFf
+tSAoP9su9LpXm6y+HYpoSf9Cn0m9MixQCqoNV+uFIl9VazEnZHjHhyhsqFzSQbNc
++BXoeVLQ4ZAewyCkgtSei9M2CIQEdqmnw+hf1yNVW91D173EyVBtX6iutWovfIVT
+b29hTWsM3vMNW5J1mW2J
+=QesK
+-----END PGP SIGNATURE-----
diff --git a/dev-python/greenlet/files/greenlet-0.3.1-python-3.2.patch b/dev-python/greenlet/files/greenlet-0.3.1-python-3.2.patch
new file mode 100644
index 000000000000..d4b158b54016
--- /dev/null
+++ b/dev-python/greenlet/files/greenlet-0.3.1-python-3.2.patch
@@ -0,0 +1,50 @@
+https://bitbucket.org/ambroff/greenlet/changeset/f61fffb6feeb
+
+--- greenlet.c
++++ greenlet.c
+@@ -1267,7 +1267,11 @@
+ 	_PyGreenlet_API[PyGreenlet_SetParent_NUM] =
+ 		(void *) PyGreenlet_SetParent;
+ 
++#ifdef GREENLET_USE_PYCAPSULE
++	c_api_object = PyCapsule_New((void *) _PyGreenlet_API, "greenlet._C_API", NULL);
++#else
+ 	c_api_object = PyCObject_FromVoidPtr((void *) _PyGreenlet_API, NULL);
++#endif
+ 	if (c_api_object != NULL)
+ 	{
+ 		PyModule_AddObject(m, "_C_API", c_api_object);
+--- greenlet.h
++++ greenlet.h
+@@ -31,6 +31,10 @@
+ #define PyGreenlet_ACTIVE(op)     (((PyGreenlet*)(op))->stack_start != NULL)
+ #define PyGreenlet_GET_PARENT(op) (((PyGreenlet*)(op))->parent)
+ 
++#if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 7) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 1) || PY_MAJOR_VERSION > 3
++#define GREENLET_USE_PYCAPSULE
++#endif
++
+ /* C API functions */
+ 
+ /* Total number of symbols that are exported */
+@@ -108,6 +112,12 @@
+ 	 _PyGreenlet_API[PyGreenlet_SetParent_NUM])
+ 
+ /* Macro that imports greenlet and initializes C API */
++#ifdef GREENLET_USE_PYCAPSULE
++#define PyGreenlet_Import() \
++{ \
++	_PyGreenlet_API = (void**)PyCapsule_Import("greenlet._C_API", 0); \
++}
++#else
+ #define PyGreenlet_Import() \
+ { \
+ 	PyObject *module = PyImport_ImportModule("greenlet"); \
+@@ -122,6 +132,7 @@
+ 		Py_DECREF(module); \
+ 	} \
+ }
++#endif
+ 
+ #endif /* GREENLET_MODULE */
+ 
diff --git a/dev-python/greenlet/greenlet-0.3.1.ebuild b/dev-python/greenlet/greenlet-0.3.1.ebuild
index 0d4dacd12b57..c52320b084cc 100644
--- a/dev-python/greenlet/greenlet-0.3.1.ebuild
+++ b/dev-python/greenlet/greenlet-0.3.1.ebuild
@@ -1,12 +1,13 @@
-# 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/dev-python/greenlet/greenlet-0.3.1.ebuild,v 1.1 2010/10/18 15:14:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.3.1.ebuild,v 1.2 2011/04/09 20:31:07 arfrever Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Lightweight in-process concurrent programming"
 HOMEPAGE="http://pypi.python.org/pypi/greenlet"
@@ -23,3 +24,8 @@ RDEPEND=""
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
 DOCS="AUTHORS NEWS README"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-python-3.2.patch"
+}