From fe84e791d89cf3294863d6e4e6b2e88454fb0f0a Mon Sep 17 00:00:00 2001
From: "Andreas Billmeier (@STR/VW3)" <andreas.billmeier@streicher.de>
Date: Tue, 27 Jul 2021 08:20:00 +0200
Subject: [PATCH] from main archiv restore mypy-0.902

---
 dev-python/mypy/Manifest          |  5 +-
 dev-python/mypy/mypy-0.782.ebuild | 80 -------------------------------
 dev-python/mypy/mypy-0.902.ebuild | 50 +++++++++++++++++++
 3 files changed, 52 insertions(+), 83 deletions(-)
 delete mode 100644 dev-python/mypy/mypy-0.782.ebuild
 create mode 100644 dev-python/mypy/mypy-0.902.ebuild

diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index c7c7db6dc..d5137103c 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,7 +1,6 @@
-DIST mypy-0.782.tar.gz 2056932 BLAKE2B 76f91a3b708c0e0ca3fdbc8364ea720ef5c722aeea90e4e1dd28c73ac0023674db2d9c76cc084f19e7f98e067cc5fb599469e0dc16095bae70fb36926186db7b SHA512 08444abc3cb8f57dcb1ebd90a2248019e0c69c255b0b82c879291b00899018795810d70467a9c350c0564c0961b6f146d63d33238659354336658ac559f97f95
 DIST mypy-0.790.zip 2431919 BLAKE2B 51d6e93c4023025bd7720f5ab41195e3aa3d3ebce797c43485ed2df197d38d25275a97a041629407a306b7b636af7217fe3629911965a6cad098b4ebe5870416 SHA512 865fae439443c7796082a86e897a5c860e148e8747c6ebc34f0eb354484b992c388bc32b12c703d941766450f41afa29cee4909ef3d6c931e717c541460ebd2e
-DIST mypy-typeshed-0.782-e199c2e.tar.gz 541588 BLAKE2B f663d0feccffb315efd1b6e3ebc54bbe3cf4c7873c240ed54c7be1042807e2213326db8756b5a540fd9bf5ae95a2c0850e8cb35ae2e849ec3e9a628367fabe72 SHA512 57f3159d909799838779c04ccc6541322c27c01efb026c26a145676fa75076f64b8cd3e99f7488501582c743e1102cad59320512d52d4a058d8731c54c0705cd
+DIST mypy-0.902.tar.gz 2549241 BLAKE2B ba8bce0434b08c379907f96f22c030048ff8c45f426eb4a6b6951059974bd3f35b5e6bc759b9b6ff0237d43811d01181e58ea2cf919fda3e2649c37825d86134 SHA512 b896d5a614982d60dbeffadf56a5faff3d809c4d2af299fc658a67c09c3f36cab961d8516d38ea682227d9a06613a3aff7bb041ba1346354b81ec1187316d258
 DIST mypy-typeshed-0.790-58ee9c0.tar.gz 588345 BLAKE2B 1b6911f38b89549843a5d95d6d69bbfb505e8979aa123bbfcdfb046b3ad3da1ddfa79605e2c0d5404a726dc9cb190b2c221f2a9ea8a23c3f91bbdd44bc775b9d SHA512 711324a5d7cfcd54a07698a52416f70aa67b52cb3282cbbf64a2760874cc00110428be311db5fd4cfabcc9fc3ca4452c1382f2307c11fe396c27f72a15797e3b
-EBUILD mypy-0.782.ebuild 2080 BLAKE2B d7200afd9bd0178f180ea08a68715eefb8406ccd0dfe9c27ee454f55ee9c7df01fa6cfc7e673e95430deb67d4376fe563a4428bcf0499591523fe3de7af67265 SHA512 4ed85b643f8e99f4258a2d9aefbd35e71073b9e5fee24e3d85a2af0576f47b308507ffdb8369bdedc1a9a88ae7de5b5851bc94b0a37eb8cfa36311d21c6d3cbd
 EBUILD mypy-0.790.ebuild 2076 BLAKE2B bd7415145d690032942c5bdd77abdb3f35d905c37b6a2b0d89529494d9c93c0ea043e6d81413182a37253b6f94171ac2d696bbf0e0e3a551e97dfd3596d366e8 SHA512 a330852f482d6e0a0298bd76f62be9ba26965a67bbc682bf0ca54a4b2c703c9cf1377f873fdcce7b9ad1fc58b4b5729b56b91cb842beac452693c511664c4c6c
+EBUILD mypy-0.902.ebuild 1450 BLAKE2B 16ca5da758fe4677008d9b509f548575cc2f904ed8c9db871f8e6a631b7bd9cdaf0c5618c3a1fff263c32ae14c5a116f36f87b6fe4cd253c76d71fafe09e3ea5 SHA512 c417cc857a6129cdd00245e9262caae2cce3b24cd3118fcba4aaa344b56ce2e744e627261e461417083577d7585eb642adcc7fba64a870cbb886c4cf42c60446
 MISC metadata.xml 454 BLAKE2B 932219fbce42dca57af572b0c3a6d541adbc8ea5b52d4823d3744bb698660544c19aacc8f5fbbabbad85625b26e2670bf03f9e828c46fe6aba3b50b2616beea0 SHA512 fcdc27b48eba35950d4b97454637b896eb14f8e0f8e8b01ec1f9126e2adbe6d08034942ffa77ade3c9bd50d1939afee6369c4d12d4a7c1867f4c92beabe10993
diff --git a/dev-python/mypy/mypy-0.782.ebuild b/dev-python/mypy/mypy-0.782.ebuild
deleted file mode 100644
index 823e50f32..000000000
--- a/dev-python/mypy/mypy-0.782.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-if [ "${PV}" == "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python/${PN}"
-	SRC_URI=""
-else
-	TYPESHED_COMMIT="e199c2e"
-	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="https://www.mypy-lang.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/flake8[${PYTHON_USEDEP}]
-			>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-			>=dev-python/pytest-cov-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.1.1[${PYTHON_USEDEP}]
-			>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-CDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-	"
-
-RDEPEND="${CDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	if [ "${PV}" == "9999" ]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-		rmdir "${S}/mypy/typeshed"
-		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/mypy/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
-}
diff --git a/dev-python/mypy/mypy-0.902.ebuild b/dev-python/mypy/mypy-0.902.ebuild
new file mode 100644
index 000000000..07dec288d
--- /dev/null
+++ b/dev-python/mypy/mypy-0.902.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
+SRC_URI="
+	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}