Adding metadata

39 files changed, 301 insertions, 546 deletions

diff --git a/dev-python/PyPDF2/PyPDF2-2.3.1.ebuild b/dev-python/PyPDF2/PyPDF2-2.3.1.ebuild
index 0e03e76b96de..d795f96518b2 100644
--- a/dev-python/PyPDF2/PyPDF2-2.3.1.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-2.3.1.ebuild
@@ -34,6 +34,9 @@ RDEPEND="
 "
 BDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 0fc3e9d88b57..ff953f219149 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1 +1,2 @@
 DIST charset_normalizer-2.0.12.gh.tar.gz 83293 BLAKE2B f1e993fff311cd3a1081a68d545703f545d68712c18f3821368c144b6166a8790482711171254f2741117ecbc9e18ad0bd5c19165d5fa6aed24ba021ce08535d SHA512 c42c64a9e15b322da0dfb6afa19947683a31106fdd620c15c0d948593e95e21d0d9c4a94ace32d67a9cc0cd95aea8f40b8fd09807b214f4ae2e79164627da05d
+DIST charset_normalizer-2.1.0.gh.tar.gz 85498 BLAKE2B f18c491b7d2b32cfc3cd92b1dc074b89f562c11a1bdebb9d4ff7c230ac7c2394c6f7cb30caa8cde9d8da26f1ed527a01c28236099b793808274c1146f258546d SHA512 a14e9e1d58eb23c9c568e7e74ab88361f522a76575b5ddc30df392f33584c821cf4943029395d2535c641d8fe441256803e6d2212e52c6f4b0544db64bd73b7c
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
new file mode 100644
index 000000000000..937c5f430da7
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/Ousret/charset_normalizer/
+"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/clickgen/Manifest b/dev-python/clickgen/Manifest
deleted file mode 100644
index 5bad634546e0..000000000000
--- a/dev-python/clickgen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST clickgen-1.1.9.tar.gz 1616607 BLAKE2B f16dabff6ded51833b79de5441753959643e1542ae56b979f2a88532e29e3a37d1454d3317027e265774ac4140f957b56d7d8c373991485e27f546d208893e4f SHA512 6823733a73cc4f023641325d4b53ea54b579b8168906680d2e5b071a27974b63dac9828c13d14fc73ae8c16844f47f1ed477e8de76352522bfd9abe4de53ffd3
diff --git a/dev-python/clickgen/clickgen-1.1.9.ebuild b/dev-python/clickgen/clickgen-1.1.9.ebuild
deleted file mode 100644
index 04701bb52579..000000000000
--- a/dev-python/clickgen/clickgen-1.1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="X11 & Windows cursor building API"
-HOMEPAGE="https://github.com/ful1e5/clickgen https://pypi.org/project/clickgen/"
-SRC_URI="https://github.com/ful1e5/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	media-libs/libpng
-	x11-libs/libX11
-	x11-libs/libXcursor
-"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-flags.patch )
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-
-src_configure() {
-	distutils-r1_src_configure
-	tc-export CC
-}
-
-python_compile() {
-	emake -C xcursorgen
-	distutils-r1_python_compile
-}
diff --git a/dev-python/clickgen/files/clickgen-flags.patch b/dev-python/clickgen/files/clickgen-flags.patch
deleted file mode 100644
index 427f7beb74e9..000000000000
--- a/dev-python/clickgen/files/clickgen-flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/xcursorgen/makefile
-+++ b/xcursorgen/makefile
-@@ -1,12 +1,12 @@
- all: xcursorgen.so
- 
--CC= gcc
-+CC ?= gcc
- LIBS= -lX11 -lXcursor -lpng -lz
- OUT_DIR= ../clickgen
- CP= cp -f
- 
- xcursorgen.so: xcursorgen.c
--	$(CC) -Wl,-zdefs -shared -o xcursorgen.so -fPIC  xcursorgen.c $(LIBS) 
-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-zdefs -shared -o xcursorgen.so -fPIC  xcursorgen.c $(LIBS) 
- 	$(CP) xcursorgen.so $(OUT_DIR)/xcursorgen.so
- 
- clean:
diff --git a/dev-python/clickgen/metadata.xml b/dev-python/clickgen/metadata.xml
deleted file mode 100644
index ddf845a84262..000000000000
--- a/dev-python/clickgen/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>alexey@zapparov.com</email>
-  <name>Alexey Zapparov</name>
- </maintainer>
- <upstream>
-  <changelog>https://github.com/ful1e5/clickgen/blob/main/CHANGELOG.md</changelog>
-  <bugs-to>https://github.com/ful1e5/clickgen/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
deleted file mode 100644
index 4a7bb4a80d19..000000000000
--- a/dev-python/dicttoxml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild
deleted file mode 100644
index 07c5ed937aae..000000000000
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts a Python dictionary or other data type to a valid XML string"
-HOMEPAGE="https://github.com/quandyfactory/dicttoxml https://pypi.org/project/dicttoxml/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-PATCHES=(
-	# https://github.com/quandyfactory/dicttoxml/pull/73/files
-	"${FILESDIR}/${P}-py3.10.patch"
-)
diff --git a/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch b/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
deleted file mode 100644
index 5b3fe172949e..000000000000
--- a/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2b7b4522b7255fbc8f1e04304d2e440d333909d5 Mon Sep 17 00:00:00 2001
-From: Kier von Konigslow <kvonkonigslow@gmail.com>
-Date: Sat, 28 Dec 2019 14:08:46 -0500
-Subject: [PATCH] Fix deprecation with collections abc
-
----
- dicttoxml.py | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/dicttoxml.py b/dicttoxml.py
-index ae1384a..5d2dd54 100755
---- a/dicttoxml.py
-+++ b/dicttoxml.py
-@@ -15,7 +15,7 @@
- version = __version__
- 
- from random import randint
--import collections
-+import collections.abc
- import numbers
- import logging
- from xml.dom.minidom import parseString
-@@ -96,7 +96,7 @@ def get_xml_type(val):
-         return 'null'
-     if isinstance(val, dict):
-         return 'dict'
--    if isinstance(val, collections.Iterable):
-+    if isinstance(val, collections.abc.Iterable):
-         return 'list'
-     return type(val).__name__
- 
-@@ -188,7 +188,7 @@ def convert(obj, ids, attr_type, item_func, cdata, parent='root'):
-     if isinstance(obj, dict):
-         return convert_dict(obj, ids, parent, attr_type, item_func, cdata)
-         
--    if isinstance(obj, collections.Iterable):
-+    if isinstance(obj, collections.abc.Iterable):
-         return convert_list(obj, ids, parent, attr_type, item_func, cdata)
-         
-     raise TypeError('Unsupported data type: %s (%s)' % (obj, type(obj).__name__))
-@@ -232,7 +232,7 @@ def convert_dict(obj, ids, parent, attr_type, item_func, cdata):
-                 )
-             )
- 
--        elif isinstance(val, collections.Iterable):
-+        elif isinstance(val, collections.abc.Iterable):
-             if attr_type:
-                 attr['type'] = get_xml_type(val)
-             addline('<%s%s>%s</%s>' % (
-@@ -295,7 +295,7 @@ def convert_list(items, ids, parent, attr_type, item_func, cdata):
-                     )
-                 )
- 
--        elif isinstance(item, collections.Iterable):
-+        elif isinstance(item, collections.abc.Iterable):
-             if not attr_type:
-                 addline('<%s %s>%s</%s>' % (
-                     item_name, make_attrstring(attr), 
diff --git a/dev-python/dicttoxml/metadata.xml b/dev-python/dicttoxml/metadata.xml
deleted file mode 100644
index 29e7ada65f00..000000000000
--- a/dev-python/dicttoxml/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>chutzpah@gentoo.org</email>
-  <name>Patrick McLean</name>
- </maintainer>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
deleted file mode 100644
index 29f5321ac665..000000000000
--- a/dev-python/flask-mongoengine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST flask-mongoengine-1.0.0.gh.tar.gz 123516 BLAKE2B 5dd6cf1d774973ef1883d824bdf467b53306773eff5f7016f6440a7ec55648012755a1270b8fca0974aff00dfb189c0f3f7d6985a01c098729517c0018513c8b SHA512 bd95a8248a972a41c92dc2711f866420aabba56062322801e473e0b347c95ad47da39439992ba6cf23a0981c422ae84756af3af95d1171acd6b321f9cbc63085
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
deleted file mode 100644
index 585eb87f734c..000000000000
--- a/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Flask support for MongoDB and with WTF model forms"
-HOMEPAGE="https://pypi.org/project/flask-mongoengine/"
-SRC_URI="
-	https://github.com/MongoEngine/flask-mongoengine/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND=">=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mongoengine-0.20[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-db/mongodb
-		dev-python/python-email-validator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/addopts/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fails with mongomock installed
-		tests/test_connection.py::test_connection__should_parse_mongo_mock_uri__as_uri_and_as_settings
-	)
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-	local DB_PORT=27017
-
-	mkdir -p "${dbpath}" || die
-	ebegin "Trying to start mongod on port ${DB_PORT}"
-
-	LC_ALL=C \
-	mongod --dbpath "${dbpath}" --nojournal \
-		--bind_ip 127.0.0.1 --port ${DB_PORT} \
-		--unixSocketPrefix "${TMPDIR}" \
-		--logpath "${logpath}" --fork || die
-	sleep 2
-
-	# Now we need to check if the server actually started...
-	if [[ -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-		# yay!
-		eend 0
-	else
-		eend 1
-		eerror "Unable to start mongod for tests. Here is the server log:"
-		cat "${logpath}"
-		die "Unable to start mongod for tests."
-	fi
-
-	local failed
-	nonfatal epytest || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
index d41553047c31..6137364de390 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 COMMON_DEPEND="
 	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild
index 3994b203483a..51ca178b5e1b 100644
--- a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild
+++ b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild
@@ -130,6 +130,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-rust-0.12.1[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.7.4.2[${PYTHON_USEDEP}]
 	>=dev-python/typing_inspect-0.4.0[${PYTHON_USEDEP}]
 "
@@ -140,7 +141,6 @@ DEPEND="
 		>=dev-python/hypothesis-4.36.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesmith-0.0.4[${PYTHON_USEDEP}]
 		>=dev-python/prompt_toolkit-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-rust-0.12.1[${PYTHON_USEDEP}]
 	)
 "
 BDEPEND="test? ( dev-python/ufmt[${PYTHON_USEDEP}] )"
diff --git a/dev-python/markdownify/Manifest b/dev-python/markdownify/Manifest
new file mode 100644
index 000000000000..38380c9db038
--- /dev/null
+++ b/dev-python/markdownify/Manifest
@@ -0,0 +1 @@
+DIST markdownify-0.11.2.tar.gz 14175 BLAKE2B 5addd3acb21897bcab51d7f4da9c0ea69fb01ed839e02fba3f1f5c5d09e6b6639393f488063083ef6b1e8e08ae9ffb6b1e07792940776995a30d11a080baa9d4 SHA512 93c52eed7cc36f965a74470be33fc02a8fe7c760e76a786ccb7daf6638a1b6d18b22fe78fcd5b2d7af16752c5de5fb971f3716df94ae7e343c19072aa1ad68e9
diff --git a/dev-python/markdownify/markdownify-0.11.2.ebuild b/dev-python/markdownify/markdownify-0.11.2.ebuild
new file mode 100644
index 000000000000..e215d64cbfd9
--- /dev/null
+++ b/dev-python/markdownify/markdownify-0.11.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Convert some HTML to Markdown"
+HOMEPAGE="https://github.com/matthewwithanm/python-markdownify https://pypi.org/project/markdownify/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+BDEPEND="
+	dev-python/flake8[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+python_install() {
+	rm -r "${BUILD_DIR}"/lib/tests || die
+	distutils-r1_python_install
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/flask-mongoengine/metadata.xml b/dev-python/markdownify/metadata.xml
index ea8988e8af6a..d5c91acd35e3 100644
--- a/dev-python/flask-mongoengine/metadata.xml
+++ b/dev-python/markdownify/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
+ <maintainer type="person">
+  <email>1over137@anche.no</email>
+  <name>Shaoyu Tseng</name>
  </maintainer>
  
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
deleted file mode 100644
index bec7d861c8a4..000000000000
--- a/dev-python/mongoengine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mongoengine-0.23.1.tar.gz 324881 BLAKE2B f6856d432f34c19f9d32aa7fe340c5a09db6976802f5ce320e9722b942f80a1c38a725eab882780104fa379abe212319802f9dd4b405da41454bda84a5d57eb4 SHA512 fcd2ff1df3e2b28bc4cba67cad71a1856e9f94d4d2ecb731a5cce2f1c5e9abc163be37b7db518dfaa54a0ef7f664ac49b621a0554961aa7e13686ff608ef132a
diff --git a/dev-python/mongoengine/mongoengine-0.23.1.ebuild b/dev-python/mongoengine/mongoengine-0.23.1.ebuild
deleted file mode 100644
index 48728aaa6870..000000000000
--- a/dev-python/mongoengine/mongoengine-0.23.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
-HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
-SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-db/mongodb
-		dev-python/mongomock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: investigate
-		tests/document/test_indexes.py::TestIndexes::test_collation
-		tests/document/test_indexes.py::TestIndexes::test_covered_index
-		tests/document/test_indexes.py::TestIndexes::test_create_geohaystack_index
-		# no $eval
-		tests/queryset/test_queryset.py::TestQueryset::test_exec_js_query
-		tests/queryset/test_queryset.py::TestQueryset::test_exec_js_field_sub
-		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_normalize
-		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_with_0_values
-		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_with_False_values
-		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_with_null_embedded
-		# TODO: investigate (wrong order? bad comparison?)
-		tests/queryset/test_queryset.py::TestQueryset::test_distinct_ListField_EmbeddedDocumentField
-	)
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-	local DB_PORT=27017
-
-	mkdir -p "${dbpath}" || die
-	ebegin "Trying to start mongod on port ${DB_PORT}"
-
-	LC_ALL=C \
-	mongod --dbpath "${dbpath}" --nojournal \
-		--bind_ip 127.0.0.1 --port ${DB_PORT} \
-		--unixSocketPrefix "${TMPDIR}" \
-		--logpath "${logpath}" --fork || die
-	sleep 2
-
-	# Now we need to check if the server actually started...
-	if [[ -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-		# yay!
-		eend 0
-	else
-		eend 1
-		eerror "Unable to start mongod for tests. Here is the server log:"
-		cat "${logpath}"
-		die "Unable to start mongod for tests"
-	fi
-
-	local failed
-	nonfatal epytest || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
deleted file mode 100644
index 4388142a29dc..000000000000
--- a/dev-python/pyilmbase/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch
deleted file mode 100644
index 73281e5ad6d0..000000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 22 Jun 2021 11:08:15 +0200
-Subject: [PATCH] disable py2 for boost
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 291b96e..68b280d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -142,8 +142,6 @@ endif()
- 
- find_package(Boost OPTIONAL_COMPONENTS
-   python
--  python2
--  ${PYILMBASE_BOOST_PY2_COMPONENT}
-   python3
-   ${PYILMBASE_BOOST_PY3_COMPONENT})
- set(_pyilmbase_have_perver_boost)
--- 
-2.32.0
-
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch
deleted file mode 100644
index 1aa4152dbbe5..000000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 22 Jun 2021 11:46:30 +0200
-Subject: [PATCH 1/2] install imathnumpy.so
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- PyImathNumpy/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/PyImathNumpy/CMakeLists.txt b/PyImathNumpy/CMakeLists.txt
-index 7a70f06..2822127 100644
---- a/PyImathNumpy/CMakeLists.txt
-+++ b/PyImathNumpy/CMakeLists.txt
-@@ -49,4 +49,5 @@ if(TARGET Python3::Python AND
-     LIBRARY_OUTPUT_NAME "imathnumpy"
-     DEBUG_POSTFIX ""
-   )
-+  install(TARGETS imathnumpy_python3 DESTINATION ${PyIlmBase_Python3_SITEARCH_REL})
- endif()
--- 
-2.32.0
-
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch
deleted file mode 100644
index a28757cbf1dc..000000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7469db402e2affb094585c374518765c69af703d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 22 Jun 2021 11:47:01 +0200
-Subject: [PATCH 2/2] fix pkgconfig file
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- config/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index a4139bc..45dcca4 100644
---- a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -15,9 +15,9 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
-   # use a helper function to avoid variable pollution, but pretty simple
-   function(pyilmbase_pkg_config_help pcinfile)
-     set(prefix ${CMAKE_INSTALL_PREFIX})
--    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
--    set(libdir ${CMAKE_INSTALL_LIBDIR})
--    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
-+    set(exec_prefix "\${prefix}")
-+    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-+    set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
-     string(REPLACE ".in" "" pcout ${pcinfile})
--- 
-2.32.0
-
diff --git a/dev-python/pyilmbase/metadata.xml b/dev-python/pyilmbase/metadata.xml
deleted file mode 100644
index 2debab2ca660..000000000000
--- a/dev-python/pyilmbase/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>waebbl-gentoo@posteo.net</email>
-  <name>Bernd Waibel</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- <upstream>
-  <remote-id type="cpe">cpe:/a:ilm:openexr</remote-id>
- </upstream>
- <use>
-  <flag name="exceptions">
-			Enable runtime floating point exceptions in PyIMath.
-		</flag>
- </use>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7-r1.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7-r1.ebuild
deleted file mode 100644
index a67868408884..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.5.7-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit cmake python-single-r1
-
-DESCRIPTION="IlmBase Python bindings"
-HOMEPAGE="https://www.openexr.com"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/openexr-${PV}/PyIlmBase"
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="amd64 ~x86"
-IUSE="exceptions test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!dev-libs/imath[python]
-	~media-libs/openexr-${PV}:=
-	sys-libs/zlib
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-disable-py2-for-boost.patch
-	"${FILESDIR}"/${P}-0002-install-imathnumpy.so.patch
-	"${FILESDIR}"/${P}-0003-fix-pkgconfig-file.patch
-)
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		# starting with boost-1.76.0 we ship the cmake config files
-		-DBoost_NO_BOOST_CMAKE=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
-		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
-		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPython3_INCLUDE_DIR=$(python_get_includedir)
-		-DPython3_LIBRARY=$(python_get_library_path)
-	)
-	cmake_src_configure
-}
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
deleted file mode 100644
index 582fc22ab2da..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit cmake python-single-r1
-
-DESCRIPTION="IlmBase Python bindings"
-HOMEPAGE="https://www.openexr.com"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/openexr-${PV}/PyIlmBase"
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="amd64 ~x86"
-IUSE="exceptions test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~media-libs/openexr-${PV}:=
-	sys-libs/zlib
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-disable-py2-for-boost.patch
-	"${FILESDIR}"/${P}-0002-install-imathnumpy.so.patch
-	"${FILESDIR}"/${P}-0003-fix-pkgconfig-file.patch
-)
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		# starting with boost-1.76.0 we ship the cmake config files
-		-DBoost_NO_BOOST_CMAKE=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
-		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
-		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPython3_INCLUDE_DIR=$(python_get_includedir)
-		-DPython3_LIBRARY=$(python_get_library_path)
-	)
-	cmake_src_configure
-}
diff --git a/dev-python/pyinstaller/pyinstaller-4.2.ebuild b/dev-python/pyinstaller/pyinstaller-4.2-r1.ebuild
index 15656079ba54..1fb7ef8710ac 100644
--- a/dev-python/pyinstaller/pyinstaller-4.2.ebuild
+++ b/dev-python/pyinstaller/pyinstaller-4.2-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Bundles a Python application and all its dependencies into a single
 HOMEPAGE="https://pypi.org/project/pyinstaller/"
 SRC_URI="https://files.pythonhosted.org/packages/b4/83/9f6ff034650abe9778c9a4f86bcead63f89a62acf02b1b47fc2bfc6bf8dd/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+-with-Pyinstaller-Bootloader-exception"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index f8b7e5eaca36..6ae69cbb4836 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1 +1,2 @@
 DIST pytest-testinfra-6.7.0.tar.gz 79187 BLAKE2B 08678f381392fe8a1fe335adc90ac6dc67c5bfa33c87f4e9d81b439eaabd29c393b8dc80cc79625784e76e5b0e264cdfc272cddb531acefbac9a8327be46f7be SHA512 d11f30da0eae9f215173d3f84e6ba7965d926b8ef6c49619c2ccae3d3ff215f351b950eea019e6516a56de0aa7bc533658af978d827a3ad3d1c50e37902b6f91
