gentoo resync : 19.03.2019

4 files changed, 37 insertions, 6 deletions

diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 7ed836d4d4b9..40145e68bade 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,7 +1,9 @@
+AUX pylint-2.3.1-no-pytest-runner.patch 395 BLAKE2B 06d770f92d8772afa9febed3281e70f3aa08ea50b31bf3aaf87dca4acb0a7fabfdae6b5481648ccb7ad6db6f5f9eec29f2da13bbd9689aa080aebafd9aabef51 SHA512 3ae8024c82d426d841106ad43d165524de243d1c72ecf5883d39806f735bff87087db4ac109dc59a3a164e218e3b75647877fb56d52ef8ec387884da2e4b5404
+AUX pylint-2.3.1-sphinx-theme.patch 537 BLAKE2B 62f83fdaa8c1ec45f8ef7b03e7aafd85a00358ebcd906f098294356ec0dabf56e31e00a4336edaf4c1b7c5823a555de1aa3314f0f07ae3f729c20ae93e0d23ee SHA512 c5168423de4bcaf945b4d17cd766056f4f1a9c93cb082ea76df25f4335fda05118bf1309b8f622876625a15c0ccdfdb47a2daf2a9da66f87ab4047d0d2e3b656
 DIST pylint-1.6.5.tar.gz 465578 BLAKE2B 05412a528878633ef7529dd2f2d2d1989bc9406666626d62764f476bbc024e34fea06883fae829fe6617ebfffde54dfa5600c140b9a25e6c9633f48d76f5c331 SHA512 2fac352dc752b37f1ce4f7fefe5afbbc880d7e6c38f164d1c50734716af1dd6fe31f7d41e145a8256837d5a63b1989efec40c169fc14840cf8eb4e18d9bb2410
 DIST pylint-1.8.4.tar.gz 512582 BLAKE2B 623e224ec71756cc2528346ac62b8e58ac4d5ef55d9e31e667d5389aa5b2dad712f60c7e90df5c831f57bf28e0ccbd00ddece4ade46410c28b67adb1a041a85f SHA512 07e55ed3f09326e1973215046e3b172f6065a7ed0ae657cba7a6825a26bb103bdbf8b83126bafd99f332fe0eec3547bcd6e618d6e9f612ddcf9c504bb850dcd9
-DIST pylint-2.2.2.tar.gz 568313 BLAKE2B a6a3a48a96820bf9412dbd5f3e643d95fe7c9ead9752920d9979debaf5da53a3b5076c39975dd37420c86b71fd2ed2f513c42663fbaf1e6103a0958271773c58 SHA512 29a9bf39413479cb2996b1a2e0d3aaa1845faf3038b17c30948554c359fe8cc858e9bfc0488ed0af204daea22e0ab36d765c447eae66ac7ac6d60d66d9a33fef
+DIST pylint-2.3.1.tar.gz 577767 BLAKE2B 2af206a9d9be04f369c2bbc39c5ddb80c29a5a39c20d75bfec84498882eab628a7cf5abcc5786933304ed99bd00ffa142b9a58abab348c947799f962b877bb30 SHA512 924d8adc95f04ba750b3b44fe79ac569151ea7c8f693cc9867bcda3878209ebc2202931702b98f80709d161d3781b6e181aea0ded35a3323c023497e2a749ea9
 EBUILD pylint-1.6.5-r1.ebuild 1804 BLAKE2B d88b604448f1326055a1b4b4fa3fce7723b8c49c438f771bc323ff0be1fb8bd1498e3c587eceb3274accb603ec128c27320102c2eb383b4df9bde1524f9ad18a SHA512 6b0e624b12f80af0b043e27833381cbc4164c0a20822876954946c7715cd6448e6878811e1f9a7eac32a47b2699eb7b06a1442426dd38920213636a5562052b6
 EBUILD pylint-1.8.4.ebuild 2451 BLAKE2B a76323ce66bbd966c0e10cd70aeffd6454b5c6ed87a8861500466f4e342ebdf21d56176465e5b6502c8010d832895f0cf73c86c259ab63274336b4f3b98b9fdb SHA512 0a2660423ec69a7dda3c1e12f6abd51164baaffac294fa4e30d43bf08e7187d60e513e5b4c6de685b9de934c0e1b81927e527bb4c025122dded0f282183ef5cd
-EBUILD pylint-2.2.2.ebuild 1591 BLAKE2B 82c54e2202f53105abcbc2f882361e178d2bc3009203d671084fa53363d3c5e53c7d901d26361f8e6ec06f274a47807e0b196f9c1d9443c433982bc59aebcab0 SHA512 ab010530513c30ac4216328eecae79d5dd8e57c632c2d7b043458ffa228a0f27282287d91a1825e905abdda5dbc12e7c20fe7c80320ee1059762097dfbbad031
+EBUILD pylint-2.3.1.ebuild 1607 BLAKE2B 1e413fd096f6e4e5fb5dc51458ec28b27de059fafaac043a1db3f5f7fc0db6e1f645dc7cb980a0d714db31b771acc0b6742d8a7296981ac4863ea5943c712cfb SHA512 d29a5db8256e156f0178afe7594a1045a7643bf66fbe66ab78c010247cdb86bdd741cd88b7295a403db64a609f75152d67ab7a4b5ec143b7df5f8083d63c8edf
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/files/pylint-2.3.1-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.3.1-no-pytest-runner.patch
new file mode 100644
index 000000000000..4caf59bb30ec
--- /dev/null
+++ b/dev-python/pylint/files/pylint-2.3.1-no-pytest-runner.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index a7b5e413..841a1c0d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -169,7 +169,6 @@ def install(**kwargs):
+                  extras_require=extras_require,
+                  test_suite='test',
+                  python_requires='>=3.4.*',
+-                 setup_requires=['pytest-runner'],
+                  tests_require=['pytest'],
+                  **kwargs)
+ 
diff --git a/dev-python/pylint/files/pylint-2.3.1-sphinx-theme.patch b/dev-python/pylint/files/pylint-2.3.1-sphinx-theme.patch
new file mode 100644
index 000000000000..9353a90957f3
--- /dev/null
+++ b/dev-python/pylint/files/pylint-2.3.1-sphinx-theme.patch
@@ -0,0 +1,14 @@
+It's not worth introducing a new dependency for a mere sphinx theme...
+diff --git a/doc/conf.py b/doc/conf.py
+index ada9ec49..2bd66593 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -99,7 +99,7 @@ pygments_style = 'sphinx'
+ 
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
+-html_theme = 'python_docs_theme'
++html_theme = 'nature'
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the
diff --git a/dev-python/pylint/pylint-2.2.2.ebuild b/dev-python/pylint/pylint-2.3.1.ebuild
index a748dde9b802..7e1e963e3a5d 100644
--- a/dev-python/pylint/pylint-2.2.2.ebuild
+++ b/dev-python/pylint/pylint-2.3.1.ebuild
@@ -20,18 +20,21 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
-	>=dev-python/astroid-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	dev-python/mccabe[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]"
+	dev-python/mccabe[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( ${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.1-sphinx-theme.patch"
+	"${FILESDIR}/${PN}-2.3.1-no-pytest-runner.patch"
+)
+
 python_compile_all() {
 	# selection of straight html triggers a trivial annoying bug, we skirt it
 	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml