Adding metadata

19 files changed, 323 insertions, 313 deletions

diff --git a/dev-python/flake8/flake8-3.9.2.ebuild b/dev-python/flake8/flake8-3.9.2.ebuild
index a5479f956974..119f087df5f3 100644
--- a/dev-python/flake8/flake8-3.9.2.ebuild
+++ b/dev-python/flake8/flake8-3.9.2.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
 	<dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)
 "
 PDEPEND="
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 66063e034445..0cddb611f8c4 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,3 +2,4 @@ DIST hypothesis-python-6.14.0.tar.gz 9135056 BLAKE2B 47d1efcee5e1c4037f1a20f08e3
 DIST hypothesis-python-6.14.2.tar.gz 9135496 BLAKE2B f77f0668c4d0c2f5a952e06a40ae7898631804d3406c9711eb30a4e5a11e73ba2772be3cb437aacea2a75cd65f688a2485b98885c19cf743020900b0cf70f08c SHA512 e495e1c471fd4b185e23326700e85bf90635fcc8bf316c758c3285803ff0f7ad0269351b3a7631033495bb6498a8f19cb8661c55248ec5e14ff2a09e0c3af3c1
 DIST hypothesis-python-6.14.3.tar.gz 9135537 BLAKE2B 2effb0c68cf3a7a2f7d56c0c46c2ba36cbed4fed35b8a617ec68a721990247370772b986f0492aab112f7420c07409f8d738485ca28f42e7aea919af52611b10 SHA512 1722c5dcf1eb7375fd09d4208851826582808449fcaaa0345f1461d9a531961500a9c888bec5a457efbbb34f8178464b3358a3187b94bb5c783af42b4e7287ce
 DIST hypothesis-python-6.14.5.tar.gz 9135819 BLAKE2B 2e42949f81024038b901231a8446203388c8052ebaacf4a87d21356265fd1c09c9aa8b191dcd65780d45cc52ed9d48bb16440fc553addb4671e0ad901213ef64 SHA512 d047eea19129d5855bee5f012f5c91fe1f0de40228600fadad9c76709f951c003450f613f59848064b58f9d0e559b54b44744ae0aae689687488b6506cc8fe1a
+DIST hypothesis-python-6.14.6.tar.gz 9136187 BLAKE2B a9f0d24882266d5ccce0e940fb7e28ae654361215829ae87410ea18a0d304a78ecbfeaa8b74f7c415d60991e43f7b4beaaecbaaabbb697dac47aa360c5d59366 SHA512 fecf5af77d5f355861b6fbf3ea964a741b501a9db032c3f2ded2fb51605f2b961e2ad0633f671d6ffbc2e6ff4ca27412eb456ca7bd9a72a4a9e8b89cc79a7042
diff --git a/dev-python/hypothesis/hypothesis-6.14.6.ebuild b/dev-python/hypothesis/hypothesis-6.14.6.ebuild
new file mode 100644
index 000000000000..01270134d6dc
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.14.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pytest-describe
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 2683945fd16c..7f80750bbb7b 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1 +1,2 @@
 DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
