gentoo Easter resync : 12.04.2020

6 files changed, 21 insertions, 92 deletions

diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index d84dac394a07..478fa1e4017c 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,11 +1,7 @@
-DIST websocket-client-0.37.0.tar.gz 194246 BLAKE2B 805482524b603fbfeb1039bcd99d761d125504a0f8d1a69766d4f586da241efd9d07ade030152fc51228a7333c97313fb98483de95808f81cfa23e7c3b0ff1d4 SHA512 b72f18c91d9a51a1943fc798601bcd9eac8b1ce807a2abb72b7cf897da30de808160645d9c7f3eaf2430e739cd0c6c01046c452f43c61af63afe7d31d801f9f7
-DIST websocket-client-0.40.0.tar.gz 196203 BLAKE2B 303aeed5bfc84139adfbef3f3198512172220d2670e38683d660def19dcd82015bf85edd26a5aa029ba021c1f9496dca33e5ee8afc790b87eb1fa7b7b17c9aed SHA512 b57593e14087ff36ab2133fb8077aa207bcdcc04fa82d00eb8fa3b86bdf7fa949c8ca25317a7fe035ef0f36d2c996e036d2b715399813604d5593584d409a5eb
-DIST websocket-client-0.47.0.tar.gz 202611 BLAKE2B 8258ac3186eedcf7e3a791768ddadbe32aa506f27889214a6a275d6710bb7adf8d0ba8354165a0d07b7a084fe5937fc65ee85e6d84fc8ad21a7d2ece4ae8d91d SHA512 0d384e96be66877ba0c24e7194e2f3d554f818c2e2f107b054e07034fa7678946738c2b08c68cd71ebe0237fa507fade319273c492871fbd0ad7085b87cf0a54
 DIST websocket-client-0.48.0.tar.gz 44492 BLAKE2B 39191416d0f80778edc261e96554d3955fcb71542c891fbc506e30c768d2d684942cf690647b65c2245da45c993e3e60d65bd7ab9d28bfa6eb304a95a3ccf619 SHA512 6c678a2671ce6cfb86a61effa836bbe4bb1702f22827934b1fcd7f0f8439be76037d9b6d4d6b416249361a9a74a92701d7b90bc6276b2433388644ed66f56333
 DIST websocket-client-0.56.0.tar.gz 36951 BLAKE2B 2dc82dbf2d2f9c6109645231f100d659347d6bfc854f1221a1e37b708d9a21fad7e9beaa6a272f36bd47fe0b2404f41b09c90d8fd350fc7147fb25ed680fb2d1 SHA512 f61497b5fa6deea11d0e81c1c0d3092d1efba9bcdb3427a45f51b81059444a486a9aa6a4d046fc2aa805e855d2c8e68a4ba46669c05a45eb928251c50e2e3a50
