gentoo resync : 30.04.2018

5 files changed, 17 insertions, 17 deletions

diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 814091fb570b..5bf44e72c9b4 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -1,8 +1,8 @@
 AUX ws4py-0.3.4-tests.patch 2439 BLAKE2B 0d0a185104b073ceed3c745f46b67df5916b001f5e67be50000ef1c68f923f2375be248f4961739180d4992db6fdf11d2ba3558a4725cd4f3d330303fc9c01a1 SHA512 fb8cf920ac48aface7e50576c1038db47133c6a44e7d4ef1b965d6efc4374d22392e44bfdca64bd61696a5c6ed884ef6b1e410e515ed6e1856c7f3c4862d19ff
 DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc118a2744ea4aabc54c91efacda94cb3018550049d617b6759198cfbdb4497a024c597de942abe9e5517ab6 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
-EBUILD ws4py-0.3.4-r1.ebuild 1786 BLAKE2B 80ba523bfb22ce3bc466ca231da610d15b5139f01f7165ada06006cdaf75123000eae716ac3aae6ccf8e14fe12a20fcbdec19fff82ebe59da7a3a5a19345d569 SHA512 7d3d17f5391d811570916d6cfe15c22a4b1035757df68c6b16175e2f4744fb4eeecfbcffe93e39b31181d55520d177c3350cc793ee6624f3a15f3924a26f94ed
-EBUILD ws4py-0.3.4.ebuild 1744 BLAKE2B 60b5ecfa1ae1f3732be19b927ea594e4b2c1ffd9a0980365b684ca578f40276f4c5432606b43c9bf2ff841d73d52057fbf600833fcb528c5b3c6639c3129a6dc SHA512 c286aac539f135c63001503cdb1ede1cdb5c589a5871025ff1b445c257fc68859bac8022c13b4bf4b9b43940fabe6786e285f521ea646f5eb10b8f0edc8671e9
-EBUILD ws4py-0.5.1.ebuild 1757 BLAKE2B 91537d7c377c77209c934fc1bd2cebe54fe8ae6053c2831cfe243fa306ec5a236b9f2ac9fc298ec1dddca03f347ffa327f47e968f90cfe9341bf3ea6662c5905 SHA512 8fb67724223be45dc4da1f9d3e03dfd151029cefa0efd05dfed89bf6ad9808f00bfa458c0abe5fa0c670b97ba318ea753818f7974518a865b09c949c12776c00
-EBUILD ws4py-9999.ebuild 1758 BLAKE2B 47a6b79fe9acbb8b336165f0080806dcf5929596fd95daad03211a398ad34c648e4935dda3a54b11b3fbc9ea33947187a6a279eba3cf8c86a7478b5eff7cee39 SHA512 db3f7a232a93c30bc77bbf1c3840f228ecbe1539499c271c8a4a3ff26b75bf75c3426e07a9292466594b01bceb3df1580367a74ecfae8f00912a77617ab16efd
+EBUILD ws4py-0.3.4-r1.ebuild 1792 BLAKE2B 107b4226d4f723a7ed44ac4531627418ebd9a9c5ae518269abfdd104de55eef742bbd85e10938b02c84e99f6ecb7d3d567321f9cd8c46c9e3628370798899fe5 SHA512 9ba47e3cc82a542e5bdedf0b04aaf35da3ead826e8c67ea6d1eccf6c8ab03045fa1ee0ad4ed3a462ff488ebd8ca94e58035fe74eef2b686ac27121f593f88832
+EBUILD ws4py-0.3.4.ebuild 1743 BLAKE2B 5797daa805c311bb89e6ef14ff8b86ec77f8812935e2fd10f34167d829c24d418ab8af04ff416fa62628f83bc33fe7e66728414ac77d4a837ae3c46e835c9d0b SHA512 91d39f5109f2f98409c4a6bc33b55ecc9ae612427b4c434d1df2b75c74846ebc642814bc0b81d958592146ce1777b1dbb47d75d12460a2700139feb1ef678eb4
+EBUILD ws4py-0.5.1.ebuild 1756 BLAKE2B bd83be441081e43d8d304a863b5e65260b4d7da44b925510c19e80d2939e1471a33cf6d6b728fdff55528267f72b0d456fa6d271190646827ddb41298d788851 SHA512 878bdf409ac89a5d07e7b8f2b3c2e76a54985050b843e12f695ec172ec19d1ae1dec8f7c40ea08c6e1a19d8a6a27ec5d699cefeb822ff50e710c5455358ba810
+EBUILD ws4py-9999.ebuild 1756 BLAKE2B bd83be441081e43d8d304a863b5e65260b4d7da44b925510c19e80d2939e1471a33cf6d6b728fdff55528267f72b0d456fa6d271190646827ddb41298d788851 SHA512 878bdf409ac89a5d07e7b8f2b3c2e76a54985050b843e12f695ec172ec19d1ae1dec8f7c40ea08c6e1a19d8a6a27ec5d699cefeb822ff50e710c5455358ba810
 MISC metadata.xml 469 BLAKE2B 7c2212a53fd485fe5e99a53741f0d828bf09fca7dac40ddd1c0326eebffb1f0fef0c305ac00d61747d6184f3f309e711157f0b715d3fc49694bedabb9f09d513 SHA512 a368692c9de68b711cae8c35305b35e445f47046ecf2226d36d5944be4e8a6d29311c28c6ed74ae794517eb2f20c0b2eeeb0ce33e719029b843c8d23b2e2e838
diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
index 6ab67dfda7d9..ee738e5a2731 100644
--- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
@@ -6,17 +6,17 @@
 # Same for www-servers/tornado and USE=client ... so why not???
 # pypy is viable but better with a cutdown set of deps
 
-EAPI="5"
+EAPI=5
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
-	inherit git-2
+	inherit git-r3
 else
 	inherit vcs-snapshot
-	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -40,7 +40,7 @@ DEPEND="test? (
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
+	"${FILESDIR}"/${PN}-0.3.4-tests.patch
 )
 
 python_test() {
diff --git a/dev-python/ws4py/ws4py-0.3.4.ebuild b/dev-python/ws4py/ws4py-0.3.4.ebuild
index a7084914ad69..72726e9eda13 100644
--- a/dev-python/ws4py/ws4py-0.3.4.ebuild
+++ b/dev-python/ws4py/ws4py-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # We could depend on dev-python/cherrypy when USE=server, but
@@ -6,17 +6,17 @@
 # Same for www-servers/tornado and USE=client ... so why not???
 # pypy is viable but better with a cutdown set of deps
 
-EAPI="5"
+EAPI=5
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
-	inherit git-2
+	inherit git-r3
 else
 	inherit vcs-snapshot
-	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/v${PV} -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm x86"
 fi
 
diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild
index c1c647c9a5e3..b8797e5d4151 100644
--- a/dev-python/ws4py/ws4py-0.5.1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1.ebuild
@@ -6,14 +6,14 @@
 # Same for www-servers/tornado and USE=client ... so why not???
 # pypy is viable but better with a cutdown set of deps
 
-EAPI="6"
+EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
-	inherit git-3
+	inherit git-r3
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 74386cac1ba9..b8797e5d4151 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -6,7 +6,7 @@
 # Same for www-servers/tornado and USE=client ... so why not???
 # pypy is viable but better with a cutdown set of deps
 
-EAPI="6"
+EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads?"