8 files changed, 4 insertions, 391 deletions
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index f6eff1023450..ae01b1594563 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,16 +1,7 @@
-AUX 1.0.0-fix-pypy-tests.patch 9242 BLAKE2B 3a3c015dab48d3c671189ad656b6f208812b4ffa8805d9a27d581167c1b36ff0cc6219e0ed6688c21d8ec25d247b3c6fa7cbe92d06889b60eca1bd7e40c148af SHA512 4772c32ea90e163030953f3ade2bd2434a10cf0e3c9234f4acaf596a44a812581ba92ef1498998566a7bf78e1bb8c7051260ebf8aca4ca2cd3a04e21e307bbfc
 AUX pyflakes-2.1.1-py38.patch 1641 BLAKE2B c35e47c00b035d2488d49deab5207be6e539ba1c3683564ad1fea75b91e4d0e73a599a3ffcc9bcc7dca12fe7675e6e47c7e94fa2848d352c7be3639b07322efa SHA512 2605bf1c8f28eed285208219b3dd9816ae207ced87458c0f294ea6b3cb2e2a1f960fad257d3813b5e6dbfa07712644d5b38b28924340f34d3a8d701b09862222
 AUX pyflakes-2.1.1-tests.patch 7973 BLAKE2B d0b6663e9bb17e301e78104c08440a9bc7493e6cc2de56e73677c865d34b6bfcda39d2565414e6cd984a181c27cf7540e5de1ca9327103c03589f154d5bb4a3b SHA512 d4360525526ad0de395900aa4f986c03091ab06d77a3fe6ab92d4650e10a2a24accc5d77c1acb4800e095db5ed663d3ab13715c5433368c334891cee1b44dcc6
-DIST pyflakes-0.8.1.tar.gz 32981 BLAKE2B a4d02202e5cc9e1174d9296834edae7bc2c3d66e0081979438ceaa80dab9dcf41710b23015f8fcabea062d7dbb249ffc7521657d0860fd115cf58b441721b778 SHA512 b9843637891f3e82a8430121395ceb4ec5df48b5ba73b96a307ebcb4a393e8cebee1681e094ee1f71a85b58bd2f32562b78fbd61d3fa85634f3ac448b1244637
-DIST pyflakes-1.0.0.tar.gz 35365 BLAKE2B 7b0f676fcb1f77f85a4fa85f02dd26f181f7d8085ef3226cd06b3f1d33b9b235384c7da835b07b8128ac5ba56e8b5e4f0cb5736b25e18bd50c76c6ace9491368 SHA512 89a9ee2e5be87d32d5c259c0cb88bbeadb96d27a3bc5eb3cf6f86afa51907ea01107a5336decbf003679b7de65ed9a16d7fbf55a457e0c9bbb1b53500f719bcb
-DIST pyflakes-1.2.3.tar.gz 44776 BLAKE2B 9effec80b58ebac140a6a8b2f5f31a32c4fdf9e842d3fbd2858a3e74f33920925f10b6377300d962d1e2b1931efe8bb5318b97ef51c99aeb003a3434d08810db SHA512 e0b49b4cd388b39c4f4f5ab836520cfc2ee940ce24de084fbeca0a2f13beca23b3ca89741e297a6f450d211ec27ebd91a7d23a80105e50d14960a3888d7693f2
 DIST pyflakes-1.6.0.tar.gz 48184 BLAKE2B a5762c23521aa68ea92537fbc2903bb7af64faf8d1fafc97e48e003f529f8c16ae8dca444c9122fc5c50618fec7120b2f2b2e6682e1d86e502ab49096cb42bfc SHA512 7e9c2aad6ebed638a1354cef51c7e1f68b25e59f8caf4694997a9afecd7cd8baa629a9363297ac0d961430f007fd22dcae7dae1bcbd7838a3b5d4285063bc7c5
-DIST pyflakes-2.0.0.tar.gz 49002 BLAKE2B 146d1108b7cf9aca3316d33ad2ac3a0d1627af525b5def8c6140787fb4d1f47bb45c3c9ec9cb755e51e7ca4e947346e5e9de9b4a1b461389ff1bc4521371a684 SHA512 4961ebb8372f51783416681e79342d6be94318ecd007190e5c27f46c48f8f163c7a5f49cbe3025789ff1d9cd37c465b2f3baa219059779163545f9828a766f71
 DIST pyflakes-2.1.1.tar.gz 58072 BLAKE2B 68dccddae2a9dc77f2d1f1251c80e2552935281b6b79e55fd2a0805cb30bf5e1c227b60a7e1f55f5f92ac42dfd18a69eb0b76ce06f43ac1c48dde3921817a271 SHA512 7ebf5843b38146305c1063e070480fea8ec3b47fa1be546b1fafaeb242a688a5a001f978e7257fd71d5905b9a338b466ef17c7330725191587e9c40ba632c3f8
