gentoo resync : 08.01.2021

5 files changed, 3 insertions, 136 deletions

diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 1c29ab2ae89f..1f5603731ea6 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,8 +1,3 @@
-AUX flake8-3.8.3-pytest6.patch 1883 BLAKE2B bd4eb8f184636bfbc33b262df8c5612402a1741670531068f2ca9d15f03633e27030819c6b9549ba88bc8c37307a65a0b714e48e4c846e73b80d31578c49d8c2 SHA512 7179106e01f1562d7dbeb3b4e2b4285bbbe29373f776e0d03aecc5e5c44b2e650016ed34409935a66184bb1ab9e6828e0c46f7c65526a6ac44c2a0885354e18f
-DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add
-DIST flake8-3.8.3.tar.gz 162305 BLAKE2B 7211c9ff99ce2e8e3094e6a7a1917ee1b3d61902a45408b9c84f077097af8d1b0571e27209ed78409c9931ff53fdb660f81d1886773b8ef74ceb0bd3de60420c SHA512 007158ea5caf60ff84e935f1b74a5f746fba00991c8808395ff72126dc1a8c8e135badc6f1f383027349076b8f3e146e9d0af27b6e24cdf97390463fd69ad940
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
-EBUILD flake8-3.8.1.ebuild 1371 BLAKE2B 841f63744632064b0135c37df7dcc9a7e25ec7d5fe2913ee86270cc916eb1d8ad37c8edfa5d34ac1e82e21e8082271151a3e17c756a18cd9502b2056d551b363 SHA512 c72e4ea3ff2029fd9a3752b13ddff84fe0e507ef5071d03e431419d2cb17fff8f57e2bae7014dea99040c39b2361f1d0db2ee8f63a90576395c5209254a5e084
-EBUILD flake8-3.8.3-r1.ebuild 1227 BLAKE2B 1eeaf5f80a7994b20d87de231577c8b08151fd44098ab6054c5456b8f077cc1e4cdd1f3fbf320a18caad38d3995e3ca06f06baed30eb377c26eaee41415648e3 SHA512 76a7aa5c2a6c0d6b35509d57b582478ee0acf5a14de9e4697aeca465475ad2df6658d09bd1ff6c2225e6d0a0037bfd034b779a185648e9f85f646a2dd41632b5
-EBUILD flake8-3.8.4.ebuild 1195 BLAKE2B a79ccb98a42db8e5e0d5ecd2bb10a9c930f1d4d4a97e53c6b216294a9d1f684a6f827a25d5f995a4497a61efa9d6895f33fa1f1a655c1335b4a548732cf21baa SHA512 077887525adcc75737bdcf2ac8897fc4632f260d6ca9ad1b7217b1fb7f6306e86a8c5bf3ccaf3193b89243fcbd5829eeba09d182a79191d18c45afe03fc9f2df
+EBUILD flake8-3.8.4.ebuild 1188 BLAKE2B 2909f040668bc79ab99961de4bc1127789f43cd9d3908bf0d672ef71049d8d3e60f597bcb4a81556914b48bfd94bd3e6a2997421d6655efecf0341a57d3872e7 SHA512 468cd882ca9d94eaf9f41d6bdaf5d39975a0859f2fce49435004f46a86dc3da4a9cf0779663789ebb0bdcf379e5a06ef2c89566674eb9a25d0c61ae65e2d2944
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/files/flake8-3.8.3-pytest6.patch b/dev-python/flake8/files/flake8-3.8.3-pytest6.patch
deleted file mode 100644
index 78e7391d0379..000000000000
--- a/dev-python/flake8/files/flake8-3.8.3-pytest6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 91b09d5b376cfb8afd4b6af5b407f57aa42011c7
-Author: Miro Hrončok <miro@hroncok.cz>
-Date:   Mon Jul 20 13:18:23 2020 +0200
-
-    Tests: Add a value to mocked entry_points, so pytest 6+ can log it
-    
-    Pytest 6.0.0rc1 attempts to log a repr of our mocked entry_point,
-    but it fails, becasue the repr metohod expects a valua attribute:
-    
-    Reproducer:
-    
-        $ tox -e py38 --force-dep 'pytest==6.0.0rc1'
-        ...
-        Traceback (most recent call last):
-          File "/usr/lib/python3.8/logging/__init__.py", line 1081, in emit
-            msg = self.format(record)
-          File "/usr/lib/python3.8/logging/__init__.py", line 925, in format
-            return fmt.format(record)
-          File "/usr/lib/python3.8/logging/__init__.py", line 664, in format
-            record.message = record.getMessage()
-          File "/usr/lib/python3.8/logging/__init__.py", line 369, in getMessage
-            msg = msg % self.args
-          File "/tmp/flake8/.tox/py38/lib/python3.8/site-packages/flake8/plugins/manager.py", line 44, in __repr__
-            self.name, self.entry_point.value
-          File "/tmp/flake8/.tox/py38/lib/python3.8/site-packages/mock/mock.py", line 632, in __getattr__
-            raise AttributeError("Mock object has no attribute %r" % name)
-        AttributeError: Mock object has no attribute 'value'
-
-diff --git a/tests/integration/test_checker.py b/tests/integration/test_checker.py
-index eaab5c3..0acdb6e 100644
---- a/tests/integration/test_checker.py
-+++ b/tests/integration/test_checker.py
-@@ -100,6 +100,7 @@ def mock_file_checker_with_plugin(plugin_target):
-     entry_point = mock.Mock(spec=['load'])
-     entry_point.name = plugin_target.name
-     entry_point.load.return_value = plugin_target
-+    entry_point.value = 'mocked:value'
- 
-     # Load the checker plugins using the entry point mock
-     with mock.patch.object(
diff --git a/dev-python/flake8/flake8-3.8.1.ebuild b/dev-python/flake8/flake8-3.8.1.ebuild
deleted file mode 100644
index abe4695b59c7..000000000000
--- a/dev-python/flake8/flake8-3.8.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# Sphinx and friends are not keyworded for all arches, repoman complains
-#distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# don't treat warnings as errors when running tests
-	sed -r -i '/^[[:space:]]*error[[:space:]]*$/ d' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flake8/flake8-3.8.3-r1.ebuild b/dev-python/flake8/flake8-3.8.3-r1.ebuild
deleted file mode 100644
index 9c7cef136a03..000000000000
--- a/dev-python/flake8/flake8-3.8.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-pytest6.patch" )
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
diff --git a/dev-python/flake8/flake8-3.8.4.ebuild b/dev-python/flake8/flake8-3.8.4.ebuild
index c3d63314f8bc..8da47400b611 100644
--- a/dev-python/flake8/flake8-3.8.4.ebuild
+++ b/dev-python/flake8/flake8-3.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="