gentoo resync : 25.11.2020

5 files changed, 6 insertions, 124 deletions

diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 39a8ba6133ce..77effcd32c84 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,11 +1,8 @@
 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.20.gh.tar.gz 2087315 BLAKE2B c429dd2aec6c6dec0a3430ad8aefd17b62b65d9e2e7be0d48e0ebb808897533ac724ba69bdd639e3cdab2da2399f7dccea524dd71a48594e44c7a737026a5b5a SHA512 5bd0506abf8e0a823316e697db021e1e12296fecef2165ea4b84fa595554ebcdcf2688cb675c77e0e1567ab44ed502757b5eb4ea55b84505ae350f70e4d90ecc
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 EBUILD cython-0.29.15.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f60fd1a4bf9df14302e0b699bfa3265d5449b9f1e669303958141a38d0afcba0b94fd1809b8e94fd99ff8eb930e5 SHA512 78559785f85582572c633f75eabdc54bca756461ac94c7aa7a2771862abda2c5c114d776edc0e6efdd04bf76a8136a132c627bc77b67282bff86ad703ca87dcb
-EBUILD cython-0.29.20-r2.ebuild 2007 BLAKE2B 5697ac1ac8003ed42aa63c72bca396bff005570be18f52b1a796a82dabfe0e684cd9f89c42f4268e995df24e6e25ac929c8af4543c87343ed95b62eb36f08bc0 SHA512 d40ac7f143feb16f357327be4d1d29771deb488f1dccf91d42eb1170bfe05631b83de35c74b713480c4533aa443a3c68663f595c99bbc4946bbbb54d15949b8d
-EBUILD cython-0.29.21-r1.ebuild 1812 BLAKE2B 24bc7484f50b8774fa9738f97afb777c21e7bdc83e20e34f4812e6279fd72ea4f12a805c98a28233dcdfd22a8f66ee8c266230524d7098fcf031fdf6bdaa81fa SHA512 3432f5e5ab4f7539184f98658163ad4adb6b5eec198c34762fb5e432c84b786c62b42568e3151937b9236f2bdffada419ac8c7355d1801fad2bc7f502805e908
-EBUILD cython-0.29.21.ebuild 1963 BLAKE2B 754d757ba3de1e22523b7a340eb20069aa103c79030849ecdbfde82bd0e8fc40568c46fde0f0603455ff66dd4ddfa8c19e10c69b803e49127e9914e726b5ccf0 SHA512 1c4da4cd10aac6720037bf37f9f80c13f290f13c1a21b839fa3061cc4767cbe6fea6ed1bcefec5fbff9ff52fd3b2a9347a502b36089097ce6beb533c971c3165
+EBUILD cython-0.29.21-r1.ebuild 1803 BLAKE2B 5b046420481ac99e04e85023b8606df8c16908e05570597bd67ce263273acd739f235ca78e0651b79da2018e5d762a0d883055bac24a98b7df62add78acae0ec SHA512 4c6adf7f19c645d8e98ba4b5b50ba21b2169932f25dc4a0b1d3445874fa7de7e6e6962f4e4dc77c681dc1950d44ce4fe29fe23c212d20314772572d1f29f57f6
+EBUILD cython-0.29.21.ebuild 1952 BLAKE2B 802d05a0f8cfd7bc1bef8d21ee95418b796c20db09fc310726e79c9f253a969f7bba5ece98feeab7683dfeaf08ab2ef19409d69e8ff47786904d7ab8e4eb72d8 SHA512 5e6c4ae66e81cf1068aa6d40aaa537d0544cf707cf46276b394b28707855bd146dca25dc131ca719a000ba8708fe6ac508a8f58b3ef0b54e0e489cdcbe99a35a
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.20-r2.ebuild b/dev-python/cython/cython-0.29.20-r2.ebuild
deleted file mode 100644
index 6a0df1a266a1..000000000000
--- a/dev-python/cython/cython-0.29.20-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			python3_{6,7,8})
-	)"
-
-PATCHES=(
-	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
-	"${FILESDIR}"/${P}-py39-classmeth.patch
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# 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() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --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.21-r1.ebuild b/dev-python/cython/cython-0.29.21-r1.ebuild
index 0d37c4e33e83..a118ecece825 100644
--- a/dev-python/cython/cython-0.29.21-r1.ebuild
+++ b/dev-python/cython/cython-0.29.21-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
@@ -15,7 +16,7 @@ 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
@@ -23,7 +24,6 @@ RDEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
 BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
 			'python3*')
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
index 765b801e1809..e3ada54d8df6 100644
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
@@ -15,7 +16,7 @@ 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 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
@@ -23,7 +24,6 @@ RDEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
 BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
 			python3_{6,7,8})
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
deleted file mode 100644
index 914269a5a232..000000000000
--- a/dev-python/cython/files/cython-0.29.20-py39-classmeth.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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);
- }
-