commit: a8e44050e3ab2370f468e9ff92f0e31ee63eea20 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Mar 10 16:46:53 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Mar 10 17:10:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e44050
dev-python/cython: Remove old Closes: https://bugs.gentoo.org/897934 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/cython/Manifest | 2 - dev-python/cython/cython-0.29.36.ebuild | 94 --------------------- dev-python/cython/cython-0.29.37.1-r1.ebuild | 97 ---------------------- dev-python/cython/files/50cython-gentoo.el | 11 --- .../files/cython-0.29.37.1-no-warn-ptr-types.patch | 14 ---- .../cython/files/cython-3.0.2-enummeta.patch | 69 --------------- .../files/cython-3.0.8-no-warn-ptr-types.patch | 14 ---- 7 files changed, 301 deletions(-) diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest index e2826321b968..1eda2530ba4a 100644 --- a/dev-python/cython/Manifest +++ b/dev-python/cython/Manifest @@ -1,4 +1,2 @@ -DIST cython-0.29.36.gh.tar.gz 2115333 BLAKE2B 6d43779c7222ff65d7de3a35ec18ef636480807d53480a8f94cc8c92d462fcc2f4d201a3bbf6e840a11fd33025e32c53f85626b05c131d10eed2859cdca7eb2d SHA512 a086fe1a11290cd3c870b891e61a0a0e2595bab9c26888024a758b6950c07059346d682fa9349e46c0af89805abbdd750059b3189960b8ce18007dfb5eb4391a -DIST cython-0.29.37.1.gh.tar.gz 2115631 BLAKE2B b81e527ee1da7d16d074102378b531e4b0c161a3d66e47df46b624b02464cbd5c3d08d0e32f8175d56807ed8c6603108b85953db9f51892cfdf8952b4d287399 SHA512 6038499f13914b8a1957eee4d04e0499f448c89c3d519320e5218bf518aacb7d345f3c48614839222eaee016edf549b719520500b0088d28163635a74d35f3c6 DIST cython-3.0.8.gh.tar.gz 2764668 BLAKE2B 03202ea480fa398d2b0893cc96185467009c783cf4451fc5d1c09ec229398bc084276680ed2b64acf63253744f827427e03674be3e5985d5a2912d9f338c786a SHA512 1070fc278401990595d177b0e6396bc1eba2ea8234a7c5bb26399b6b7284de7791ee5fa60ef74d06d0f4120b9c877bfd7703a7d701838f1634737526c614b860 DIST cython-3.0.9.gh.tar.gz 2769345 BLAKE2B 2a21b5e7060727d727902a08d7e038dacc047b724ebaa496ba5768542e28eec3c6198062ac3dd774a4321204752b373516f193f01bc6951e5f38b6029754647e SHA512 7899474882faab14716973783bbb46b981eab48192791acbbd06133efee83bfa9ace0e9a0272b0a44061a95ed94cdceaa98c4100f843220f5987791e36fa00e6 diff --git a/dev-python/cython/cython-0.29.36.ebuild b/dev-python/cython/cython-0.29.36.ebuild deleted file mode 100644 index dd3557e5daef..000000000000 --- a/dev-python/cython/cython-0.29.36.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{10..11} ) -# 3.12 not tested yet for https://github.com/cython/cython/issues/5285. -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 multiprocessing toolchain-funcs elisp-common - -DESCRIPTION="A Python to C compiler" -HOMEPAGE=" - https://cython.org/ - https://github.com/cython/cython/ - https://pypi.org/project/Cython/ -" -SRC_URI=" - https://github.com/cython/cython/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="emacs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - emacs? ( >=app-editors/emacs-23.1:* ) -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" - "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" - "${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch" -) - -SITEFILE=50cython-gentoo.el - -distutils_enable_sphinx docs - -python_compile() { - # Python gets confused when it is in sys.path before build. - local -x PYTHONPATH= - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el -} - -python_test() { - if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then - einfo "Skipping tests on ${EPYTHON} (xfail)" - return - fi - - tc-export CC - # https://github.com/cython/cython/issues/1911 - local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py -vv -j "$(makeopts_jobs)" --work-dir "${BUILD_DIR}"/tests || - die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-python/cython/cython-0.29.37.1-r1.ebuild b/dev-python/cython/cython-0.29.37.1-r1.ebuild deleted file mode 100644 index 1f809900d005..000000000000 --- a/dev-python/cython/cython-0.29.37.1-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{10..11} ) -# 3.12 not tested yet for https://github.com/cython/cython/issues/5285. -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 multiprocessing toolchain-funcs elisp-common - -DESCRIPTION="A Python to C compiler" -HOMEPAGE=" - https://cython.org/ - https://github.com/cython/cython/ - https://pypi.org/project/Cython/ -" -SRC_URI=" - https://github.com/cython/cython/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="emacs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - emacs? ( >=app-editors/emacs-23.1:* ) -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" - "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" - "${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch" - # workaround for https://bugs.gentoo.org/918983 - # https://github.com/cython/cython/issues/2747 - "${FILESDIR}/${PN}-0.29.37.1-no-warn-ptr-types.patch" -) - -SITEFILE=50cython-gentoo.el - -distutils_enable_sphinx docs - -python_compile() { - # Python gets confused when it is in sys.path before build. - local -x PYTHONPATH= - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el -} - -python_test() { - if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then - einfo "Skipping tests on ${EPYTHON} (xfail)" - return - fi - - tc-export CC - # https://github.com/cython/cython/issues/1911 - local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py -vv -j "$(makeopts_jobs)" --work-dir "${BUILD_DIR}"/tests || - die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-python/cython/files/50cython-gentoo.el b/dev-python/cython/files/50cython-gentoo.el deleted file mode 100644 index e6dcc6a6d7fb..000000000000 --- a/dev-python/cython/files/50cython-gentoo.el +++ /dev/null @@ -1,11 +0,0 @@ -;;; site-lisp configuration for cython-mode - -(add-to-list 'load-path "@SITELISP@") - -(autoload 'cython-mode "cython-mode" "Major mode for editing Cython files" t) -;;;###autoload -(add-to-list 'auto-mode-alist '("\\.pyx\\'" . cython-mode)) -;;;###autoload -(add-to-list 'auto-mode-alist '("\\.pxd\\'" . cython-mode)) -;;;###autoload -(add-to-list 'auto-mode-alist '("\\.pxi\\'" . cython-mode)) diff --git a/dev-python/cython/files/cython-0.29.37.1-no-warn-ptr-types.patch b/dev-python/cython/files/cython-0.29.37.1-no-warn-ptr-types.patch deleted file mode 100644 index b7a9d19a248d..000000000000 --- a/dev-python/cython/files/cython-0.29.37.1-no-warn-ptr-types.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py -index e9bfa9fe9..43be47dd5 100644 ---- a/Cython/Compiler/ModuleNode.py -+++ b/Cython/Compiler/ModuleNode.py -@@ -376,6 +376,9 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): - self.generate_includes(env, modules, code, early=False) - - code = globalstate['all_the_rest'] -+ # Gentoo: workaround for https://github.com/cython/cython/issues/2747 -+ # https://bugs.gentoo.org/918983 -+ code.putln('#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"') - - self.generate_cached_builtins_decls(env, code) - self.generate_lambda_definitions(env, code) diff --git a/dev-python/cython/files/cython-3.0.2-enummeta.patch b/dev-python/cython/files/cython-3.0.2-enummeta.patch deleted file mode 100644 index 284af4ac6c16..000000000000 --- a/dev-python/cython/files/cython-3.0.2-enummeta.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 81cc077ad035947a3429c245f1e28c8b43c6dcc6 Mon Sep 17 00:00:00 2001 -From: da-woods <[email protected]> -Date: Sat, 2 Sep 2023 10:32:59 +0100 -Subject: [PATCH] Fix invalid fastcall dict when keywords are passed - -Fixes #5665 - -I'm slightly surprised this hasn't caused more bugs. We're passing -a dict where we should be passing a tuple of names. - -Replacement should hopefully be right, but I don't know how -optimized or otherwise it is. ---- - Cython/Utility/ObjectHandling.c | 36 +++++++++++++++++++-------------- - 1 file changed, 21 insertions(+), 15 deletions(-) - -diff --git a/Cython/Utility/ObjectHandling.c b/Cython/Utility/ObjectHandling.c -index 8ea5be42935..507fb94f605 100644 ---- a/Cython/Utility/ObjectHandling.c -+++ b/Cython/Utility/ObjectHandling.c -@@ -2328,27 +2328,33 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_FastCallDict(PyObject *func, PyObj - #endif - #endif - -- #if CYTHON_VECTORCALL -- #if Py_VERSION_HEX < 0x03090000 -- vectorcallfunc f = _PyVectorcall_Function(func); -- #else -- vectorcallfunc f = PyVectorcall_Function(func); -- #endif -- if (f) { -- return f(func, args, (size_t)nargs, kwargs); -- } -- #elif defined(__Pyx_CyFunction_USED) && CYTHON_BACKPORT_VECTORCALL -- // exclude fused functions for now -- if (__Pyx_CyFunction_CheckExact(func)) { -- __pyx_vectorcallfunc f = __Pyx_CyFunction_func_vectorcall(func); -- if (f) return f(func, args, (size_t)nargs, kwargs); -+ if (kwargs == NULL) { -+ #if CYTHON_VECTORCALL -+ #if Py_VERSION_HEX < 0x03090000 -+ vectorcallfunc f = _PyVectorcall_Function(func); -+ #else -+ vectorcallfunc f = PyVectorcall_Function(func); -+ #endif -+ if (f) { -+ return f(func, args, (size_t)nargs, NULL); -+ } -+ #elif defined(__Pyx_CyFunction_USED) && CYTHON_BACKPORT_VECTORCALL -+ // exclude fused functions for now -+ if (__Pyx_CyFunction_CheckExact(func)) { -+ __pyx_vectorcallfunc f = __Pyx_CyFunction_func_vectorcall(func); -+ if (f) return f(func, args, (size_t)nargs, NULL); -+ } -+ #endif - } -- #endif - - if (nargs == 0) { - return __Pyx_PyObject_Call(func, $empty_tuple, kwargs); - } -+ #if PY_VERSION_HEX >= 0x03090000 && !CYTHON_COMPILING_IN_LIMITED_API -+ return PyObject_VectorcallDict(func, args, nargs, kwargs); -+ #else - return __Pyx_PyObject_FastCall_fallback(func, args, (size_t)nargs, kwargs); -+ #endif - } - - diff --git a/dev-python/cython/files/cython-3.0.8-no-warn-ptr-types.patch b/dev-python/cython/files/cython-3.0.8-no-warn-ptr-types.patch deleted file mode 100644 index bfa51fd2bf5c..000000000000 --- a/dev-python/cython/files/cython-3.0.8-no-warn-ptr-types.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py -index b46b6cee6..9f9f08d61 100644 ---- a/Cython/Compiler/ModuleNode.py -+++ b/Cython/Compiler/ModuleNode.py -@@ -507,6 +507,9 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): - self.generate_includes(env, modules, code, early=False) - - code = globalstate['module_code'] -+ # Gentoo: workaround for https://github.com/cython/cython/issues/2747 -+ # https://bugs.gentoo.org/918983 -+ code.putln('#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"') - - self.generate_cached_builtins_decls(env, code) -
