gentoo Easter resync : 12.04.2020

5 files changed, 70 insertions, 100 deletions

diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index fa45aeeb4ad2..b0ef1631bd50 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,8 +1,5 @@
-DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
-DIST greenlet-0.4.13.tar.gz 58382 BLAKE2B a4afd9621ccd6444738c9b536af7ad5ceef5d3c8c4193ce637b4a8580c7070805419a917bef131f397286fae13f6e6f23409f5eedb814a41fcfee98356c0951a SHA512 625aaa8875b408442139191e1a63eca71c668675229907335f5caee623487aba5305c1d53b51e1764ad982b8edd07d04f984e08a75318a0a5672805667917a61
+AUX greenlet-0.4.15-Add-support-for-DEC-Alpha.patch 1794 BLAKE2B b87a8ebb4190c845b18e82b1218fd7c50164835d9280b780b161fadf25c5b2556f443512e10dc83a506dee5d1d622fcc235d0348899f9027d1ca4469dc0d0caa SHA512 d09d5b9f3d6527d40bbba1a0ad4c7b5f7c80078a80a6820e0626ae7832fe78553cf14c0604f126fe4a53e74dc7f14a6f85dc6822d8b19c37963974eebd5b18d8
 DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
-EBUILD greenlet-0.4.12.ebuild 1073 BLAKE2B 22b92191689b0d60990e13f0f57de8e06dacd85546bd44ec0abef3a9d32884c1af8cc95b02029658f987b3ad8548e0e6a50d366abc6349d9d76f8f286142cf8a SHA512 96db6871dc5c4be3af81f95c001f7b317418238cbe6d2b624d39b8460ea27a86c905056d046b461a7991ec7e5414a6086d88a72faf490267db80b4eeb8fb9b53
-EBUILD greenlet-0.4.13.ebuild 1085 BLAKE2B be12f66555e768de5b32bd55dedcfc033208aaca1d6342125fd481889715bc5824d26da64e111e4c70b694a33c300b7158aeffa804a4453d088ac26b0cd55ac9 SHA512 76ec6a87b04c7c107a4b774607253532b921ac8907dd7de8435ff05355b17b58f96f74145c3d2c8840a9a316c2154b49bc99217f5c3ca812a8006dcef46ad82e
-EBUILD greenlet-0.4.15-r1.ebuild 893 BLAKE2B 26a5f433116c6ce7de33d98098ee9583316c663eb2a8afa2dcb7156c447aef7a2eb33327bf51660d7209a8265dc8102a6f193fd664cb7158e847c8deeaf591d1 SHA512 b173362a8858a910494886ed8957d52385dd1a9f5244df6a3c020487e0f6415b270c5a5da795f48a7d6c4e8dea246817b16551a5038c54a469c86751f66bfea2
+EBUILD greenlet-0.4.15-r1.ebuild 958 BLAKE2B d53e706da4ce52bf749ecaffbbd9e8d44c1fe7a1600feadf897d98901127032aead53585251625ebc6330b47c0e67e2392dbe54b95ff889280199ebbef6a727b SHA512 95900a4cdbd3770bf68f168998f44a56a6d1b6850594819d63909f10f78dd83d64abb8efe7f8879c176b3ebf4a17196c67932a3127a6646c9526cfa63b7a5337
 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-Add-support-for-DEC-Alpha.patch b/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch
new file mode 100644
index 000000000000..6a5b37b0e944
--- /dev/null
+++ b/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch
@@ -0,0 +1,63 @@
+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/greenlet-0.4.12.ebuild b/dev-python/greenlet/greenlet-0.4.12.ebuild
deleted file mode 100644
index dc2af69268c3..000000000000
--- a/dev-python/greenlet/greenlet-0.4.12.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 )
-
-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.13.ebuild b/dev-python/greenlet/greenlet-0.4.13.ebuild
deleted file mode 100644
index 88fdbdcd21de..000000000000
--- a/dev-python/greenlet/greenlet-0.4.13.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.15-r1.ebuild b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
index 3aa34d752648..3773da08c6e6 100644
--- a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
@@ -14,11 +14,15 @@ 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"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Add-support-for-DEC-Alpha.patch
+)
+
 DISTUTILS_IN_SOURCE_BUILD=1
 
 distutils_enable_sphinx doc