gentoo resync : 22.12.2021

3 files changed, 65 insertions, 2 deletions

diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 0286988d5c20..355f588d76bc 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,4 +1,6 @@
 AUX mypy-0.910-py3.10-tests.patch 1821 BLAKE2B fda18540f14b0fcba8d57bb7e072135f7415ecc39750424ee03fca835ab65491fb8966326e7f51b260b7f1b98e9bc408eb04df4a74e6007a5c1c72b28ed8a950 SHA512 64a6b2361260b0ce9bb22e706b2531af4ac2894191c92501274368d92beb159e53b4da6174e7f91ef4b2f7752936d86250b5fe8347beea1bdf223b7abda98414
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
-EBUILD mypy-0.910-r1.ebuild 2058 BLAKE2B ed6b17b36e62f71371423b28e7d2b8a3ace044efdf9e7d178a3039e0563255c56d07c90590490836f2e8b286cb6da43f102f56b01bcebd97aacdf65092b9bf22 SHA512 f4e2351b28ce93adc4b0dd1977f2b4f64293a294e7b1699d9d7103dd564ab418fffc6d44285183c7ad2679fffaaae72ac65e79cd052a438462f52f40ad05878e
+DIST mypy-0.921.tar.gz 2730985 BLAKE2B cfb7b54165b961758891fcf225f1a7d6bd9c6a7b14e6bb6d8adb990ed047bc4983b5e82de6709d3b8db85a3914e1bae2be4fd36e878d37db7387ebe6e81daac1 SHA512 f592d440b45a1bbcab973aeb717ffc805164168f1369793067a46bd2884fedcb9f981bfadd3447c6801120042553a7a7110d8cfc4e1649241d3b8685dffef653
+EBUILD mypy-0.910-r1.ebuild 2064 BLAKE2B 1414bf4e87e49d283ad99c621792f1a8c9d47adff14f426949b3825fa8136db03bb6289fecf9cabb311eadbb7b11e4d808e5d5698224c4b028dd9aff2fcfd98f SHA512 48ac5b30de896c4e4191edc20f6c435aa7fd6d0388a99e00ed51e8d27d7a40298e7ae070c6dc786d6e55d62c0963b809a427f066ef96fc3a2e2d17a33164147c
+EBUILD mypy-0.921.ebuild 1879 BLAKE2B 0939ecbed7865716f208ea6683ffd6c076e769e4e0931d036b57640981e2a7b105dbbf49ade6a35e0eeea376439a58cc781e5ee69c1499dafcb053f9f18488d9 SHA512 5aace31c9a2df86b445ae25c44a2d3e0fd64912add86510de7baea42a3ad77a0fd4e3f86776eea493cb7975955a59f7243e281f1b62e1d84db44dc605a07d9a6
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.910-r1.ebuild b/dev-python/mypy/mypy-0.910-r1.ebuild
index 27b8e89ee5e7..dcee802477a7 100644
--- a/dev-python/mypy/mypy-0.910-r1.ebuild
+++ b/dev-python/mypy/mypy-0.910-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 # Note: replace toml with tomli on next version bump
diff --git a/dev-python/mypy/mypy-0.921.ebuild b/dev-python/mypy/mypy-0.921.ebuild
new file mode 100644
index 000000000000..5b0169a2ae37
--- /dev/null
+++ b/dev-python/mypy/mypy-0.921.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!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}]
+	dev-python/tomli[${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() {
+	local EPYTEST_DESELECT=(
+		# Fails with pytest-xdist 2.3.0
+		# https://github.com/python/mypy/issues/11019
+		mypy/test/teststubtest.py
+	)
+
+	[[ "${EPYTHON}" == "python3.10" ]] && EPYTEST_DESELECT+=(
+		# https://github.com/python/mypy/issues/11018
+		mypyc/test/test_commandline.py::TestCommandLine::testErrorOutput
+	)
+
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}