gentoo resync : 25.11.2020

3 files changed, 17 insertions, 39 deletions

diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index e3bf220ec8a1..a3e826d3912f 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,5 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
-AUX pylint-2.5.3-no-pytest-runner.patch 533 BLAKE2B 0882d3b057cd214ac04645c3992585e9550624f551206d863817940846fc6bd7d863431c33df46f0a83379fdc3ab411949b73f0475e08fd7debd465d83e848eb SHA512 9ed1784e83693b2aeff1862f9592fa574f20bb2d513f3bdef34b895263a31d6d747b4c76d09e6d48e15031388cd70b01caabfd84628ca98e1634fa42b6988eae
 AUX pylint-2.5.3-tests.patch 455 BLAKE2B 608ec913ea9d8088c3e7303026339eca69cbf706601ccb841642eef83ae9eccb7d6863da6c7957f9f49a81f24d17e72d835c3740ef177ced6356bec7510a0221 SHA512 dd1930e47dc342cb76fe55fad22cde3b4d5935a62c62d740b75e27701606bb8d5513b8f2c9e2f3116c0456a545a2c56f6d75b87903e2cdec1df97e4b8ed1b532
-DIST pylint-2.5.3.tar.gz 684449 BLAKE2B 7b494f5334376ff571fd8971851198d037e87c5be83d0123fcb108701489769785164bb077eb10b4851c89b82dadc40c510186eaf03be1621c4d78c79dffbceb SHA512 03fcd893d361b66794f17433e90df108099fee2eccb35507c7f61befb8db846f0242e5ce2b4ee63727c9cc780a376c3b93d5af3186f884a4fdaad68b224ed7d2
-EBUILD pylint-2.5.3.ebuild 1608 BLAKE2B edd1ce858dc80cf214232cc05e46293949c989766f3693d29a9d544663d8a17ee43db50370774756964090f2958aea04d80f7f2d9db5c05df4d5fbc1951fc6a1 SHA512 bee7ae021b2cb2fabb5bb6c4438637fcaf56ab89cd71efe6d4b1b20196a33725fbf0b8074abffdd8d56b1ff28f5746949441fb39dc4a8f639079d563237ca54b
+DIST pylint-2.6.0.tar.gz 680289 BLAKE2B f7d4159478f667a3234beefd148857f26c8f7ea3aae3bfa70fa06fe2a8d86fcf22a0727a9fa5d8fc3de4aa0bb7a4d6e13bf68029f359122762d1e0d24a0b715b SHA512 02881fe14401bbe946618ef947c8db320a6c8dd93626402260d60468538ce67b61d1e8b921bfb1a6020514dd392e9b0021c97ddb60b45866c2d2241224f93f08
+EBUILD pylint-2.6.0.ebuild 1595 BLAKE2B 66450777e67e570aff03699b86b3ca0f446654e1645f313da1fa0e24975d74600ba3f02bd6690a8ad8b79ba23e49f348ea04d626b24a2fcc14473e05f4fd347b SHA512 af36f10153d01475e96931ff35ede39540c77368b5e1045a9cd9ff8cfce70737d406c28f69756d9ace5c6bc9f694e3d8dc6059be8ff12d1741f4a45d1a33867c
 MISC metadata.xml 1099 BLAKE2B 5933d1532c718b45075ebcf1c4d5010d855f4d8d1034b0a96ae6c64ecab6f03212a7e261215dfcb70e688521f17070e7875fdefe427a4f4a3be2eedde2b36605 SHA512 0d7fb923cfaa8af4c4d1fb294f16a686a22f10c248111b135b76f2b56a1a42f7bdb3337d5f0080d6d4d2b449743ad89358e86f3090488d0d6baf4f8faee2c79a
diff --git a/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
deleted file mode 100644
index f4cc6be360de..000000000000
--- a/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 92d059ff..cbc5b881 100644
---- a/setup.py
-+++ b/setup.py
-@@ -67,7 +67,6 @@ else:
- 
- 
- needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
--pytest_runner = ["pytest-runner"] if needs_pytest else []
- 
- 
- def ensure_scripts(linux_scripts):
-@@ -151,7 +150,6 @@ def install(**kwargs):
-         extras_require=extras_require,
-         test_suite="test",
-         python_requires=">=3.5.*",
--        setup_requires=pytest_runner,
-         tests_require=["pytest"],
-         **kwargs
-     )
diff --git a/dev-python/pylint/pylint-2.5.3.ebuild b/dev-python/pylint/pylint-2.6.0.ebuild
index 8cae6d66c8b7..861ac0ae8765 100644
--- a/dev-python/pylint/pylint-2.5.3.ebuild
+++ b/dev-python/pylint/pylint-2.6.0.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+# Not ready for Python 3.9 yet: https://github.com/PyCQA/pylint/issues/3895
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
-# entry_points is added via **kwargs in a dict
-_DISTUTILS_SETUPTOOLS_WARNED=1
 
 inherit distutils-r1 optfeature
 
@@ -20,26 +19,30 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
+# Mirror requirements from pylint/__pkginfo__.py
 RDEPEND="
-	>=dev-python/astroid-2.3.3[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.4.0[${PYTHON_USEDEP}]
+	<=dev-python/astroid-2.5[${PYTHON_USEDEP}]
 	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	dev-python/mccabe[${PYTHON_USEDEP}]"
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
-		${RDEPEND}
 		dev-python/six[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-	"${FILESDIR}/${PN}-2.5.3-no-pytest-runner.patch"
 	"${FILESDIR}/${PN}-2.5.3-tests.patch"
 )
 
-distutils_enable_sphinx doc
+distutils_enable_sphinx doc --no-autodoc
 distutils_enable_tests pytest
 
 python_prepare_all() {
@@ -52,14 +55,10 @@ python_prepare_all() {
 python_install_all() {
 	doman man/{pylint,pyreverse}.1
 	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
 		docinto examples
 		dodoc -r examples/.
 	fi
 
 	distutils-r1_python_install_all
 }
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
-}