gentoo resync : 09.06.2018

3 files changed, 71 insertions, 43 deletions

diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index b1cc633d973e..7f97350b49f7 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,9 +1,10 @@
-DIST mypy-0.4.5.tar.gz 779940 BLAKE2B 5242d57a5c0baf1f32e018e671c5eb21aee3ccbc4e7abfc578562c32c2be425848dcb7cd9a7d726268527337bb11f3dae88f1d79b5db87d1db857927ebad4a45 SHA512 e0bd4cb1080f2a4c0f2c4f9ebbe22d05b8dabb374396e7d91c645724b5d67084fd005e181847fccc45c9c51f3280233185fa6bf08dc24c2d4f6e482197246fa7
 DIST mypy-0.570.tar.gz 1050041 BLAKE2B 034d49627242ad67283689a653d416e956ae0b78287f78d910aa2b3b2b07af5a07d08503259a2c26bbf37154a52b120fcad1bfbb3daccbd9b80d4c1e9fedbddf SHA512 f0822d9e757faedd9cbce5e8b47782fae02523244688a3900a9f202de9f68b5ae094da65526fba79911a42d4d0621c4e5bf1984e57201117db8f5b630314ea4c
 DIST mypy-0.590.tar.gz 1081426 BLAKE2B 396083f81a1bf6f8230abe3e3e48b9fcf0288edfa6ae2bbcb7b6bd8f50f4e8dd093cacc326d561f5f10fce0bfd213e559d98e32a35a712bd022d8d0682f239d2 SHA512 129356a4326e80e292645e3b44b673ab463b1ad9b6388396680ca15a4c9aad6da2a3734a3da5d4ab005fb0572fd08863b20ba80e71af2e87d11546abc7fd78c0
+DIST mypy-0.600.tar.gz 1097269 BLAKE2B ee3327cdd7383a93f319335017815bb3341d1b91e3620f7bdc69d1c401e3c8aaa3157cfd8d4657fe072ad90b672017fc2b948ad4ff217d5e4ab91b8946d4569e SHA512 8e89bcbb53d385bbc3bf72de123d4a99230ee5154e1af19adccff7133f86495aa366058e04092356a80036214113ac90ecddcf5e30da59ae2a7c6f3d320b07ef
 DIST mypy-typeshed-0.570.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.590.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
-EBUILD mypy-0.4.5.ebuild 937 BLAKE2B dfc6b5f748358a4686100c956bc89e98075404383db7fe14f6d96e5f5c0bbba0ee036f38f355d0fb919471896cb85f626937cf86d362139d0c6d1593c96686e0 SHA512 853cf2f741d4a25df8f7f9e06b5c84f323f45279ed80ecfd2059444af1d8a0a766406382493ac161beb21901e30d21cee51dc3cb796902237d71105f31487f8d
+DIST mypy-typeshed-0.600-2dc7d39.tar.gz 425045 BLAKE2B e2ef63f2ed988f77f52e2a01c158ff8e3fbdec118c1f613ffe6c57d025da8d5bcf6dc0e6bcbc1bb8655fbf340a0f358535d7e1ed214a5a1af8e3188f2dde5459 SHA512 9c960c2dcb2cd5ed36d77efa47a5632698e841b685386f8d5a31200c61235b68d627fc450d070955ab14962d6a70a2d538929e2dc845512e83161c0299d91807
 EBUILD mypy-0.570.ebuild 1563 BLAKE2B 63d388c767582831259a05e2f5d602d708e3a69b5a7c15ee1215298168817c1a7408b9058c573aa6a79a3e59efab4c480ec233e8d90b72df176d1db60634b2e7 SHA512 1dc8d4fcdefe9d78bb9eca659a4f7e31c48b3ef9f7ca477daf08bf0ad3a18a62db1f68f0a84f6f76a18f1fc6c493fb508ec96ac24f827f671abe285dd63412e5
 EBUILD mypy-0.590.ebuild 1563 BLAKE2B 63d388c767582831259a05e2f5d602d708e3a69b5a7c15ee1215298168817c1a7408b9058c573aa6a79a3e59efab4c480ec233e8d90b72df176d1db60634b2e7 SHA512 1dc8d4fcdefe9d78bb9eca659a4f7e31c48b3ef9f7ca477daf08bf0ad3a18a62db1f68f0a84f6f76a18f1fc6c493fb508ec96ac24f827f671abe285dd63412e5
+EBUILD mypy-0.600.ebuild 1582 BLAKE2B 0385941aaf081377960c898b49222a79048e76203de3827b4a20fd8856eadb046ff6841dba3ed7362752355a56d880d9bb208749af15848fbc3317edd890f654 SHA512 543de4441dd2efd08fc5088592ee19a7da95193c06a05cdbfcfb0732380a2be0022b17622e33b80f51f522a64435e88efb21c332722e30743d6cb9a97f8e9cbf
 MISC metadata.xml 318 BLAKE2B eabbbb1b58582001a0158157e589abcca61c0de824b24eb03c9a905037de8cd1e26427f9a76a8b4836e78701caa073a0ca1d5114600421dc38e5e0de0f0f4cab SHA512 fc38c17a1e934579acb13def5f6c4649c9c20f1141c8506d89cb7f3e560222da570e713fcc10a97c66c19da3832b7d106f5c9ea3045cc961c43b48e726a5a80e
diff --git a/dev-python/mypy/mypy-0.4.5.ebuild b/dev-python/mypy/mypy-0.4.5.ebuild
deleted file mode 100644
index d117678c0182..000000000000
--- a/dev-python/mypy/mypy-0.4.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-SRC_URI="https://github.com/JukkaL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="$(python_gen_cond_dep '!dev-python/typing[${PYTHON_USEDEP}]' 'python3_3' 'python3_4')"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	local PYTHONPATH="$(pwd)"
-
-	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mypy/mypy-0.600.ebuild b/dev-python/mypy/mypy-0.600.ebuild
new file mode 100644
index 000000000000..667a3dc20fec
--- /dev/null
+++ b/dev-python/mypy/mypy-0.600.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [ "${PV}" == "9999" ]; then
+	inherit distutils-r1 git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	SRC_URI=""
+else
+	inherit distutils-r1
+	TYPESHED_COMMIT="2dc7d39"
+	SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			 https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${PV}-${TYPESHED_COMMIT}.tar.gz"
+fi
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+CDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/psutil-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.1.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.2.0[${PYTHON_USEDEP}]
+	"
+
+RDEPEND="${CDEPEND}"
+
+src_unpack() {
+	if [ "${PV}" == "9999" ]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		rmdir "${S}/typeshed"
+		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/typeshed"
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}