Updating liguros repo

13 files changed, 65 insertions, 412 deletions

diff --git a/dev-python/clang-python/clang-python-11.0.0.ebuild b/dev-python/clang-python/clang-python-11.0.0.ebuild
index d8588387cb21..918e896e3ca1 100644
--- a/dev-python/clang-python/clang-python-11.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/lit/lit-11.0.0.ebuild b/dev-python/lit/lit-11.0.0.ebuild
index 36979de443b9..232cf812bad7 100644
--- a/dev-python/lit/lit-11.0.0.ebuild
+++ b/dev-python/lit/lit-11.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parver/files/parver-0.3-test.patch b/dev-python/parver/files/parver-0.3-test.patch
deleted file mode 100644
index f062b317f618..000000000000
--- a/dev-python/parver/files/parver-0.3-test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 83c64f08ea95e40b3fa208c2743b8eaba3296a63 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 27 Apr 2020 08:25:18 +0200
-Subject: [PATCH] Suppress too_slow on test_parse_hypothesis
-
-The generator is apparently too slow on busy systems, so suppress
-the health check to avoid a test failure.
----
- tests/test_parse.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_parse.py b/tests/test_parse.py
-index 6d58379..43494e3 100644
---- a/tests/test_parse.py
-+++ b/tests/test_parse.py
-@@ -2,13 +2,14 @@
- from __future__ import absolute_import, division, print_function
- 
- import pytest
--from hypothesis import assume, given
-+from hypothesis import assume, given, settings, HealthCheck
- 
- from parver import ParseError, Version
- 
- from .strategies import version_string, whitespace
- 
- 
-+@settings(suppress_health_check=[HealthCheck.too_slow])
- @given(whitespace, version_string(), whitespace)
- def test_parse_hypothesis(prefix, version, suffix):
-     Version.parse(prefix + version + suffix)
--- 
-2.26.2
-
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index bdc6741e7a76..9a2c4caf21c3 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,4 @@
+DIST pyglet-1.5.10.tar.gz 6417209 BLAKE2B 2c413c111ce3d016ca23186e92b17cb6f67bb904d90ca241eb0f95372a0a9ff8915014f31294a6609e2f35072cb963b6998d791157ede2e2bf01175edeb91582 SHA512 02b3859f2805f703997d7799e324e7debe9375f6c0df211ceff2f750aa7dbbad61b6ece55fbfec111e4f47f0ee6a71881fd73a47bef794a437615ecb42d0f411
 DIST pyglet-1.5.7.tar.gz 6367378 BLAKE2B 68d4aa673a7463f7da0f4ccb7f413b602f32ecc423438326fc4262a4449fe22dff25a513074611ce2c77c130dfe9cc29e44e54a95169875208731f70803f1a45 SHA512 2c2a06636b1db788241028d1ef2290a774b98721ccc92ceed2b2895bcee81d4aa72b2111896091b54531936513772505b0d43003e412735d606130ed4b08f8c9
 DIST pyglet-1.5.8.tar.gz 6394207 BLAKE2B dcd3750b7296ab919ecb20417f0dfa2e89ab2754c28562a38175cf87f06bcd41d9b1ed2c568ed516e444a5968e21a772f0f4cfb5b626bb1aeb066f3b17f1cf18 SHA512 346dafbc751a4cfbdaf65643701500f5b5ad40541168eeea13467d0b97283baa35b22708dfc15569adcfad0b8ecb51d1b45d18775d564b12ed4be0965971229b
 DIST pyglet-1.5.9.tar.gz 6417099 BLAKE2B ad25e8da39d943050706bf4cd6a210295349118f88c7a4ba5a5d060012a444b1adbb40bf4bdbe53093c444d7373e0678ddd6648085319700e2dc22ccfcbf23fc SHA512 2ded9f9eb24bb3c928c87da0160383c46b0b27ce01fd613b73304bc573607035517e1c0eeda365921d9de12d86a913fd0d16b71db4a4542fde04df5ee20f34e2
