gentoo resync : 25.08.2020

6 files changed, 2 insertions, 205 deletions

diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 78825709ff25..85952ec726b4 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,8 +1,3 @@
-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
 DIST greenlet-0.4.16.tar.gz 60576 BLAKE2B e0c53af4b6886fe00f0299a1779e478b7cbce5ff733669e8a62757cef49f034e19b7b932e7900b09e288ff4ab7e883fc2dd5f97f78c0e1b5702e5ba9c9f62fa1 SHA512 0dc473c05c1d54a830c009fe8197fd2017b8f3117532af0fc7970eb5abd93a82bbaa1a8403375a0ac7148fcff63cdc3faa663d0c5e442f3dd10ea3b2f98b306e
-EBUILD greenlet-0.4.15-r1.ebuild 944 BLAKE2B 53a91152659fb65a833b02d73f57630ca771f0811b856f103f2919feff0ff37a856d9bdab11de3fc67bfc93e68b512606eec1ee9af8682ca1046615663398b27 SHA512 9662bcd90557b345246db170ac256efd988092cea2b80f26168c2e2cabfb661154659bc76bf231c547bb3e887aa66ad16c2420b4cd0c265d044e8fddd95a2809
-EBUILD greenlet-0.4.15.ebuild 1078 BLAKE2B 9358743d448ce37730284759c21b6c8f399a0ceb92239e7d5cb6472b7971ca55924a7ef6030bcebc4b78e0fc3c95a0d9e7687b689692f2aeefd12b1db7eec4f5 SHA512 ca0a5f838972a9302c1f29f0066048dc3262915df6f428636d6a7c824ae1bfde352d16f8f884e72d70938873e42a18aadc802058ec1a07900bcbee410b2537cf
-EBUILD greenlet-0.4.16.ebuild 844 BLAKE2B 84e8c4c15029350de8722740dac80a9bcbca88e0bc7e4289e2ab85c8d2fabc27d8b97f43d595c4f1a3e5f62e1e9d159412440216394b49ba83fa65ce78a7d53b SHA512 532c0b427004e77cc5a0c82636363d95d8106b7c05d52253fa4e6337ead9c736dfe3c47c86f2478c72b7ee0f1f4db391465a9d520cfc74689ab82c7952a7fe1c
+EBUILD greenlet-0.4.16.ebuild 837 BLAKE2B 40883c0cd53c7ad52c6282d682e214ce4e1b0fc04388ead4c734f4bb1ec45b475ecb2a4f6469b985e3a46218631a91045885ab347895f2fdb777f77e56dd40be SHA512 65023c2536a3ba02b47bd4d119b0610a4fee03f5f176d8ce105b7c657383abeb584cdfe933e10d538f332577d28bd1ef1d0a7a5c0a306b2aad6de84dd0eb6c9f
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch b/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch
deleted file mode 100644
index 6a5b37b0e944..000000000000
--- a/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-https://github.com/python-greenlet/greenlet/pull/160
-
-From 839dfa8d4bc4e9a0b97a1984ab2519841f5511e4 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 16 Mar 2020 14:38:21 -0700
-Subject: [PATCH] Add support for DEC Alpha
-
----
- platform/switch_alpha_unix.h | 30 ++++++++++++++++++++++++++++++
- slp_platformselect.h         |  2 ++
- 2 files changed, 32 insertions(+)
- create mode 100644 platform/switch_alpha_unix.h
-
-diff --git a/platform/switch_alpha_unix.h b/platform/switch_alpha_unix.h
-new file mode 100644
-index 0000000..216619f
---- /dev/null
-+++ b/platform/switch_alpha_unix.h
-@@ -0,0 +1,30 @@
-+#define STACK_REFPLUS 1
-+
-+#ifdef SLP_EVAL
-+#define STACK_MAGIC 0
-+
-+#define REGS_TO_SAVE "$9", "$10", "$11", "$12", "$13", "$14", "$15", \
-+		     "$f2", "$f3", "$f4", "$f5", "$f6", "$f7", "$f8", "$f9"
-+
-+static int
-+slp_switch(void)
-+{
-+  register int ret;
-+  register long *stackref, stsizediff;
-+  __asm__ volatile ("" : : : REGS_TO_SAVE);
-+  __asm__ volatile ("mov $30, %0" : "=r" (stackref) : );
-+  {
-+      SLP_SAVE_STATE(stackref, stsizediff);
-+      __asm__ volatile (
-+	  "addq $30, %0, $30\n\t"
-+	  : /* no outputs */
-+	  : "r" (stsizediff)
-+	  );
-+      SLP_RESTORE_STATE();
-+  }
-+  __asm__ volatile ("" : : : REGS_TO_SAVE);
-+  __asm__ volatile ("mov $31, %0" : "=r" (ret) : );
-+  return ret;
-+}
-+
-+#endif
-diff --git a/slp_platformselect.h b/slp_platformselect.h
-index bed9e6d..fb99aed 100644
---- a/slp_platformselect.h
-+++ b/slp_platformselect.h
-@@ -51,4 +51,6 @@
- #include "platform/switch_csky_gcc.h" /* gcc on csky */
- #elif defined(__GNUC__) && defined(__riscv)
- #include "platform/switch_riscv_unix.h" /* gcc on RISC-V */
-+#elif defined(__GNUC__) && defined(__alpha__)
-+#include "platform/switch_alpha_unix.h" /* gcc on DEC Alpha */
- #endif
--- 
-2.24.1
-
diff --git a/dev-python/greenlet/files/greenlet-0.4.15-py39.patch b/dev-python/greenlet/files/greenlet-0.4.15-py39.patch
deleted file mode 100644
index 15cf75d32e55..000000000000
--- a/dev-python/greenlet/files/greenlet-0.4.15-py39.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d05b62bb75e6a3e217435a1fe0f15a53e692898c Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@python.org>
-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
deleted file mode 100644
index 86dbb7a7c895..000000000000
--- a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.org/project/greenlet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Add-support-for-DEC-Alpha.patch
-	"${FILESDIR}"/greenlet-0.4.15-py39.patch
-)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_sphinx doc
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/greenlet/greenlet-0.4.15.ebuild b/dev-python/greenlet/greenlet-0.4.15.ebuild
deleted file mode 100644
index 0fbfb93370d8..000000000000
--- a/dev-python/greenlet/greenlet-0.4.15.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.org/project/greenlet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/greenlet/greenlet-0.4.16.ebuild b/dev-python/greenlet/greenlet-0.4.16.ebuild
index 95b8ec7c7e4f..6372f318b5e7 100644
--- a/dev-python/greenlet/greenlet-0.4.16.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DISTUTILS_IN_SOURCE_BUILD=1