+DIST pytest-testinfra-6.8.0.tar.gz 78611 BLAKE2B ab1f9732db6a5d88730f4989cc47dc2086844f9809754d9f7811a8f0f092cf3d1e6f48fac2596200bf8e354cfd4aa3dc767bc21139267813141c9522d2116453 SHA512 e0c044430ffae1772b937b405572ef05b6177a645aff7b96e1f779d4f68449241757efae137a03ea8aec28db5f91c0e71574ab52aebef0052ca99ea0ca08db23
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.8.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.8.0.ebuild
new file mode 100644
index 000000000000..c1ce16ed8ac9
--- /dev/null
+++ b/dev-python/pytest-testinfra/pytest-testinfra-6.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Write unit tests in Python to test actual state of your servers"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-testinfra/
+	https://pypi.org/project/pytest-testinfra/
+"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+# Ansible is called via its CLI
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		app-admin/ansible
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pywinrm[${PYTHON_USEDEP}]
+		app-admin/salt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	elog "For the list of available connection back-ends and their dependencies,"
+	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
+}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 75e04b2d1125..5ccf587813b2 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,2 +1,3 @@
+DIST pytools-2022.1.10.tar.gz 70033 BLAKE2B bc7edcaa68110866e2be0f6dec9d712f0c9f4a5eb10c19778940b12fc93437ccae9fa4ebc8ef563fb6127a7348c12532b5d78104dd1c6ce301b2ec6951bb2609 SHA512 6c19ab1b765f036459f24a80b9034b9028b94f1d340bcecdbfa53f955f3240220be3c6c1dad9b4e4d367d1ca094622ee6bcd043b7ecdc85706f2467eed43b58d
 DIST pytools-2022.1.7.tar.gz 69154 BLAKE2B cba04b4033b1910ad0946f650a6e5ab94c0802375eb27575ce56a838a6c62c541f5ed6f80842b2b42c7001a6d1bbf0379aff559110e07862e24e60d60aa2a619 SHA512 9b96aded94604848e9e8784ecdd09aa1fd99a33005ac4840f9a33a5e059895193967060e9e9eb37281a8b8ebae5c9867671109137685492c03492efe672302db
 DIST pytools-2022.1.9.tar.gz 69731 BLAKE2B 12a6b4a299eef5713dbe226b65b3f1d7ef92a67fbef7bcbf166a09dff79ce6eb2ac7976aab9c54d5a1363d96dc61db928ca44c22de8b33637cc0f09f0b0dd347 SHA512 242b41010db581ad18bc96572bd8f25b15ff4228e1ea3ad8eca2016a36d6a2b55bcc570437821eb40605ab45f574b738f8364adbfd0cac28c2b12fb75e75dd14