+DIST immutables-0.16.tar.gz 84916 BLAKE2B e699aaa1135fa9f7db9589276dc0801a67c5f98bd3c5b247913d8263f9baf02a8772d7715cc3eb2c9392694d48d3808d50f45e9fe8e66c4d507586d0e3fdc319 SHA512 5b883cfe43f8a042b617e719dccd3cbdded3b1d1df160ba26b6bb2f0816a7171698bdd2ba3d450e76f135b236e777052a22c09b8bd1a9183227f1ccc90617cf8
diff --git a/dev-python/immutables/immutables-0.16.ebuild b/dev-python/immutables/immutables-0.16.ebuild
new file mode 100644
index 000000000000..60dbe0513e80
--- /dev/null
+++ b/dev-python/immutables/immutables-0.16.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A high-performance immutable mapping type for Python"
+HOMEPAGE="https://github.com/MagicStack/immutables"
+SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/mypy/d' tests/conftest.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# force running from BUILD_DIR to get the C extension tested
+	cp -r tests "${BUILD_DIR}"/lib || die
+	cd "${BUILD_DIR}"/lib || die
+	epytest tests --ignore tests/test_mypy.py
+	rm -r tests || die
+}
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
deleted file mode 100644
index dcf13eb671a8..000000000000
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="flake8 plugin: McCabe complexity checker"
-HOMEPAGE="https://github.com/PyCQA/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pretty-yaml/files/pretty-yaml-20.4.0-fix-py3.10.patch b/dev-python/pretty-yaml/files/pretty-yaml-20.4.0-fix-py3.10.patch
new file mode 100644
index 000000000000..c2cd44152d1b
--- /dev/null
+++ b/dev-python/pretty-yaml/files/pretty-yaml-20.4.0-fix-py3.10.patch
@@ -0,0 +1,28 @@
+From 707e14bd714e91dc53295393e2c8eea257aced5a Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sun, 8 Aug 2021 13:44:52 +0200
+Subject: [PATCH] Fix tests for Python 3.10: abstract base classes have moved
+
+As mentioned in the documentation:
+"Deprecated since version 3.3, will be removed in version 3.10: Moved
+Collections Abstract Base Classes to the collections.abc module. For
+backwards compatibility, they continue to be visible in this module through
+Python 3.9."
+---
+ pyaml/tests/dump.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyaml/tests/dump.py b/pyaml/tests/dump.py
+index 882a8e8..e1a93ba 100644
+--- a/pyaml/tests/dump.py
++++ b/pyaml/tests/dump.py
+@@ -2,7 +2,8 @@
+ from __future__ import unicode_literals, print_function
+ 
+ import itertools as it, operator as op, functools as ft
+-from collections import Mapping, OrderedDict, namedtuple
++from collections import OrderedDict, namedtuple
++from collections.abc import Mapping
+ import os, sys, io, yaml, unittest
+ 
+ if sys.version_info.major > 2: unicode = str
diff --git a/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild b/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
index c9edc5871cb5..e984a3779259 100644
--- a/dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-20.4.0.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
@@ -25,6 +25,11 @@ BDEPEND="
 		dev-python/unidecode[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	# https://github.com/mk-fg/pretty-yaml/pull/38
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 python_test() {
 	"${EPYTHON}" pyaml/tests/dump.py -v ||
 		die "tests failed under ${EPYTHON}"
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index a1a1a103ecc7..4fa6852d7044 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,3 +1,2 @@
-DIST pysvn-1.9.11.tar.gz 624408 BLAKE2B 2ca13388717cc82b68509843e3b1780bceb5c088c41fadc81206c909eb185ec7c73d0a7453fc4e0c1a78a5186e21d382c79af0fb666edce7f5e72c0cf63e25db SHA512 078dc0e19a1f29d40571de002734943415594bcbe132a4d0e6bf8e8781175345ca1b3a4967a183a15efb1462871a40d8e3879a22c913a649555ca593fb99db89
 DIST pysvn-1.9.13.tar.gz 666722 BLAKE2B 4ada83f474026976309b8fc7876dd860fb68eb73dd0a4db0dd0c2838cc029976d5886462705c8b6aa85c5a6f8081f94df61bcbc1698879537fbeb3125154c1a0 SHA512 26ce9af363efb1aee25f8ed73e5bab56208523cb3e7cbe657a5f1145bc3500b2f370b4dfebf4eaace9f566f5676b053c41acb4d01458e4d6b79bd852ac260aa7
 DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
diff --git a/dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch b/dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch
deleted file mode 100644
index 9a9bcd7f44ec..000000000000
--- a/dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 73655a682b69fd514f7060eb67e60ecb617c5f27 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 1 Mar 2020 14:16:13 +0100
-Subject: [PATCH] Respect CC, CXX, LDFLAGS
-
----
- Patches/test_proplist.mak |  4 ++--
- Source/setup_configure.py | 24 ++++++++++--------------
- 2 files changed, 12 insertions(+), 16 deletions(-)
-
-diff --git a/Patches/test_proplist.mak b/Patches/test_proplist.mak
-index 9d9a58a..02e7a68 100644
---- a/Patches/test_proplist.mak
-+++ b/Patches/test_proplist.mak
-@@ -2,7 +2,7 @@ CCCFLAGS=-fPIC -fexceptions -frtti -I$(SVN_INC) -I$(APR_INC)
- LDLIBS=-L$(SVN_LIB) -lsvn_client-1 -lapr-0
- 
- test_proplist: test_proplist.o
--	g++ -g -o test_proplist test_proplist.o $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o test_proplist test_proplist.o $(LDLIBS)
- 
- test_proplist.o: test_proplist.cpp
--	g++ -c -g $(CCCFLAGS) -o $@ $<
-+	$(CXX) -c $(LDFLAGS) $(CCCFLAGS) -o $@ $<
-diff --git a/Source/setup_configure.py b/Source/setup_configure.py
-index e02a6a5..bbe7ec7 100644
---- a/Source/setup_configure.py
-+++ b/Source/setup_configure.py
-@@ -900,8 +900,8 @@ class CompilerGCC(Compiler):
-     def __init__( self, setup ):
-         Compiler.__init__( self, setup )
- 
--        self._addVar( 'CCC',            'g++' )
--        self._addVar( 'CC',             'gcc' )
-+        self._addVar( 'CCC',            '$(CXX)' )
-+        self._addVar( 'CC',             '$(CC)' )
- 
-     def getPythonExtensionFileExt( self ):
-         return '.so'
-@@ -1037,8 +1037,8 @@ class MacOsxCompilerGCC(CompilerGCC):
-         else:
-             arch_options = ''
- 
--        self._addVar( 'CCC',            'g++ %s' % (arch_options,) )
--        self._addVar( 'CC',             'gcc %s' % (arch_options,) )
-+        self._addVar( 'CCC',            '$(CXX) %s' % (arch_options,) )
-+        self._addVar( 'CC',             '$(CC) %s' % (arch_options,) )
- 
-         self._find_paths_pycxx_dir = [
-                         '../Import/pycxx-%d.%d.%d' % min_pycxx_version,
-@@ -1104,11 +1104,10 @@ class MacOsxCompilerGCC(CompilerGCC):
- 
-     def setupUtilities( self ):
-         self._addVar( 'CCCFLAGS',
--                                        '-g  '
-                                         '-Wall -fPIC -fexceptions -frtti '
-                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
-                                         '-D%(DEBUG)s' )
--        self._addVar( 'LDEXE',          '%(CCC)s -g' )
-+        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
- 
-     def setupPySvn( self ):
-         # Support building in a virtualenv.
-@@ -1132,7 +1131,6 @@ class MacOsxCompilerGCC(CompilerGCC):
-         self._addVar( 'PYTHON_INC',         distutils.sysconfig.get_python_inc() )
- 
-         py_cflags_list = [
--                    '-g',
-                     '-Wall -fPIC',
-                     '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
-                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
-@@ -1166,7 +1164,7 @@ class MacOsxCompilerGCC(CompilerGCC):
- 
-         if self.options.hasOption( '--link-python-framework-via-dynamic-lookup' ):
-             # preferred link method on homebrew for pysvn
--            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
-+            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
-                                         '-framework System '
-                                         '-framework CoreFoundation '
-                                         '-framework Kerberos '
-@@ -1174,7 +1172,7 @@ class MacOsxCompilerGCC(CompilerGCC):
-                                         '-undefined dynamic_lookup '
-                                         '%(LDLIBS)s' )
-         else:
--            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
-+            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
-                                         '-framework System '
-                                         '%(PYTHON_FRAMEWORK)s '
-                                         '-framework CoreFoundation '
-@@ -1247,11 +1245,10 @@ class UnixCompilerGCC(CompilerGCC):
- 
-     def setupUtilities( self ):
-         self._addVar( 'CCCFLAGS',
--                                        '-g  '
-                                         '-Wall -fPIC -fexceptions -frtti '
-                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
-                                         '-D%(DEBUG)s' )
--        self._addVar( 'LDEXE',          '%(CCC)s -g' )
-+        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
- 
-     def setupPySvn( self ):
-         self._pysvnModuleSetup()
-@@ -1279,8 +1276,7 @@ class UnixCompilerGCC(CompilerGCC):
-         py_cflags_list.extend( self._getDefines( '-D%s' ) )
- 
-         if self.options.hasOption( '--enable-debug' ):
--            print( 'Info: Debug enabled' )
--            py_cflags_list.append( '-g' )
-+            print( 'Info: --enable-debug ignored' )
- 
-         if self.options.hasOption( '--disable-deprecated-functions-warnings' ):
-             print( 'Info: Disable deprecated functions warnings' )
-@@ -1289,7 +1285,7 @@ class UnixCompilerGCC(CompilerGCC):
-         self._addVar( 'CCFLAGS',    ' '.join( py_cflags_list ) )
-         self._addVar( 'CCCFLAGS',   ' '.join( py_cflags_list+['-fexceptions -frtti'] ) )
-         self._addVar( 'LDLIBS',     ' '.join( self._getLdLibs() ) )
--        self._addVar( 'LDSHARED',   '%(CCC)s -shared -g' )
-+        self._addVar( 'LDSHARED',   '%(CCC)s -shared $(LDFLAGS)' )
- 
- #--------------------------------------------------------------------------------
- class LinuxCompilerGCC(UnixCompilerGCC):
--- 
-2.24.1
-
diff --git a/dev-python/pysvn/pysvn-1.9.11.ebuild b/dev-python/pysvn/pysvn-1.9.11.ebuild
deleted file mode 100644
index e355066124ee..000000000000
--- a/dev-python/pysvn/pysvn-1.9.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_IN_SOURCE_BUILD=true
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Object-oriented python bindings for subversion"
-HOMEPAGE="https://pysvn.sourceforge.io/"
-SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND="
-	>=dev-python/pycxx-7.0.2[${PYTHON_USEDEP}]
-	>=dev-vcs/subversion-1.9"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-respect-flags.patch )
-
-python_prepare_all() {
-	# Don't use internal copy of dev-python/pycxx.
-	rm -r Import || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	cd Source || die
-	# all config options from 1.7.6 are all already set
-	esetup.py configure
-}
-
-python_compile() {
-	cd Source || die
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-python_test() {
-	cd Tests || die
-	emake
-}
-
-python_install() {
-	cd Source || die
-	python_domodule pysvn
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Docs/. )
-	if use examples; then
-		docinto examples
-		dodoc -r Examples/Client/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-lzo/files/python-lzo-1.12-fix-py3.10.patch b/dev-python/python-lzo/files/python-lzo-1.12-fix-py3.10.patch
new file mode 100644
index 000000000000..17bad96d6278
--- /dev/null
+++ b/dev-python/python-lzo/files/python-lzo-1.12-fix-py3.10.patch
@@ -0,0 +1,159 @@
+diff --git a/lzomodule.c b/lzomodule.c
+index b5fa542..e9ca432 100644
+--- a/lzomodule.c
++++ b/lzomodule.c
+@@ -31,6 +31,8 @@
+ 
+ #define MODULE_VERSION  "1.12"
+ 
++#define PY_SSIZE_T_CLEAN
++
+ #include <Python.h>
+ #include <lzo/lzo1x.h>
+ 
+@@ -83,7 +85,7 @@ compress(PyObject *dummy, PyObject *args)
+     lzo_uint in_len;
+     lzo_uint out_len;
+     lzo_uint new_len;
+-    int len;
++    Py_ssize_t len;
+     int level = 1;
+     int header = 1;
+     int err;
+@@ -95,6 +97,16 @@ compress(PyObject *dummy, PyObject *args)
+     if (len < 0)
+         return NULL;
+ 
++    if (len > LZO_UINT_MAX) {
++      PyErr_SetString(LzoError, "Input size is larger than LZO_UINT_MAX");
++      return NULL;
++    }
++
++    if ((len + len / 16 + 64 + 3) > LZO_UINT_MAX) {
++      PyErr_SetString(LzoError, "Output size is larger than LZO_UINT_MAX");
++      return NULL;
++    }
++
+     in_len = len;
+     out_len = in_len + in_len / 16 + 64 + 3;
+ 
+@@ -189,7 +201,7 @@ decompress(PyObject *dummy, PyObject *args)
+     lzo_uint in_len;
+     lzo_uint out_len;
+     lzo_uint new_len;
+-    int len;
++    Py_ssize_t len;
+     int buflen = -1;
+     int header = 1;
+     int err;
+@@ -274,7 +286,7 @@ optimize(PyObject *dummy, PyObject *args)
+     lzo_uint in_len;
+     lzo_uint out_len;
+     lzo_uint new_len;
+-    int len;
++    Py_ssize_t len;
+     int err;
+     int header = 1;
+     int buflen = -1;
+@@ -356,7 +368,7 @@ static PyObject *
+ adler32(PyObject *dummy, PyObject *args)
+ {
+     char *buf;
+-    int len;
++    Py_ssize_t len;
+     unsigned long val = 1; /* == lzo_adler32(0, NULL, 0); */
+ 
+     UNUSED(dummy);
+@@ -392,7 +404,7 @@ static PyObject *
+ crc32(PyObject *dummy, PyObject *args)
+ {
+     char *buf;
+-    int len;
++    Py_ssize_t len;
+     unsigned long val = 0; /* == lzo_crc32(0, NULL, 0); */
+ 
+     UNUSED(dummy);
+diff --git a/tests/test.py b/tests/test.py
+index 9a96ce7..af761d9 100644
+--- a/tests/test.py
++++ b/tests/test.py
+@@ -96,11 +96,17 @@ def test_version():
+ 
+ def test_lzo():
+     yield gen, b"aaaaaaaaaaaaaaaaaaaaaaaa"
+-    yield gen_raw, b"aaaaaaaaaaaaaaaaaaaaaaaa"
+     yield gen, b"abcabcabcabcabcabcabcabc"
+-    yield gen_raw, b"abcabcabcabcabcabcabcabc"
+     yield gen, b"abcabcabcabcabcabcabcabc", 9
++
++
++def test_lzo_raw():
++    yield gen_raw, b"aaaaaaaaaaaaaaaaaaaaaaaa"
++    yield gen_raw, b"abcabcabcabcabcabcabcabc"
+     yield gen_raw, b"abcabcabcabcabcabcabcabc", 9
++
++
++def test_lzo_empty():
+     yield gen, b""
+     yield gen_raw, b""
+ 
+@@ -113,41 +119,8 @@ def test_lzo_raw_big():
+     gen_raw(b" " * 131072)
+ 
+ 
+-def main(args):
+-    # display version information and module documentation
+-    print("LZO version %s (0x%x), %s" % (lzo.LZO_VERSION_STRING, lzo.LZO_VERSION, lzo.LZO_VERSION_DATE))
+-    print(lzo.__file__)
+-    print()
+-    print(lzo.__doc__)
+-
+-    # display additional module information
+-    ## print dir(lzo)
+-    ## print_modinfo()
+-
+-    # compress some simple strings
+-    gen(b"aaaaaaaaaaaaaaaaaaaaaaaa")
+-    gen_raw(b"aaaaaaaaaaaaaaaaaaaaaaaa")
+-    gen(b"abcabcabcabcabcabcabcabc")
+-    gen_raw(b"abcabcabcabcabcabcabcabc")
+-    gen(b"abcabcabcabcabcabcabcabc", level=9)
+-    gen_raw(b"abcabcabcabcabcabcabcabc", level=9)
+-    gen(b" " * 131072)
+-    gen_raw(b" " * 131072)
+-    gen(b"")
+-    gen_raw(b"")
+-    print("Simple compression test passed.")
+-
+-    test_version()
+-
+-    # force an exception (because of invalid compressed data)
+-    assert issubclass(lzo.error, Exception)
+-    try:
+-        x = lzo.decompress("xx")
+-    except lzo.error:
+-        pass
+-    else:
+-        print("Exception handling does NOT work !")
+-    return 0
+-
+-if __name__ == '__main__':
+-    sys.exit(main(sys.argv))
++if sys.maxsize > 1<<32:
++    # This test raises OverflowError on 32-bit Pythons. Compressing
++    # this much data requires a 64-bit system.
++    def test_lzo_compress_extremely_big():
++        b = lzo.compress(bytes(bytearray((1024**3)*2)))
+diff --git a/tests/util.py b/tests/util.py
+index 0a2f4ed..c7bd5f0 100644
+--- a/tests/util.py
++++ b/tests/util.py
+@@ -45,7 +45,7 @@ def get_sys_path(p=None):
+     if p: p0 = p[0]
+     #
+     plat = get_platform()
+-    plat_specifier = "%s-%s" % (plat, sys.version[:3])
++    plat_specifier = "%s-%d.%d" % (plat, sys.version_info[0], sys.version_info[1])
+     ##print plat, plat_specifier
+     #
+     for prefix in (p0, os.curdir, os.pardir,):
diff --git a/dev-python/python-lzo/python-lzo-1.12-r2.ebuild b/dev-python/python-lzo/python-lzo-1.12-r2.ebuild
new file mode 100644
index 000000000000..58fd3a519a9c
--- /dev/null
+++ b/dev-python/python-lzo/python-lzo-1.12-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Python interface to lzo"
+HOMEPAGE="https://github.com/jd-boyd/python-lzo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/lzo:2"
+DEPEND="${RDEPEND}"
+
+# We can't use pytest at the moment because the package uses "yield tests"
+# https://docs.pytest.org/en/6.2.x/deprecations.html#yield-tests
+distutils_enable_tests --install nose
+
+PATCHES=(
+	# Upstream commits: 52440984, e63333e5, 15c40595 and 0a4272fc
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
+python_prepare_all() {
+	hprefixify setup.py
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 59b8a6f2b508..61aa765e969b 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,2 +1 @@
-DIST python-xlib-0.30.tar.bz2 211256 BLAKE2B 979a004f6ff6ac933baa41623b346c8d1fa9944bc771308e3dd527de7ae6aebb8df0c5d269f21e7aca590ad7d3981d0deeb592981b0672c54b30ce286e650236 SHA512 52ee01cce73f024d6fdc995cff38ba9ff2838888aced12186a754c1760228f89209c1d6fc9d4fe0e371a4a43743f8fdfdef6ea32ea3feda5a85055897aaf887d
 DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
diff --git a/dev-python/python-xlib/python-xlib-0.30.ebuild b/dev-python/python-xlib/python-xlib-0.30.ebuild
deleted file mode 100644
index 685f42523eed..000000000000
--- a/dev-python/python-xlib/python-xlib-0.30.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.31.ebuild b/dev-python/python-xlib/python-xlib-0.31.ebuild
index feaee764185d..76532415ea44 100644
--- a/dev-python/python-xlib/python-xlib-0.31.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.31.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index f4e63d6fb300..b1ae96b342b4 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1 @@
-DIST pyusb-1.1.1.tar.gz 74746 BLAKE2B 795acafae3193e1a415baeb634554c8fdec3f4baa45a61a3eac9e1af4a84634cc540d421b7d8ad20142912fbef6ba53684e2e5b008e48f3e89406a493918ab20 SHA512 19aa82dcb9421d536063a975414855d1474f44b33dc4039e9a001be795061dbd60ed576acb605ae6bab7a0fe10834e5507408757546c7edcd50b43687a65a287
-DIST pyusb-1.2.0.tar.gz 75557 BLAKE2B 3a2d066d4069a8662c981ab1f01237d7c0bc18be82afb96a79cf861b04e2e389c5d5f6be96bf54337ef0b2ad8043d047554caed83987328d4e453a3748d13bc6 SHA512 3aa6314bd06467cf22fe299d414ffbdea773c8784dccfe53e7d54d238285bc389ba35317a993b38d2b2027c71a990edcf17016a060b8e627fe97e9cfcc99ce7d
 DIST pyusb-1.2.1.tar.gz 75292 BLAKE2B c1b99f22919ab4beb8e96d664147dc51001c4a48b3acf9ba3961f7f53a9d13277c622e891481fd00b9d34d2ed8a2a0932b7949c13396ea4d76b36f36fcc4cdb0 SHA512 51d0c1165540afa21d6d0ab7315ac77b08083d1cb8e502173dfb1766bc542173f9d7b0070fd14bc71d147e31c3f0780b277093791a7c82485962a04ec62bf0f1
diff --git a/dev-python/pyusb/pyusb-1.1.1.ebuild b/dev-python/pyusb/pyusb-1.1.1.ebuild
deleted file mode 100644
index 55f1ec8eb994..000000000000
--- a/dev-python/pyusb/pyusb-1.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-
-### This version is compatible with both 0.X and 1.X versions of libusb
-DEPEND="virtual/libusb:="
-RDEPEND="${DEPEND}"
-
-DOCS=( README.rst docs/tutorial.rst )
-
-python_test() {
-	cd tests || die
-	"${EPYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyusb/pyusb-1.2.0.ebuild b/dev-python/pyusb/pyusb-1.2.0.ebuild
deleted file mode 100644
index 9ff3fa79a501..000000000000
--- a/dev-python/pyusb/pyusb-1.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-### This version is compatible with both 0.X and 1.X versions of libusb
-DEPEND="virtual/libusb:="
-RDEPEND="${DEPEND}"
-
-DOCS=( README.rst docs/tutorial.rst )
-
-python_test() {
-	cd tests || die
-	"${EPYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
-}