gentoo resync : 25.04.2020

4 files changed, 92 insertions, 6 deletions

diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index bf1caf919c75..205ddc8cbb08 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,4 +1,5 @@
 AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
 DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
-EBUILD socketpool-0.5.3-r2.ebuild 1035 BLAKE2B 51aa645fa6affe68ffeb92626a42df2aed316605dbf1d3ef7e0f7c68280663a66708c0135cde732a2e5edef0738c5c37b85d7cb996976dea0b8b8a0f8b378f71 SHA512 a69179aa4dbe6559beea869934ef9ae769835be3a7f4b260c73d98c22b7b2a92558bd850c9e57e459576d6446bd365d659f81622b8fb9c600497646be80f8dc4
-MISC metadata.xml 383 BLAKE2B bd4f1eccf7f3fdd7c416bfea5e96ff6b1b28b4bc5e703e1e236be4932e20bdbb8d9bdf6712f0bfd8845b49fe0a7ebc032f21bfadfe419554ce54c2b790cf73ce SHA512 3051b0487ab4dcdf440c36b12829a30c03db7256c99eef6623497b8223ebf6cf188a9ae054342c468771b2a38f8b3508ff0f49aa19398f3aec0a25a7bc1e9248
+EBUILD socketpool-0.5.3-r2.ebuild 1138 BLAKE2B f1c7d6c566ac7aee49433bf8b191a7703de97c0925e295b7081ccc2f1cfd834d535fae6c36dc5a93a1c0506d0f17297809966b4f99649ed2a4a1a81364f4793a SHA512 ae3e49517c8aa528f181c664483abb2af614833cba070e5aa0977ddaddc467c05bb3a1145d88140bb21e5d8835a7619081bf6553e51a84647f3a349429e611e0
+EBUILD socketpool-0.5.3-r3.ebuild 1293 BLAKE2B ed88c9d0dee3ef7dc83f5d29a5a46bc2e5488d2484625c516ec91553ab56e0e9ab6b57d0d921b6643a1c034b395a953eba81fe71fff54c91f8772c7afc2d9714 SHA512 33d173e050676bcdc91c13ea2a9f1718aa2dc1b6eddf52f7afd660ff9baa001f161e6e23d8bddb890b163fb3c0aeb211bb1c64d3a9617c45b31360b6080ef4ea
+MISC metadata.xml 646 BLAKE2B 78d8d0ff3cf4c225a6f36e02c1ae604b2bc7274d2b3d1f5b13dba09e4111ffb1177cd9008b0841e1f22a5a77426dad7a6f7ff39b9475c7944e8becfaecc1499c SHA512 e0845d25b7c518c035e44094d6164d2184556e8e4c82691efb8c79401835a924ae3aebc271e29c756169bdcadd3a1b9db8fc8666aca65d79f5c10ae45848e1c7
diff --git a/dev-python/socketpool/metadata.xml b/dev-python/socketpool/metadata.xml
index a948c85adc2a..d83b6559d4ad 100644
--- a/dev-python/socketpool/metadata.xml
+++ b/dev-python/socketpool/metadata.xml
@@ -9,4 +9,14 @@
     <remote-id type="pypi">socketpool</remote-id>
     <remote-id type="github">benoitc/socketpool</remote-id>
   </upstream>
+  <use>
+    <flag name="eventlet">
+      Install <pkg>dev-python/eventlet</pkg> as needed for the eventlet
+      backend.
+    </flag>
+    <flag name="gevent">
+      Install <pkg>dev-python/gevent</pkg> as needed for the gevent
+      backend.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
index 0972b88b4674..c1a63b20d0a7 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
@@ -11,13 +11,26 @@ DESCRIPTION="A simple Python socket pool"
 HOMEPAGE="https://github.com/benoitc/socketpool/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 s390 ~sparc x86"
-IUSE="examples test"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 s390 ~sparc x86"
+IUSE="examples gevent"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
 
-RDEPEND="$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' 'python2*')"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	gevent? (
+		$(python_gen_cond_dep '
+			dev-python/gevent[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
+
+BDEPEND="
+	test? (
+		!ia64? (
+			$(python_gen_cond_dep '
+				dev-python/gevent[${PYTHON_USEDEP}]
+			' 'python*')
+		)
+	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
 
diff --git a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
new file mode 100644
index 000000000000..144926c2bd40
--- /dev/null
+++ b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
@@ -0,0 +1,62 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple Python socket pool"
+HOMEPAGE="https://github.com/benoitc/socketpool/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="eventlet examples gevent"
+LICENSE="|| ( MIT public-domain )"
+SLOT="0"
+
+RDEPEND="
+	eventlet? (
+		$(python_gen_cond_dep '
+			dev-python/eventlet[${PYTHON_USEDEP}]
+		' 'python3*')
+	)
+	gevent? (
+		$(python_gen_cond_dep '
+			dev-python/gevent[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/eventlet[${PYTHON_USEDEP}]
+		' 'python3*')
+		!ia64? (
+			$(python_gen_cond_dep '
+				dev-python/gevent[${PYTHON_USEDEP}]
+			' 'python*')
+		)
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
+
+distutils_enable_tests pytest
+
+python_test() {
+	cp -r examples tests "${BUILD_DIR}" || die
+
+	pushd "${BUILD_DIR}" >/dev/null || die
+	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+	popd >/dev/null || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use examples && dodoc -r examples
+
+	# package installs unneeded LICENSE files here
+	rm -r "${ED}"/usr/socketpool || die
+}