diff --git a/dev-python/pytools/pytools-2022.1.10.ebuild b/dev-python/pytools/pytools-2022.1.10.ebuild
new file mode 100644
index 000000000000..1a7d88f9557b
--- /dev/null
+++ b/dev-python/pytools/pytools-2022.1.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# NB: numpy is now an "extra" (optional) dep -- we can remove it from
+# RDEPEND If revdeps don't need it
+RDEPEND="
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/readmdict/Manifest b/dev-python/readmdict/Manifest
new file mode 100644
index 000000000000..bbd1f8a7585c
--- /dev/null
+++ b/dev-python/readmdict/Manifest
@@ -0,0 +1 @@
+DIST readmdict-0.1.1.tar.gz 15881 BLAKE2B c320c9da11a348827379f1ebad4d67f2443cb3bda16afc5b7f8b7d7aa2a947874039b21c2c4aaaa1c9666d71b19a745ce78bcaa1df8d10455fa7a1cf5900168b SHA512 f68db59df07bb54f837b26b5fb3d2e2cd87aaac64d38bab5994398b7858f79759a4a216048259ce93e83681bf66318894cf80e68fb44fe5313a6eb44fd56f66e
diff --git a/dev-python/mongoengine/metadata.xml b/dev-python/readmdict/metadata.xml
index ea8988e8af6a..d5c91acd35e3 100644
--- a/dev-python/mongoengine/metadata.xml
+++ b/dev-python/readmdict/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
+ <maintainer type="person">
+  <email>1over137@anche.no</email>
+  <name>Shaoyu Tseng</name>
  </maintainer>
  
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/readmdict/readmdict-0.1.1.ebuild b/dev-python/readmdict/readmdict-0.1.1.ebuild
new file mode 100644
index 000000000000..3c12015128ef
--- /dev/null
+++ b/dev-python/readmdict/readmdict-0.1.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Read mdx/mdd files"
+HOMEPAGE="https://github.com/ffreemt/readmdict https://pypi.org/project/readmdict/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+DEPENDS="dev-python/python-lzo[${PYTHON_USEDEP}]"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 3f638880fc53..b6fa4849022b 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,3 +3,4 @@ DIST setuptools-62.3.3.tar.gz 2586270 BLAKE2B 764f90a5b2585f05b6ae0ad23568a08069
 DIST setuptools-62.3.4.tar.gz 2590435 BLAKE2B 089bb185b65107d54b3a17b423caa28b0505566f8e19efaf34ac347e074492278699295b5e8856756312182a78d524ae5098e86783c5c6e089bdbe2de1d1f60d SHA512 edd9595971ee3cca2d1280e695401d8e4aa38796af89f24132d81b897004147ff4f4fc8daebf6fef0606512cc71e09487a2cb416deeecd851a82abed30f57887
 DIST setuptools-62.4.0.tar.gz 2592908 BLAKE2B 5221c32545d451fe9e80f6c78296044fc805e995578f32d2a8809483c00ea84f918a3bb5e1d1a6d184533282d96a68fab8b4d303d839255a640952d1c575f53a SHA512 552bb6c93793a438d8d319b1ef51932e7e15fab965b9fc81a4f15015e02f3e7318b9df9890c3fb59fac1ec443c17cd5cbd17b7227a6a82deb355230673ae9ec5
 DIST setuptools-62.5.0.tar.gz 2596847 BLAKE2B 62bfd0271404dd77fbc1085ce8f6b8977d1f2fd3b1ccf5fc260df8875a2cfab9570db466c29646e7123404d9308765ef6cc6b4524b8c8dd3df9912c11b989e31 SHA512 32a9511ed9b2973cd81641458f8e9172b97d95a7dc10535a670ee1fe2ea3cba27ac9f93909c1d508c83293e6a20ab816bb899aaccf449823b5d67ac98bdf2718
