gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 81 deletions

diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index f88ea1b18174..bf1caf919c75 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,6 +1,4 @@
 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-r1.ebuild 975 BLAKE2B fc5001b9f6fa4b613af376152a1c23ad6427d3c0b1df476b3aaa0cc8e5ac133c56707bc20a1dffbdf196b57b050a076c99ca3dba21bfd820922869ef24c0decd SHA512 84dd02208f0ce80490197c81d36581be83c1074a7e42afbeb93fb8ff49eb2d2e8c645a327ed5398d17869a92ea9585fd56a0e2dc660314ad20bd30e851aabf92
-EBUILD socketpool-0.5.3-r2.ebuild 1038 BLAKE2B 8607a30281bcebb44c3cf4ee57f334495a5df8b8424512f2cb39555b7c4d2a8d3cb62a154beb2e7672d623deffe8fc14f31f29a6a14027afca5a16bd021eaaca SHA512 fb1b9cb14bee5b146989a302583938e7a1746b3e922290e1a4f5183967408724bd66d790e7f7e1e2d658879f466cebd75e4e4da75bfcd208536e83a7ae184035
-EBUILD socketpool-0.5.3.ebuild 960 BLAKE2B f0bb63520f399faafbee2efc6ad1e3095649f4f6c28a8792be351af2beb43844955aa68b8a362a11cc9dca206aead000d510e64f2b7db25a782c1abbb30f35b2 SHA512 b28b229eabee3fe410ad28153c0ce443aa0ecf613390bad07ac5551d23a3aa855e770be9ba49fad3464220e7dc5aa0c338988a2c4d1e7af078957eb3b535536c
+EBUILD socketpool-0.5.3-r2.ebuild 1035 BLAKE2B 51aa645fa6affe68ffeb92626a42df2aed316605dbf1d3ef7e0f7c68280663a66708c0135cde732a2e5edef0738c5c37b85d7cb996976dea0b8b8a0f8b378f71 SHA512 a69179aa4dbe6559beea869934ef9ae769835be3a7f4b260c73d98c22b7b2a92558bd850c9e57e459576d6446bd365d659f81622b8fb9c600497646be80f8dc4
 MISC metadata.xml 383 BLAKE2B bd4f1eccf7f3fdd7c416bfea5e96ff6b1b28b4bc5e703e1e236be4932e20bdbb8d9bdf6712f0bfd8845b49fe0a7ebc032f21bfadfe419554ce54c2b790cf73ce SHA512 3051b0487ab4dcdf440c36b12829a30c03db7256c99eef6623497b8223ebf6cf188a9ae054342c468771b2a38f8b3508ff0f49aa19398f3aec0a25a7bc1e9248
diff --git a/dev-python/socketpool/socketpool-0.5.3-r1.ebuild b/dev-python/socketpool/socketpool-0.5.3-r1.ebuild
deleted file mode 100644
index e423b7512595..000000000000
--- a/dev-python/socketpool/socketpool-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,39 +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} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-LICENSE="|| ( MIT public-domain )"
-SLOT="0"
-
-RDEPEND="$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' 'python2*')"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
-
-python_test() {
-	py.test tests || die
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-
-	# package installs unneeded LICENSE files here
-	rm -rf "${ED}"/usr/socketpool || die
-}
diff --git a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
index 21521dcf380f..0972b88b4674 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
@@ -11,7 +11,7 @@ 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 ~arm arm64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 s390 ~sparc x86"
 IUSE="examples test"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
diff --git a/dev-python/socketpool/socketpool-0.5.3.ebuild b/dev-python/socketpool/socketpool-0.5.3.ebuild
deleted file mode 100644
index 15d48d4d48b8..000000000000
--- a/dev-python/socketpool/socketpool-0.5.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-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 arm ~arm64 ppc ppc64 s390 ~sh ~sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-LICENSE="|| ( MIT public-domain )"
-SLOT="0"
-
-RDEPEND="$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' 'python2*')"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
-
-python_test() {
-	py.test tests || die
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-
-	# package installs unneeded LICENSE files here
-	rm -rf "${ED}"/usr/socketpool || die
-}