diff --git a/dev-python/pyglet/pyglet-1.5.10.ebuild b/dev-python/pyglet/pyglet-1.5.10.ebuild
new file mode 100644
index 000000000000..1d80119694c8
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="https://www.pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch b/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch
deleted file mode 100644
index f850c9be7262..000000000000
--- a/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3e71dd32e8ce868b090c282759eebdeabc960f58 Mon Sep 17 00:00:00 2001
-From: Inada Naoki <songofacandy@gmail.com>
-Date: Tue, 28 Jul 2020 13:06:07 +0900
-Subject: [PATCH] Add missing import (#879)
-
-Fixes #878
----
- pymysql/converters.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pymysql/converters.py b/pymysql/converters.py
-index b084ed2f..1b582904 100644
---- a/pymysql/converters.py
-+++ b/pymysql/converters.py
-@@ -5,6 +5,7 @@
- import re
- import time
- 
-+from .err import ProgrammingError
- from .constants import FIELD_TYPE
- 
- 
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 902d8697a669..36ec99a687b7 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,2 +1 @@
-DIST python-daemon-2.1.2.tar.gz 76176 BLAKE2B f8252bb3ee23b9d2a4ac33057df98720708b2a7e10c38c188c537d3c90ad641e33ba73e39f1bbfca10655e2ebd5d550179ed55d09a2f767832fa1d26accc9e21 SHA512 28ae118fd652a0a26524215568df0b16264e3a844640fe47f0a08c45c7a16be1b60d78293c2fc13edfe1402a8b5dcd72ec11101c3b53e5b66f232b7e21d5d346
 DIST python-daemon-2.2.4.tar.gz 80775 BLAKE2B 3f260993a2207e6467db03c456d9f8621d1f3252236b6d49432ff14c1039416db901feb5d405620106d02ae2ea186fd0b10183156f31d17f9f4fa62964fbd333 SHA512 9a7a4e23e126f05e4c1c503f15401cddd758c5f9195c370997060ca1bbfe71cc51d82d3ae16bcf0023c28fa50b0b8d6cd406e515b27725ffa9fec10fde3ed64a
diff --git a/dev-python/python-daemon/python-daemon-2.1.2.ebuild b/dev-python/python-daemon/python-daemon-2.1.2.ebuild
deleted file mode 100644
index 990a7c46cf65..000000000000
--- a/dev-python/python-daemon/python-daemon-2.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.org/project/python-daemon/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/lockfile[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 5e9ef7353b74..448ed03924ef 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,2 @@
-DIST readme_renderer-26.0.tar.gz 27068 BLAKE2B 7a58d550e792ffcbf6fedbdf0464714ac7c7a0395297d165493167947c733a29ff5cc4dd2a346c4276f52ca0516282b3049f28bdc8eb38717d1ff8d03709084c SHA512 a5e7cfa47257fd3ceaf417cc814226b5aef6aacf72ffb2eeed3e6affa4a09aa1f6c752a8c4311910c258d090d94f03e3f5c2603819f5dceb37440c9bfd9090ea
 DIST readme_renderer-27.0.tar.gz 27346 BLAKE2B ae9ce20419facf0d240f390e9253901d42fe0731628e73817147db83e21687adc6df132e40d48b223e7df39b3adaa8f16208d263de57274d10d1b69209c8e561 SHA512 17a76484cda5da38f45c3aa15776a3d310a0d22520d43505a00adaf37de7d6d3d9ef355553cd5e72e841ffb555d7b4ca9a73cb38f88d013e46cc2a5ba3033c00
 DIST readme_renderer-28.0.tar.gz 27370 BLAKE2B 380e10941fbfdc17193a558b0a90b919b841153aa1ef4f26634202c5d500b57755858354374f785f0dedc5b119365281e50897bc9ec95943c8b08d69976e692d SHA512 2a5a00e404d2cc156e01433232fade64e13d2f95177b72c1d3903554144746317efc637c17c6333c501cd426f77628bf45300e9b219e30e26fa3963da690e06a
diff --git a/dev-python/readme_renderer/readme_renderer-26.0.ebuild b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
deleted file mode 100644
index 083f7c7cb3c2..000000000000
--- a/dev-python/readme_renderer/readme_renderer-26.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/rope/files/rope-0.16.0-python3.7.patch b/dev-python/rope/files/rope-0.16.0-python3.7.patch
deleted file mode 100644
index d120a8ecc514..000000000000
--- a/dev-python/rope/files/rope-0.16.0-python3.7.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From 5c38f7c8ba23813b475dcb24fa66ed3fc52d1658 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
-Date: Mon, 13 Jan 2020 15:07:46 +0100
-Subject: [PATCH 1/4] Use .is_alive method instead of a deprecated .isAlive in
- threading.Thread
-
----
- ropetest/type_hinting_test.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ropetest/type_hinting_test.py b/ropetest/type_hinting_test.py
-index 7cc02bb1..afb98e19 100644
---- a/ropetest/type_hinting_test.py
-+++ b/ropetest/type_hinting_test.py
-@@ -198,18 +198,18 @@ def test_hint_parametrized_iterable(self):
-                + self._make_class_hint('collections.Iterable[threading.Thread]') + \
-                '    def a_method(self):\n' \
-                '        for i in self.a_attr:\n' \
--               '            i.isA'
-+               '            i.is_a'
-         result = self._assist(code)
--        self.assert_completion_in_result('isAlive', 'attribute', result)
-+        self.assert_completion_in_result('is_alive', 'attribute', result)
- 
-     def test_hint_parametrized_iterator(self):
-         code = 'class Sample(object):\n' \
-                + self._make_class_hint('collections.Iterator[threading.Thread]') + \
-                '    def a_method(self):\n' \
-                '        for i in self.a_attr:\n' \
--               '            i.isA'
-+               '            i.is_a'
-         result = self._assist(code)
--        self.assert_completion_in_result('isAlive', 'attribute', result)
-+        self.assert_completion_in_result('is_alive', 'attribute', result)
- 
-     def test_hint_parametrized_dict_key(self):
-         code = 'class Sample(object):\n' \
-
-From df3567f2afac8b5c5b50f8b7a01e21259e397f81 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
-Date: Mon, 13 Jan 2020 15:29:14 +0100
-Subject: [PATCH 2/4] Direct import from collections is getting deprecated.
-
----
- rope/base/utils/datastructures.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/rope/base/utils/datastructures.py b/rope/base/utils/datastructures.py
-index 0cb16cf2..3790a6e1 100644
---- a/rope/base/utils/datastructures.py
-+++ b/rope/base/utils/datastructures.py
-@@ -1,10 +1,13 @@
- # this snippet was taken from this link
- # http://code.activestate.com/recipes/576694/
- 
--import collections
-+try:
-+    from collections import MutableSet
-+except ImportError:
-+    from collections.abc import MutableSet
- 
- 
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- 
-     def __init__(self, iterable=None):
-         self.end = end = []
-
-From fa5626ea99a6cac4780184d708108a98bd7e6095 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
-Date: Mon, 13 Jan 2020 16:36:01 +0100
-Subject: [PATCH 3/4] Don't use underscored _ast, but use ast instead
-
----
- rope/base/ast.py            | 15 ++++++++-------
- rope/base/utils/pycompat.py |  6 +++---
- 2 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/rope/base/ast.py b/rope/base/ast.py
-index d43c83c5..d24524e7 100644
---- a/rope/base/ast.py
-+++ b/rope/base/ast.py
-@@ -1,5 +1,6 @@
--import _ast
--from _ast import *
-+from __future__ import absolute_import
-+import ast
-+from ast import *
- 
- from rope.base import fscommands
- 
-@@ -18,7 +19,7 @@ def parse(source, filename='<string>'):
-     if not source.endswith(b'\n'):
-         source += b'\n'
-     try:
--        return compile(source, filename, 'exec', _ast.PyCF_ONLY_AST)
-+        return ast.parse(source, filename='<unknown>')
-     except (TypeError, ValueError) as e:
-         error = SyntaxError()
-         error.lineno = 1
-@@ -32,7 +33,7 @@ def walk(node, walker):
-     method_name = '_' + node.__class__.__name__
-     method = getattr(walker, method_name, None)
-     if method is not None:
--        if isinstance(node, _ast.ImportFrom) and node.module is None:
-+        if isinstance(node, ast.ImportFrom) and node.module is None:
-             # In python < 2.7 ``node.module == ''`` for relative imports
-             # but for python 2.7 it is None. Generalizing it to ''.
-             node.module = ''
-@@ -42,7 +43,7 @@ def walk(node, walker):
- 
- 
- def get_child_nodes(node):
--    if isinstance(node, _ast.Module):
-+    if isinstance(node, ast.Module):
-         return node.body
-     result = []
-     if node._fields is not None:
-@@ -50,9 +51,9 @@ def get_child_nodes(node):
-             child = getattr(node, name)
-             if isinstance(child, list):
-                 for entry in child:
--                    if isinstance(entry, _ast.AST):
-+                    if isinstance(entry, ast.AST):
-                         result.append(entry)
--            if isinstance(child, _ast.AST):
-+            if isinstance(child, ast.AST):
-                 result.append(child)
-     return result
- 
-diff --git a/rope/base/utils/pycompat.py b/rope/base/utils/pycompat.py
-index 1214658f..de7cf2e4 100644
---- a/rope/base/utils/pycompat.py
-+++ b/rope/base/utils/pycompat.py
-@@ -1,5 +1,5 @@
- import sys
--import _ast
-+import ast
- # from rope.base import ast
- 
- PY2 = sys.version_info[0] == 2
-@@ -15,7 +15,7 @@
-     str = str
-     string_types = (str,)
-     import builtins
--    ast_arg_type = _ast.arg
-+    ast_arg_type = ast.arg
- 
-     def execfile(fn, global_vars=None, local_vars=None):
-         with open(fn) as f:
-@@ -34,7 +34,7 @@ def get_ast_with_items(node):
- 
-     string_types = (basestring,)
-     builtins = __import__('__builtin__')
--    ast_arg_type = _ast.Name
-+    ast_arg_type = ast.Name
-     execfile = execfile
- 
-     def get_ast_arg_arg(node):
-
-From 431d35d3e7ed2286bea2d13908cd80a0e42a9b13 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
-Date: Tue, 14 Jan 2020 15:00:36 +0100
-Subject: [PATCH 4/4] Work with deprecated types and using aliased ones.
-
-Fixes #247
----
- rope/base/oi/type_hinting/utils.py | 50 ++++++++++++++++++++----------
- 1 file changed, 34 insertions(+), 16 deletions(-)
-
-diff --git a/rope/base/oi/type_hinting/utils.py b/rope/base/oi/type_hinting/utils.py
-index aec82ac0..ce90dfeb 100644
---- a/rope/base/oi/type_hinting/utils.py
-+++ b/rope/base/oi/type_hinting/utils.py
-@@ -1,8 +1,12 @@
--import rope.base.builtins
-+import logging
-+try:
-+    from typing import Union, Optional
-+except ImportError:
-+    pass
- import rope.base.utils as base_utils
- from rope.base.evaluate import ScopeNameFinder
- from rope.base.exceptions import AttributeNotFoundError
--from rope.base.pyobjects import PyClass, PyFunction
-+from rope.base.pyobjects import PyClass, PyDefinedObject, PyFunction, PyObject
- from rope.base.utils import pycompat
- 
- 
-@@ -66,33 +70,47 @@ def get_lineno_for_node(assign_node):
- 
- def get_mro(pyclass):
-     # FIXME: to use real mro() result
--    l = [pyclass]
--    for cls in l:
-+    class_list = [pyclass]
-+    for cls in class_list:
-         for super_cls in cls.get_superclasses():
--            if isinstance(super_cls, PyClass) and super_cls not in l:
--                l.append(super_cls)
--    return l
-+            if isinstance(super_cls, PyClass) and super_cls not in class_list:
-+                class_list.append(super_cls)
-+    return class_list
- 
- 
- def resolve_type(type_name, pyobject):
-+    # type: (str, Union[PyDefinedObject, PyObject]) -> Optional[PyDefinedObject, PyObject]
-     """
--    :type type_name: str
--    :type pyobject: rope.base.pyobjects.PyDefinedObject | rope.base.pyobjects.PyObject
--    :rtype: rope.base.pyobjects.PyDefinedObject | rope.base.pyobjects.PyObject or None
-+    Find proper type object from its name.
-     """
-+    deprecated_aliases = {'collections': 'collections.abc'}
-+    ret_type = None
-+    logging.debug('Looking for %s', type_name)
-     if '.' not in type_name:
-         try:
--            return pyobject.get_module().get_scope().get_name(type_name).get_object()
--        except Exception:
--            pass
-+            ret_type = pyobject.get_module().get_scope().get_name(
-+                type_name).get_object()
-+        except AttributeNotFoundError:
-+            logging.exception('Cannot resolve type %s', type_name)
-     else:
-         mod_name, attr_name = type_name.rsplit('.', 1)
-         try:
-             mod_finder = ScopeNameFinder(pyobject.get_module())
-             mod = mod_finder._find_module(mod_name).get_object()
--            return mod.get_attribute(attr_name).get_object()
--        except Exception:
--            pass
-+            ret_type = mod.get_attribute(attr_name).get_object()
-+        except AttributeNotFoundError:
-+            if mod_name in deprecated_aliases:
-+                try:
-+                    logging.debug('Looking for %s in %s',
-+                                  attr_name, deprecated_aliases[mod_name])
-+                    mod = mod_finder._find_module(
-+                        deprecated_aliases[mod_name]).get_object()
-+                    ret_type = mod.get_attribute(attr_name).get_object()
-+                except AttributeNotFoundError:
-+                    logging.exception('Cannot resolve type %s in %s',
-+                                      attr_name, dir(mod))
-+    logging.debug('ret_type = %s', ret_type)
-+    return ret_type
- 
- 
- class ParametrizeType(object):
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index 3afb50ee68a6..5e255d71e594 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,2 +1 @@
-DIST zope.event-4.4.tar.gz 18818 BLAKE2B 628625280c1e3f06f2c2e6e9aa88d3e34958718ea4624d54a5b915f8a570e38d4893adc0a0c688a7f09d3c81ffd67fbb69a3bc89ad58d95be498c2de48fff697 SHA512 34dac7ce2e8faf464bdb3861217beb1dd0976b1cc047d45a79f1640dd256bf33162da6e105c00135217fcdb888fc3ac7a4b0b4b047f64ce310c4d11cff71a985
 DIST zope.event-4.5.0.tar.gz 18723 BLAKE2B 449ae969709c863681df1a08f016c850242ebe86b9abfa57db62a982c81bba7c496fc19dd2b187284da44d975688b544ee52a5a48a2fb782d4c7210d5773ee2b SHA512 1d82ae316fc75eebc03aadeb78890a19add35490720cd7bd073faeb9dc9ed97511ca4fdafc2228530798384d667c0aa88e3ef47b0be668128556a78bf82c42e5
diff --git a/dev-python/zope-event/zope-event-4.4-r1.ebuild b/dev-python/zope-event/zope-event-4.4-r1.ebuild
deleted file mode 100644
index 0ac9a9b61e41..000000000000
--- a/dev-python/zope-event/zope-event-4.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.event
-	https://docs.zope.org/zope.event/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}