From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- dev-python/greenlet/Manifest | 3 +- .../greenlet/files/greenlet-0.4.15-py39.patch | 48 ++++++++++++++++++++++ dev-python/greenlet/greenlet-0.4.15-r1.ebuild | 5 +-- 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 dev-python/greenlet/files/greenlet-0.4.15-py39.patch (limited to 'dev-python/greenlet') diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest index b0ef1631bd50..9c30c0c81147 100644 --- a/dev-python/greenlet/Manifest +++ b/dev-python/greenlet/Manifest @@ -1,5 +1,6 @@ AUX greenlet-0.4.15-Add-support-for-DEC-Alpha.patch 1794 BLAKE2B b87a8ebb4190c845b18e82b1218fd7c50164835d9280b780b161fadf25c5b2556f443512e10dc83a506dee5d1d622fcc235d0348899f9027d1ca4469dc0d0caa SHA512 d09d5b9f3d6527d40bbba1a0ad4c7b5f7c80078a80a6820e0626ae7832fe78553cf14c0604f126fe4a53e74dc7f14a6f85dc6822d8b19c37963974eebd5b18d8 +AUX greenlet-0.4.15-py39.patch 1760 BLAKE2B bb2c8602c838c2187b3f7090eb49571548962700947c89a00f7e1ac742f5a19ada33a0311b84830895acee88162014b7a3dca3aaf6b4e974dcb73f3d4d07bc63 SHA512 76d205c0e00e1c08976a84093f49c478483cea8dabd05c69dfb138e25879a5eced3d4ff00f1f7c0d34f251804f14d8a73658d2119cdaebbcf1922203014882d1 DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89 -EBUILD greenlet-0.4.15-r1.ebuild 958 BLAKE2B d53e706da4ce52bf749ecaffbbd9e8d44c1fe7a1600feadf897d98901127032aead53585251625ebc6330b47c0e67e2392dbe54b95ff889280199ebbef6a727b SHA512 95900a4cdbd3770bf68f168998f44a56a6d1b6850594819d63909f10f78dd83d64abb8efe7f8879c176b3ebf4a17196c67932a3127a6646c9526cfa63b7a5337 +EBUILD greenlet-0.4.15-r1.ebuild 951 BLAKE2B e9843a61cd20e4d9e9cd54a65b48cb575f862209a86979c85ae12f37b04f5b985decdd336a7fc89bd3574f58d678c7de7c3030ad36a1cb8d55af75dc975ac448 SHA512 e300b988b4a36326ef9a25bc29cf3cda68d3e6da1f5796925ef379bb6520310a17e299594ed27ce838be04caf2084737b8720357d2ddf3a54e2861636f79fc93 EBUILD greenlet-0.4.15.ebuild 1078 BLAKE2B 9358743d448ce37730284759c21b6c8f399a0ceb92239e7d5cb6472b7971ca55924a7ef6030bcebc4b78e0fc3c95a0d9e7687b689692f2aeefd12b1db7eec4f5 SHA512 ca0a5f838972a9302c1f29f0066048dc3262915df6f428636d6a7c824ae1bfde352d16f8f884e72d70938873e42a18aadc802058ec1a07900bcbee410b2537cf MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548 diff --git a/dev-python/greenlet/files/greenlet-0.4.15-py39.patch b/dev-python/greenlet/files/greenlet-0.4.15-py39.patch new file mode 100644 index 000000000000..15cf75d32e55 --- /dev/null +++ b/dev-python/greenlet/files/greenlet-0.4.15-py39.patch @@ -0,0 +1,48 @@ +From d05b62bb75e6a3e217435a1fe0f15a53e692898c Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Wed, 18 Mar 2020 15:09:33 +0100 +Subject: [PATCH] Port to Python 3.9 + +On Python 3.9, define _Py_DEC_REFTOTAL which has been removed by: +https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 + +Replace also PyEval_CallObjectWithKeywords() with PyObject_Call(), +since PyEval_CallObjectWithKeywords() has been deprecated in +Python 3.9 and PyObject_Call() has the same behavior. The only +difference is that PyEval_CallObjectWithKeywords() can be called with +args=NULL, but g_initialstub() ensures that args is not NULL. +--- + greenlet.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/greenlet.c b/greenlet.c +index ec738b9..d37fc97 100644 +--- a/greenlet.c ++++ b/greenlet.c +@@ -109,6 +109,16 @@ extern PyTypeObject PyGreenlet_Type; + #define GREENLET_USE_TRACING 1 + #endif + ++#ifndef _Py_DEC_REFTOTAL ++ /* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by: ++ https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */ ++# ifdef Py_REF_DEBUG ++# define _Py_DEC_REFTOTAL _Py_RefTotal-- ++# else ++# define _Py_DEC_REFTOTAL ++# endif ++#endif ++ + /* Weak reference to the switching-to greenlet during the slp switch */ + static PyGreenlet* volatile ts_target = NULL; + /* Strong reference to the switching from greenlet after the switch */ +@@ -820,8 +830,7 @@ static int GREENLET_NOINLINE(g_initialstub)(void* mark) + result = NULL; + } else { + /* call g.run(*args, **kwargs) */ +- result = PyEval_CallObjectWithKeywords( +- run, args, kwargs); ++ result = PyObject_Call(run, args, kwargs); + Py_DECREF(args); + Py_XDECREF(kwargs); + } diff --git a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild index 3773da08c6e6..5d9f0a2d2be3 100644 --- a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild +++ b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 # Note: greenlet is built-in in pypy -PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) +PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} ) inherit distutils-r1 flag-o-matic @@ -17,10 +17,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc" -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - PATCHES=( "${FILESDIR}"/${P}-Add-support-for-DEC-Alpha.patch + "${FILESDIR}"/greenlet-0.4.15-py39.patch ) DISTUTILS_IN_SOURCE_BUILD=1 -- cgit v1.2.3