-EBUILD pyflakes-0.8.1.ebuild 723 BLAKE2B c76a63f2a3ffd1d3f31630654eed0dfd61aa810bd5751e618711cc3da169ff7c07fd838a3bd657b4430d384cab4efd6903787479f14028ecf5596de62ec67f8f SHA512 ebff66086a6ac6b38c706e57a5169f7036c3e1f54e843c964e027c286839550d925f9c90f525b1994af803c7b697657bcecf60867edff7a5fcb24faf608ad2d7
-EBUILD pyflakes-1.0.0.ebuild 749 BLAKE2B f958984d002f0864a220c0be3e061dc861da8df470a3149c744307ff9d5066d4943d4049c142740392e11c2f6fbc66a466df27ec639ac8fc140d7e495cd6ee3f SHA512 0b1a16f1574ba46a6881c3ce45d73d18fd71ed17f06499dd23923a66a898c74ac1939da34c4bd24389c688ac6809e545e465287e6ff1af210c81414b828cb2a1
-EBUILD pyflakes-1.2.3.ebuild 687 BLAKE2B 398170cf42a1bb6769c70ce0a9f42b06d8f75483c6950aac587ab96b5da9823d0ff29bb79f551f9b0b0ac1918ffd89d0e2f91676bd460d3d91a9f8083e27cc2e SHA512 ec2698fd7b758375f05f5309d692106b28dec6ca9a9567eb344ddf55e2bc9177933f03f05e529714dd16372abf231df1262671fce160151dc131750d4816df2d
-EBUILD pyflakes-1.6.0.ebuild 683 BLAKE2B 2cddd08ba51ad8ed799b3c287c98ced77cfd968acc0ce1a9abb7c6865fa53d004916966d6cf611eefff8fa9aa1f50e621d299dff52a92cfea2639aa50601f5a1 SHA512 8ff17220266200e27566fade2673d7a5e3f33b05764d5fde21f3aea0b54ba62ab2b0d06ed97d0a608a34a1c65c0fcbf4b79164520bf97810bb02c61a5855c6aa
-EBUILD pyflakes-2.0.0.ebuild 694 BLAKE2B 003ff1926059e9a1188b6956c0dad98cefd6b424c38820f3c43477cb220c806ca46146de9aafbc082a356883b1be4e7e130ae235c1819ede37267e69207caa3a SHA512 531833c4472b54acc1e015e8ef436d86482c4ceac02275b87212cc0136dcd96084dbe6151183d7935bfcb2ab6502db40b5517a3e65be0968cbf01454b1b34530
-EBUILD pyflakes-2.1.1.ebuild 784 BLAKE2B bf617b688658c5cfb873b1f1219c245a767313a769fa880294d12a22a1cf287ea1dc8cad2be8501d896dc0ecdbc0514f6de8236aa4b04a7c3afc64f87472cfc4 SHA512 6ecafba562c6cb85a2ba40568416f9e71a8baf773657eef59d8a6a3c4ea71078358e0b5f1034fc24daa6189234f1dee9c62159d4ebec0b936262c19f9902c706
+EBUILD pyflakes-1.6.0.ebuild 684 BLAKE2B 45ef9908c5a7c2888cf182ff6250a10bedfb654df7646665609072cbdb10c67833e7a439d4c844ee3992ef11e00644f724542365b2c75386e485df50bb0a6b9b SHA512 d74b2c54b4944ce54d733691cc8d5e52eeb7e6b98a193503d8914d8ce2978120b289f7d28f7b5b47e51f7afd136bcaa0f6207a0c8ba91348315686a8fdd901a8
+EBUILD pyflakes-2.1.1.ebuild 783 BLAKE2B c73ff7ead894de61ad039c3ffc832dabc2e9aa927d94234adcf9918eae4606e0c35dddc028a7cb054c4ff09cdb6f498fd4b9aa42198412ddb168cf4c3c3e0906 SHA512 5ab721bd10c6b007a263ed587f6df2a12de166452f343beb50a7d9a2fd9c76f41d735cecaa49ad05d86d8739acc5112c06908e375f6aa38257b41047a1d97e15
 MISC metadata.xml 738 BLAKE2B 5c1e0cb1452f9aebbefe7edd7a054cad85373344f834fb88ea37414ef69b12a36f774e6da05e73b898d6300a56189ec80891eca7a3c225c95b0fc8755daf18b6 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257