+DIST setuptools-62.6.0.tar.gz 2599326 BLAKE2B 7f4200f9d9e94fca17fad2c37dab6c2175f5562703d2913ac11cf34020e65dd6aa7d024536e5294de5fb5e9523419526f0b56282da62ba0ca40e7e164c97260e SHA512 d67c438d507fc7959162b5e8c2a15e9c36d37e5cd7052e16eeb58d8a9bcf19b725a0e7b840e101500799d725bbc4c1872d0f79eead66a538e891cc7cfbe3d979
diff --git a/dev-python/setuptools/setuptools-62.6.0.ebuild b/dev-python/setuptools/setuptools-62.6.0.ebuild
new file mode 100644
index 000000000000..97e919bbffe0
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.6.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{7,8,9,10} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/simplemma/Manifest b/dev-python/simplemma/Manifest
index 5f2159f9b980..4e19b7c03c71 100644
--- a/dev-python/simplemma/Manifest
+++ b/dev-python/simplemma/Manifest
@@ -1 +1 @@
-DIST simplemma-0.6.0.tar.gz 73437400 BLAKE2B 6f7e17d00801f17706cf55b5ec06f87e92745555883f3b21080dda08a4f4ee8e4b4305945b8da0974cc5e4dfd4c4b016993e21a7dd97c65d3caa2dae1006af9b SHA512 2dc0ea3c19d0d312f8ddc378846c1191499a4999aa28652212c91cc3be8a77592af7031bf0468347c1c8ef6da122567ced854a6ca4910a030c16e92adbadeb08
+DIST simplemma-0.7.0.tar.gz 73439172 BLAKE2B 98ec7369e427b05ad0a31b77cdd9c1460152d1d60df62f5c72e4e0aff2a26de7f62d4519025bf55eb6bc22abe21c85bac7a80498b4f787b9e2adb51db204e082 SHA512 42c516314e95cc1e95d3fb188ea492cd2965c609ab3c8ecce21ac520f6128006419af07740ff7b3ba09162f5eba4125b9ae8501fc4c9788e672263f6732f2e1a
diff --git a/dev-python/simplemma/simplemma-0.6.0.ebuild b/dev-python/simplemma/simplemma-0.7.0.ebuild
index da8e4d557bfc..da8e4d557bfc 100644
--- a/dev-python/simplemma/simplemma-0.6.0.ebuild
+++ b/dev-python/simplemma/simplemma-0.7.0.ebuild