gentoo resync : 25.08.2020

3 files changed, 67 insertions, 9 deletions

diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index a48af42ff689..1aa1304e9ae9 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,5 +1,7 @@
 AUX eventlet-0.25.1-sparc.patch 4901 BLAKE2B 5c2db6c09e3123c6ec655480e5f440f094071cd2bc1de3260c8443abd736d2cc52115707f0fdcffff3019ca6788287dd8249cdad5f5dad2e449ceb4067e1dfd5 SHA512 cb3f7cd7e8f0cc1c7e040bf8eb04309e98107427ba0b2a8643a18ce13f57803eaee32045e55d2e56cad45fa1dbfb33c99bb4935f153949d08f9240384d9868a2
 AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
 DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
-EBUILD eventlet-0.25.1-r1.ebuild 2259 BLAKE2B 05a53f452c2c0d08fdab18d43750ec6d8718896f18e837af928c6684f389f18432f7723455a44fd26ce9df872aef3a8ef173df61008e3514e7844eb5a51cfa58 SHA512 ce73b97f391118733862a2732f282acf0322f7aaaccf1c6e0183161b04615c68746a7b6e35ed44da15ade165eff9326d5f2df8b0e33c1debb8a296753c124475
+DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5
+EBUILD eventlet-0.25.1-r1.ebuild 2141 BLAKE2B 7d33066c473b8794dc7775956b852a9673a56167e12afcab1a5ff7cefc1341160b8de4b56d325102d17549631bbf1336763aa8ac609c56e31df555fb87ce00d6 SHA512 d4f66e724beaae255b249d39dc492d3f50eefb80ea066071cd30e3300423bef4d1b4dafdf0d1e0060475d46b6aa467c7059b2d2a45084a097b030af2638433ea
+EBUILD eventlet-0.26.1.ebuild 1774 BLAKE2B 22a756d64b34b85adffaba54988bdf23784610cd68d8dd45bb751c78c9922fb7d02adf01e6bf19a2e3953d3dd217dd358a4ee3141bd57af0dc3c3a9a8eda46c8 SHA512 3f97f61ddb215541713a9c5f13858bbdf742d6dcf93a350635fbb518cbd1b9bc096977d685882e4b6e348c39d42a284e46c7720d02e32b60738e2b8e9924822b
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
index f5ec914ba9c1..f00090d518b8 100644
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="doc examples test"
 
 RDEPEND="
@@ -58,13 +58,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_prepare() {
-	if ! python_is_python3; then
-		# this is for python3 only
-		rm -r eventlet/green/http || die
-	fi
-}
-
 python_install_all() {
 	if use examples; then
 		docompress -x "/usr/share/doc/${PF}/examples"
diff --git a/dev-python/eventlet/eventlet-0.26.1.ebuild b/dev-python/eventlet/eventlet-0.26.1.ebuild
new file mode 100644
index 000000000000..6fed3c8d8ce1
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.26.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/eventlet-0.25.1-tests.patch"
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests nose
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	unset PYTHONPATH
+	nosetests -v || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	distutils-r1_python_install_all
+}