gentoo resync : 21.06.2020

3 files changed, 37 insertions, 7 deletions

diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index f0bdadb0f50c..88be591427ab 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,5 +1,6 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
+AUX cython-0.29.20-py39-classmeth.patch 1373 BLAKE2B 1b4a06125513ea727e186e217b27fe17871bacc8cf835438e16683c67f136448de75efe7336c8e7622731966f2f1b2f8d9ef02f5c2697c31e251c99f53fc36be SHA512 0a9e063586fc945bfbdf6f213540029a2864074d487d0554b11f8d3db3ea078a6675d7cb86c1f68c30c7331e832de9fd48041e628c7481d51c9b8d0f957fe5a6
 DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe917c864047d028dd67041e70251025f14accbd76499b7b9290d0424989adf89321f251526e66a892bdc243ba80ba7f SHA512 bd0872359d31a41750353bb0d7f03c2a40aa2bf6e492148e693321cef15b02ae4f8d5f5a00efde7216f09a6ac06f2bb3ded9d00e27ad0cfc53605f3a9ef55af8
 DIST cython-0.29.17.gh.tar.gz 2080768 BLAKE2B f53f8593f4ab9ef87c8fff47a031d365a748b617b7ee41872768a6a649ca3c6a6f9a338f115881117cbb4ffe1811047ac5fdcac745d6387eee29487c9da4c297 SHA512 f722e4feb0fcd0de7b882d0ba7cd78c37b6aaa4438619607665ea269b207a482fab6ca65cf12bab54d94b5929776c973a270c0748ed35b0f88a72811bf90d4df
 DIST cython-0.29.18.gh.tar.gz 2083532 BLAKE2B 7e10a32f15542ed0d7d381223f6f20ec75d7ec39979ca58192cc0f95407cece31fb053776072b49e447ffb0ab5ad1918c6b53ad8cb277df08fabe0eab8ccf958 SHA512 5a1430345fbe42235a58fd44dd4e4ce17c68485349295af6c4e9a01a06117e18ee7700c34fb5974759f012acd5cf8400ed014ef16397539272c38881e905234a
@@ -9,5 +10,5 @@ EBUILD cython-0.29.15.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f6
 EBUILD cython-0.29.17.ebuild 1961 BLAKE2B 987cee2e8dc49dece5384df71337d7faa5344369b3fdbc6e2f60eb802639e26d4db8793fd5507c2f91741a87dec1cee289e2228fcfa1adadbf52757150728c90 SHA512 a957c2ae398285102fa23fd783415fd03b83d9c404f8fbe2f0f042612629908c982e9a92af6a660acb630120c0e42a50710a987a7b630b54ef59c86c6fb50de0
 EBUILD cython-0.29.18.ebuild 1961 BLAKE2B 987cee2e8dc49dece5384df71337d7faa5344369b3fdbc6e2f60eb802639e26d4db8793fd5507c2f91741a87dec1cee289e2228fcfa1adadbf52757150728c90 SHA512 a957c2ae398285102fa23fd783415fd03b83d9c404f8fbe2f0f042612629908c982e9a92af6a660acb630120c0e42a50710a987a7b630b54ef59c86c6fb50de0
 EBUILD cython-0.29.19.ebuild 2118 BLAKE2B 00188704dcd1fc77e02b68ad6fd1ffad35bb6240c48a07ad12f37e66fdc6b954d9b3bf6d472d1b55c2a86313422f392d38bb13925754dad2232574233e545c41 SHA512 6fb8043b8c245225e42f04f8062068ebc33f3f3eb5a67c95b014ff55e8fcd357c8d6ed0155d1b76a6a65c4e3968d59adf5d85a76106ea2bb8c1dd71a374f46c4
-EBUILD cython-0.29.20.ebuild 2118 BLAKE2B 00188704dcd1fc77e02b68ad6fd1ffad35bb6240c48a07ad12f37e66fdc6b954d9b3bf6d472d1b55c2a86313422f392d38bb13925754dad2232574233e545c41 SHA512 6fb8043b8c245225e42f04f8062068ebc33f3f3eb5a67c95b014ff55e8fcd357c8d6ed0155d1b76a6a65c4e3968d59adf5d85a76106ea2bb8c1dd71a374f46c4
+EBUILD cython-0.29.20-r2.ebuild 2009 BLAKE2B a3b9cdd80aa5e054444f9098249e39904c574661b447dbd89c3042deb09573ac2640871437a5be32bae6e9f13152c934883fe2fffb3f179866f4027c8d57da04 SHA512 88f4c63a503eb70a92da9f63993a3b528fb4ccaf23ad8e6f172f7852f4a484373176ef3a2377dd5dd1d6a37bdad2420c46fa17f9131cb8c9c05fe4b3c22edfd3
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.20.ebuild b/dev-python/cython/cython-0.29.20-r2.ebuild
index 8b4b6e7acc61..c536c20a045e 100644
--- a/dev-python/cython/cython-0.29.20.ebuild
+++ b/dev-python/cython/cython-0.29.20-r2.ebuild
@@ -31,6 +31,7 @@ BDEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+	"${FILESDIR}"/${P}-py39-classmeth.patch
 )
 
 SITEFILE=50cython-gentoo.el
@@ -54,12 +55,6 @@ python_compile_all() {
 }
 
 python_test() {
-	if [[ ${EPYTHON} == python3.9 ]]; then
-		# https://github.com/cython/cython/issues/3349
-		einfo "Skipping py3.9 due to known failures"
-		return
-	fi
-
 	tc-export CC
 	# https://github.com/cython/cython/issues/1911
 	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
diff --git a/dev-python/cython/files/cython-0.29.20-py39-classmeth.patch b/dev-python/cython/files/cython-0.29.20-py39-classmeth.patch
new file mode 100644
index 000000000000..914269a5a232
--- /dev/null
+++ b/dev-python/cython/files/cython-0.29.20-py39-classmeth.patch
@@ -0,0 +1,34 @@
+From c29a7818d3b6806a457af698aec446d3d28d4f80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Jun 2020 13:45:21 +0200
+Subject: [PATCH] Always bind Cython functions in py3
+
+Rebased for cython 0.29.x, and made conditional to Python 3.  This
+does not solve the original staticmethod problem in Python 2 but it does
+resolve classmethod problems in Python 3.9.  Therefore, it unbreaks
+other packages on Python 3.9, improves overall state for Python 3
+and does not introduce regressions in Python 2.
+---
+ Cython/Utility/CythonFunction.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Cython/Utility/CythonFunction.c b/Cython/Utility/CythonFunction.c
+index a65c8eee36..33d0a4750a 100644
+--- a/Cython/Utility/CythonFunction.c
++++ b/Cython/Utility/CythonFunction.c
+@@ -548,6 +548,7 @@ static int __Pyx_CyFunction_traverse(__pyx_CyFunctionObject *m, visitproc visit,
+ 
+ static PyObject *__Pyx_CyFunction_descr_get(PyObject *func, PyObject *obj, PyObject *type)
+ {
++#if PY_MAJOR_VERSION < 3
+     __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;
+ 
+     if (m->flags & __Pyx_CYFUNCTION_STATICMETHOD) {
+@@ -563,6 +564,7 @@ static PyObject *__Pyx_CyFunction_descr_get(PyObject *func, PyObject *obj, PyObj
+ 
+     if (obj == Py_None)
+         obj = NULL;
++#endif
+     return __Pyx_PyMethod_New(func, obj, type);
+ }
+