diff --git a/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch b/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch
deleted file mode 100644
index 41d1fa8ca86d..000000000000
--- a/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-#https://github.com/jayvdb/pyflakes/commit/3088ffbd6256521e0213b361bc2294c1e218e6fb
-diff --git a/pyflakes/api.py b/pyflakes/api.py  #index 3bc2330..2a46a0d 100644
---- a/pyflakes/api.py
-+++ b/pyflakes/api.py
-@@ -41,6 +41,18 @@ def check(codeString, filename, reporter=None):
-
-         (lineno, offset, text) = value.lineno, value.offset, value.text
- 
-+        if checker.PYPY:
-+            if text is None:
-+                lines = codeString.splitlines()
-+                if len(lines) >= lineno:
-+                    text = lines[lineno - 1]
-+                    if sys.version_info >= (3, ) and isinstance(text, bytes):
-+                        try:
-+                            text = text.decode('ascii')
-+                        except UnicodeDecodeError:
-+                            text = None
-+            offset -= 1
-+
-         # If there's an encoding problem with the file, the text is None.
-         if text is None:
-             # Avoid using msg, since for the only known case, it contains a
-diff --git a/pyflakes/checker.py b/pyflakes/checker.py
-index 753fa9b..f538d3f 100644
---- a/pyflakes/checker.py
-+++ b/pyflakes/checker.py
-@@ -11,6 +11,12 @@
- PY2 = sys.version_info < (3, 0)
- PY32 = sys.version_info < (3, 3)    # Python 2.5 to 3.2
- PY33 = sys.version_info < (3, 4)    # Python 2.5 to 3.3
-+try:
-+    sys.pypy_version_info
-+    PYPY = True
-+except AttributeError:
-+    PYPY = False
-+
- builtin_vars = dir(__import__('__builtin__' if PY2 else 'builtins'))
- 
- try:
-@@ -594,8 +600,13 @@ def getDocstring(self, node):
-             node = node.value
-         if not isinstance(node, ast.Str):
-             return (None, None)
--        # Computed incorrectly if the docstring has backslash
--        doctest_lineno = node.lineno - node.s.count('\n') - 1
-+
-+        if PYPY:
-+            doctest_lineno = node.lineno - 1
-+        else:
-+            # Computed incorrectly if the docstring has backslash
-+            doctest_lineno = node.lineno - node.s.count('\n') - 1
-+
-         return (node.s, doctest_lineno)
- 
-     def handleNode(self, node, parent):
-@@ -642,6 +653,8 @@ def handleDoctests(self, node):
-                 tree = compile(example.source, "<doctest>", "exec", ast.PyCF_ONLY_AST)
-             except SyntaxError:
-                 e = sys.exc_info()[1]
-+                if PYPY:
-+                    e.offset += 1
-                 position = (node_lineno + example.lineno + e.lineno,
-                             example.indent + 4 + (e.offset or 0))
-                 self.report(messages.DoctestSyntaxError, node, position)
-diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
-index 34a59bc..d2a5036 100644
---- a/pyflakes/test/test_api.py
-+++ b/pyflakes/test/test_api.py
-@@ -23,6 +23,14 @@
-     from io import StringIO
-     unichr = chr
- 
-+try:
-+    sys.pypy_version_info
-+    PYPY = True
-+except AttributeError:
-+    PYPY = False
-+
-+ERROR_HAS_COL_NUM = ERROR_HAS_LAST_LINE = sys.version_info >= (3, 2) or PYPY
-+
- 
- def withStderrTo(stderr, f, *args, **kwargs):
-     """
-@@ -312,18 +320,25 @@ def evaluate(source):
-             evaluate(source)
-         except SyntaxError:
-             e = sys.exc_info()[1]
--            self.assertTrue(e.text.count('\n') > 1)
-+            if not PYPY:
-+                self.assertTrue(e.text.count('\n') > 1)
-         else:
-             self.fail()
- 
-         sourcePath = self.makeTempFile(source)
-+
-+        if PYPY:
-+            message = 'EOF while scanning triple-quoted string literal'
-+        else:
-+            message = 'invalid syntax'
-+
-         self.assertHasErrors(
-             sourcePath,
-             ["""\
--%s:8:11: invalid syntax
-+%s:8:11: %s
-     '''quux'''
-           ^
--""" % (sourcePath,)])
-+""" % (sourcePath, message)])
- 
-     def test_eofSyntaxError(self):
-         """
-@@ -331,13 +346,22 @@ def test_eofSyntaxError(self):
-         syntax error reflects the cause for the syntax error.
-         """
-         sourcePath = self.makeTempFile("def foo(")
--        self.assertHasErrors(
--            sourcePath,
--            ["""\
-+        if PYPY:
-+            result = """\
-+%s:1:7: parenthesis is never closed
-+def foo(
-+      ^
-+""" % (sourcePath,)
-+        else:
-+            result = """\
- %s:1:9: unexpected EOF while parsing
- def foo(
-         ^
--""" % (sourcePath,)])
-+""" % (sourcePath,)
-+
-+        self.assertHasErrors(
-+            sourcePath,
-+            [result])
- 
-     def test_eofSyntaxErrorWithTab(self):
-         """
-@@ -345,13 +369,16 @@ def test_eofSyntaxErrorWithTab(self):
-         syntax error reflects the cause for the syntax error.
-         """
-         sourcePath = self.makeTempFile("if True:\n\tfoo =")
-+        column = 5 if PYPY else 7
-+        last_line = '\t   ^' if PYPY else '\t     ^'
-+
-         self.assertHasErrors(
-             sourcePath,
-             ["""\
--%s:2:7: invalid syntax
-+%s:2:%s: invalid syntax
- \tfoo =
--\t     ^
--""" % (sourcePath,)])
-+%s
-+""" % (sourcePath, column, last_line)])
- 
-     def test_nonDefaultFollowsDefaultSyntaxError(self):
-         """
-@@ -364,8 +391,8 @@ def foo(bar=baz, bax):
-     pass
- """
-         sourcePath = self.makeTempFile(source)
--        last_line = '       ^\n' if sys.version_info >= (3, 2) else ''
--        column = '8:' if sys.version_info >= (3, 2) else ''
-+        last_line = '       ^\n' if ERROR_HAS_LAST_LINE else ''
-+        column = '8:' if ERROR_HAS_COL_NUM else ''
-         self.assertHasErrors(
-             sourcePath,
-             ["""\
-@@ -383,8 +410,8 @@ def test_nonKeywordAfterKeywordSyntaxError(self):
- foo(bar=baz, bax)
- """
-         sourcePath = self.makeTempFile(source)
--        last_line = '            ^\n' if sys.version_info >= (3, 2) else ''
--        column = '13:' if sys.version_info >= (3, 2) else ''
-+        last_line = '            ^\n' if ERROR_HAS_LAST_LINE else ''
-+        column = '13:' if ERROR_HAS_COL_NUM or PYPY else ''
- 
-         if sys.version_info >= (3, 5):
-             message = 'positional argument follows keyword argument'
-@@ -407,8 +434,15 @@ def test_invalidEscape(self):
-         sourcePath = self.makeTempFile(r"foo = '\xyz'")
-         if ver < (3,):
-             decoding_error = "%s: problem decoding source\n" % (sourcePath,)
-+        elif PYPY:
-+            # pypy3 only
-+            decoding_error = """\
-+%s:1:6: %s: ('unicodeescape', b'\\\\xyz', 0, 2, 'truncated \\\\xXX escape')
-+foo = '\\xyz'
-+     ^
-+""" % (sourcePath, 'UnicodeDecodeError')
-         else:
--            last_line = '      ^\n' if ver >= (3, 2) else ''
-+            last_line = '      ^\n' if ERROR_HAS_LAST_LINE else ''
-             # Column has been "fixed" since 3.2.4 and 3.3.1
-             col = 1 if ver >= (3, 3, 1) or ((3, 2, 4) <= ver < (3, 3)) else 2
-             decoding_error = """\
-@@ -474,8 +508,21 @@ def test_misencodedFileUTF8(self):
- x = "%s"
- """ % SNOWMAN).encode('utf-8')
-         sourcePath = self.makeTempFile(source)
-+
-+        if PYPY and sys.version_info < (3, ):
-+            message = ('\'ascii\' codec can\'t decode byte 0xe2 '
-+                       'in position 21: ordinal not in range(128)')
-+            result = """\
-+%s:0:0: %s
-+x = "\xe2\x98\x83"
-+        ^\n""" % (sourcePath, message)
-+
-+        else:
-+            message = 'problem decoding source'
-+            result = "%s: problem decoding source\n" % (sourcePath,)
-+
-         self.assertHasErrors(
--            sourcePath, ["%s: problem decoding source\n" % (sourcePath,)])
-+            sourcePath, [result])
- 
-     def test_misencodedFileUTF16(self):
-         """
-diff --git a/pyflakes/test/test_doctests.py b/pyflakes/test/test_doctests.py
-index f15acb8..6793da9 100644
---- a/pyflakes/test/test_doctests.py
-+++ b/pyflakes/test/test_doctests.py
-@@ -1,3 +1,4 @@
-+import sys
- import textwrap
- 
- from pyflakes import messages as m
-@@ -11,6 +12,12 @@
- from pyflakes.test.test_undefined_names import Test as TestUndefinedNames
- from pyflakes.test.harness import TestCase, skip
- 
-+try:
-+    sys.pypy_version_info
-+    PYPY = True
-+except AttributeError:
-+    PYPY = False
-+
- 
- class _DoctestMixin(object):
- 
-@@ -273,12 +280,22 @@ def doctest_stuff():
-         exc = exceptions[0]
-         self.assertEqual(exc.lineno, 4)
-         self.assertEqual(exc.col, 26)
-+
-+        # PyPy error column offset is 0,
-+        # for the second and third line of the doctest
-+        # i.e. at the beginning of the line
-         exc = exceptions[1]
-         self.assertEqual(exc.lineno, 5)
--        self.assertEqual(exc.col, 16)
-+        if PYPY:
-+            self.assertEqual(exc.col, 13)
-+        else:
-+            self.assertEqual(exc.col, 16)
-         exc = exceptions[2]
-         self.assertEqual(exc.lineno, 6)
--        self.assertEqual(exc.col, 18)
-+        if PYPY:
-+            self.assertEqual(exc.col, 13)
-+        else:
-+            self.assertEqual(exc.col, 18)
- 
-     def test_indentationErrorInDoctest(self):
-         exc = self.flakes('''
-@@ -289,7 +306,10 @@ def doctest_stuff():
-             """
-         ''', m.DoctestSyntaxError).messages[0]
-         self.assertEqual(exc.lineno, 5)
--        self.assertEqual(exc.col, 16)
-+        if PYPY:
-+            self.assertEqual(exc.col, 13)
-+        else:
-+            self.assertEqual(exc.col, 16)
- 
-     def test_offsetWithMultiLineArgs(self):
-         (exc1, exc2) = self.flakes(
-
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
deleted file mode 100644
index c808c18397a0..000000000000
--- a/dev-python/pyflakes/pyflakes-0.8.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS NEWS.txt README.rst)
-
-python_test() {
-	esetup.py test --quiet
-}
diff --git a/dev-python/pyflakes/pyflakes-1.0.0.ebuild b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
deleted file mode 100644
index 6dd529e80c4a..000000000000
--- a/dev-python/pyflakes/pyflakes-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PV}-fix-pypy-tests.patch )
-
-python_test() {
-	esetup.py test --quiet
-}
diff --git a/dev-python/pyflakes/pyflakes-1.2.3.ebuild b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
deleted file mode 100644
index fe7cf3e932a5..000000000000
--- a/dev-python/pyflakes/pyflakes-1.2.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test --quiet
-}
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
index d566ca2cc6d5..876f5a0f54d6 100644
--- a/dev-python/pyflakes/pyflakes-1.6.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
@@ -12,7 +12,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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pyflakes/pyflakes-2.0.0.ebuild b/dev-python/pyflakes/pyflakes-2.0.0.ebuild
deleted file mode 100644
index 896bceee4a86..000000000000
--- a/dev-python/pyflakes/pyflakes-2.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyflakes/pyflakes-2.1.1.ebuild b/dev-python/pyflakes/pyflakes-2.1.1.ebuild
index a2fc6e4a962d..c7b4f8fcfbc9 100644
--- a/dev-python/pyflakes/pyflakes-2.1.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.1.1.ebuild
@@ -12,7 +12,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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${BDEPEND}"