-EBUILD websocket-client-0.37.0.ebuild 805 BLAKE2B 01c66a3d2964060d284cf59b46e87f00b1d8d6c18a7831275082c1fe791d958ff4686e4a2f4925cba5a2c783d510b83e899a307312440d618443096c8d8ea567 SHA512 18da22436d880c0615bd4b916c97cf8c42e6f006bdd51a6b86be149ef80373e696f44f4decd9bab7defecd5b2729d0f2b8c1741bfe1e50ac83e6c7201475e1e7
-EBUILD websocket-client-0.40.0.ebuild 794 BLAKE2B c15c237365f3b668f0a2a451dda8800b7ecf315037c279117aefa502a02d72ee5c94e0ae09afd261b8f6e1b5748144d0c21bade4bbad44febdec2ced68536a75 SHA512 89975759f20f532198d4f0c391504c0f6938ec0c7386248e657dd5f2c7b37a9362c853987af354509e9c39c79ef6890d0893a147c4942c73db3eaac9ca6e2694
-EBUILD websocket-client-0.47.0.ebuild 818 BLAKE2B 5fc9172c79f8146758e0372251beb8037fff70213ddf52f4b604ea0cd0b83d73c95589e7a4e5fc5d74688f550be6ec56c0548223a476e3489f6b4ea33bd68dbe SHA512 0afe2f0a9ea496d627e35050bdef8135d9331f5ca0bfa94e34c1867fecd66ff1decc08dd7e99d74980dadd8b768c90f9bc3f6699f910d947a4cb136ee56af59d
-EBUILD websocket-client-0.48.0.ebuild 952 BLAKE2B 7be7dc86c1910f0e2325f1c77dd6e98d8533b853bf52da26df2a3f690d518846ae23f0fb0849401ce99b0a9ac1cc73fad4a1e9d27a478e516ce18a9a74e51f49 SHA512 fe85eec9d3f584fe7d09296d49ab42617f6cd68c1a2f674fbd4ca267a4f23ad70dad0471f9cbb541bd8558b152819925faf5c8a98e6b796141f49f39dc787118
-EBUILD websocket-client-0.56.0.ebuild 962 BLAKE2B 48d2d58ab131106ee42278f747cf7660f135d23902f15b949d7c677ca4d5292a032ca71662fb299b97cddbb5565295ede6ab5072f76fa237a82ea98d94c8c278 SHA512 3fc4df0537a279c39de0db141f70a6acc5ca3b9bae6b5a08794a235487349b8261775d67afe79c98456ad973787e5f1c078ac5785ebc14ac1c4c4b3920d605a4
+DIST websocket-client-0.57.0.tar.gz 39333 BLAKE2B 3e24c41176e0566edf0d31bcbb0ecd69d368a7ff879ac7ab8e4b170ca356b0ea50aa0b6be845e76ecdd73dff9a2aa38c8cdefaa202627f9f9d272989114fe94b SHA512 8677b00abbdd995ef1c2254f73a01713eb0707ee2549031f410205af7bbbf57b4730b38a78d683a90605c1412863f57a3829d8be1c058f3e9bfb177bd49c4525
+EBUILD websocket-client-0.48.0.ebuild 852 BLAKE2B 144b5c4d99737f7b5d1007e6bc7d95dd3d9835237fb9ad7bb3e8f7fd6e8e8c151f8ab29c75e1a8e6efc9f041aa63048bb41c681f02a477faaf2d0345b746400e SHA512 20eedc4fef93caff58e3dc64272a56bf8021dc75a2a68b966e4d7d78e038a0a6cb63c4fe2c857025d95abbaf2b42f3cd6f481e910d4e31c8728cdd4c22fe818a
+EBUILD websocket-client-0.56.0.ebuild 862 BLAKE2B 4f49470a78cb223484bf8f554c90c1e32720494afa4ba64612cb8e9720361c7c231496bb71f8cc39080786259f2c36c69c511a5ba5996250bbd377985c831cec SHA512 678e5e09c31f972bacf3df6b5d622945b8e2455eb361c601f4b0ac0506c15b8ed497f9579279df5313f07b29494b5a07de32a09192b5b72be2502248567ea3a6
+EBUILD websocket-client-0.57.0.ebuild 819 BLAKE2B 6453da75b246a8dedca001420cb0252ee39981827c449884a4f76385aebc13c7db94f6d2894cbddca0cc85d72d7b33472e9cf3876d43bc7ccad1342e1ecd4ac1 SHA512 eefe6aed53ec1f9750c44e9e35780718d2a040d055b93130eabe384cb2ca37456f9df24bb6c1df7c525b9b233f7a0d11402ed9d620de0aa40961f57b9684e2e5
 MISC metadata.xml 473 BLAKE2B 22faac31bc833792ca0ed170d4a785a85275c81403da85cf04003672ce00c1b28fcbcb0834f03cc872dabef36af53a30e53949c154586f3346c3b731a1fbe56b SHA512 1ed56113c593335003b4ccaadac76f39bf05ca4f403c25bf7f2de655b0047bec86088d56aab803a20540193748b2063846f0c6ea552514907b4ec9da6b6aa106
diff --git a/dev-python/websocket-client/websocket-client-0.37.0.ebuild b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
deleted file mode 100644
index 889f4ce28421..000000000000
--- a/dev-python/websocket-client/websocket-client-0.37.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN//-/_}
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/liris/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~x64-macos"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2*' )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-0.40.0.ebuild b/dev-python/websocket-client/websocket-client-0.40.0.ebuild
deleted file mode 100644
index 29e8e7ae2067..000000000000
--- a/dev-python/websocket-client/websocket-client-0.40.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN//-/_}
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/liris/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2*' )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-0.48.0.ebuild b/dev-python/websocket-client/websocket-client-0.48.0.ebuild
index e8f296182411..4e0e649e0a8e 100644
--- a/dev-python/websocket-client/websocket-client-0.48.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.48.0.ebuild
@@ -21,7 +21,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' pypy python2_7 )
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/websocket-client/websocket-client-0.56.0.ebuild b/dev-python/websocket-client/websocket-client-0.56.0.ebuild
index 3c2d3dbb4f3e..5f07a8576b08 100644
--- a/dev-python/websocket-client/websocket-client-0.56.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.56.0.ebuild
@@ -22,7 +22,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' pypy python2_7 )
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/websocket-client/websocket-client-0.47.0.ebuild b/dev-python/websocket-client/websocket-client-0.57.0.ebuild
index 2d5f427ae989..a9ecf6524a4b 100644
--- a/dev-python/websocket-client/websocket-client-0.47.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.57.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
-inherit distutils-r1 vcs-snapshot
+inherit distutils-r1
 
 MY_PN=${PN//-/_}
 
@@ -15,21 +15,26 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="examples"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="examples test"
+
+RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2*' )
+"
+DEPEND="
+	test? ( ${RDEPEND} )
 "
 
-python_test() {
-	esetup.py test
-}
+S="${WORKDIR}/${MY_PN}-${PV}"
 
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+distutils_enable_tests setup.py
 
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
 	distutils-r1_python_install_all
 }