From beb013b3ffbedea632c6ceb91c164b8c2ed0e386 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Fri, 3 Sep 2021 09:45:55 +0300 Subject: [PATCH] dev-python/oset: enable py3.10, EAPI=8 Signed-off-by: Arthur Zamarin --- dev-python/oset/files/oset-0.1.3-fix-py3.10.patch | 14 ++++++++++++++ dev-python/oset/oset-0.1.3.ebuild | 7 +++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 dev-python/oset/files/oset-0.1.3-fix-py3.10.patch diff --git a/dev-python/oset/files/oset-0.1.3-fix-py3.10.patch b/dev-python/oset/files/oset-0.1.3-fix-py3.10.patch new file mode 100644 index 0000000000000..dbc04b40472f8 --- /dev/null +++ b/dev-python/oset/files/oset-0.1.3-fix-py3.10.patch @@ -0,0 +1,14 @@ +--- a/src/oset/pyoset.py ++++ b/src/oset/pyoset.py +@@ -13,7 +13,10 @@ + def next(it): + return it.next() + else: +- from collections import MutableSet ++ try: ++ from collections.abc import MutableSet ++ except ImportError: ++ from collections import MutableSet + + KEY, PREV, NEXT = range(3) + diff --git a/dev-python/oset/oset-0.1.3.ebuild b/dev-python/oset/oset-0.1.3.ebuild index 7857fc38918aa..4c6e40f367e3b 100644 --- a/dev-python/oset/oset-0.1.3.ebuild +++ b/dev-python/oset/oset-0.1.3.ebuild @@ -3,9 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=rdepend - inherit distutils-r1 DESCRIPTION="Ordered Set" @@ -15,3 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}/${P}-fix-py3.10.patch" +)