Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-07-20 12:45:52 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-07-20 12:45:52 +0000
commit: 47198eeb843e4962abdbc4d277f83ae457384598 (patch)
tree: d3b51e416c1ce8e536fa835919e53e4edd2b3380 /dev-python
parent: 9e33818a225446f30080d52799f56c1c4ff9d22d (diff)
download: baldeagleos-repo-47198eeb843e4962abdbc4d277f83ae457384598.tar.gz
baldeagleos-repo-47198eeb843e4962abdbc4d277f83ae457384598.tar.xz
baldeagleos-repo-47198eeb843e4962abdbc4d277f83ae457384598.zip
75 files changed, 736 insertions, 421 deletions
diff --git a/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild b/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild
index ecf23143bf89..b9f6701450f7 100644
--- a/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild
+++ b/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild
@@ -1,14 +1,17 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Pure-python reader for DAWGs (DAFSAs) created by dawgdic C++ library."
-HOMEPAGE="https://pypi.org/project/DAWG-Python/"
+HOMEPAGE="
+	https://github.com/pytries/DAWG-Python
+	https://pypi.org/project/DAWG-Python/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/EbookLib/EbookLib-0.17.1.ebuild b/dev-python/EbookLib/EbookLib-0.17.1.ebuild
index da5214a5780d..4a41657813d2 100644
--- a/dev-python/EbookLib/EbookLib-0.17.1.ebuild
+++ b/dev-python/EbookLib/EbookLib-0.17.1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Ebook library which can handle EPUB2/EPUB3 and Kindle format"
diff --git a/dev-python/SLPP/SLPP-1.2.3.ebuild b/dev-python/SLPP/SLPP-1.2.3.ebuild
index 32e857f1b19a..0ae59cab41fa 100644
--- a/dev-python/SLPP/SLPP-1.2.3.ebuild
+++ b/dev-python/SLPP/SLPP-1.2.3.ebuild
@@ -4,10 +4,14 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Simple lua-python parser"
-HOMEPAGE="https://github.com/SirAnthony/slpp https://pypi.org/project/SLPP/"
+HOMEPAGE="
+	https://github.com/SirAnthony/slpp
+	https://pypi.org/project/SLPP/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild b/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
index c24964a3a2fc..c983e586d35e 100644
--- a/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
+++ b/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Take The Time, a super-neat Python library for timing chunks of code"
diff --git a/dev-python/aiosmtplib/Manifest b/dev-python/aiosmtplib/Manifest
deleted file mode 100644
index 2393176491bd..000000000000
--- a/dev-python/aiosmtplib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aiosmtplib-1.1.6.tar.gz 55637 BLAKE2B e2f3ccf01fdd1e488d1159ad711325957fd9831c56561a58e2f0a67e42f28b295903bd046b4dddac6686b99753911f7eea9d882e5060a09687541b3ace716e26 SHA512 6a5d79e1c55b5fa5f8961ce2e52dff55ec440c32fae4a78543338fdcf045a92801b71b2d86999d338e300fbc1a385370786e103fc3c4630e81098c85f2f57ea1
diff --git a/dev-python/aiosmtplib/aiosmtplib-1.1.6.ebuild b/dev-python/aiosmtplib/aiosmtplib-1.1.6.ebuild
deleted file mode 100644
index 45a252c56d1f..000000000000
--- a/dev-python/aiosmtplib/aiosmtplib-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asynchronous SMTP client for use with asyncio"
-HOMEPAGE="https://pypi.org/project/aiosmtplib/ https://github.com/cole/aiosmtplib"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	test? (
-		dev-python/aiosmtpd[${PYTHON_USEDEP}]
-		dev-python/atpublic[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=( tests/test_connect.py::test_connect_via_socket_path )
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs dev-python/sphinx-autodoc-typehints
-
-python_test() {
-	epytest --event-loop=asyncio
-}
diff --git a/dev-python/aiosmtplib/metadata.xml b/dev-python/aiosmtplib/metadata.xml
deleted file mode 100644
index ef3e78610d26..000000000000
--- a/dev-python/aiosmtplib/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>gentoo@samip.fi</email>
-  <name>Skyler Mäntysaari</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/ascim/Manifest b/dev-python/ascim/Manifest
index 2e38aa4a9a8f..98a31677439f 100644
--- a/dev-python/ascim/Manifest
+++ b/dev-python/ascim/Manifest
@@ -1 +1 @@
-DIST ascim-0.1.1.tar.gz 10745 BLAKE2B a417c98c67e14f742a062014792e686e4c95af1d489a2ef9cd4a56a5fe056f2b825f991f6af735397bcdb3e161fba34b961859fb90ea7e85c655ea73f34e54be SHA512 abcb86399da13d1481d20025360efcced08fbb5117af63aa74af146ad72a455cefa5799578f7f5668db455b37cf6cbfcc04a9f418315870c0d754c9e98e98f26
+DIST ascim-0.1.1.gh.tar.gz 10745 BLAKE2B a417c98c67e14f742a062014792e686e4c95af1d489a2ef9cd4a56a5fe056f2b825f991f6af735397bcdb3e161fba34b961859fb90ea7e85c655ea73f34e54be SHA512 abcb86399da13d1481d20025360efcced08fbb5117af63aa74af146ad72a455cefa5799578f7f5668db455b37cf6cbfcc04a9f418315870c0d754c9e98e98f26
diff --git a/dev-python/ascim/ascim-0.1.1.ebuild b/dev-python/ascim/ascim-0.1.1.ebuild
index 46a76e8af5e7..69a836b0aa0f 100644
--- a/dev-python/ascim/ascim-0.1.1.ebuild
+++ b/dev-python/ascim/ascim-0.1.1.ebuild
@@ -1,24 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-EGIT_REPO_URI="https://github.com/fakefred/${PN}"
-case "${PV}" in
-	9999)
-		inherit git-r3
-		;;
-	*)
-		SRC_URI="${EGIT_REPO_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		KEYWORDS="~amd64"
-esac
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
 
 DESCRIPTION="Manipulate ASCII art as you would do with raster images"
 HOMEPAGE="https://github.com/fakefred/ascim"
-LICENSE="MIT"
+SRC_URI="https://github.com/fakefred/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
+LICENSE="MIT"
+KEYWORDS="~amd64"
 SLOT="0"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/ascim/ascim-9999.ebuild b/dev-python/ascim/ascim-9999.ebuild
deleted file mode 100644
index 46a76e8af5e7..000000000000
--- a/dev-python/ascim/ascim-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/fakefred/${PN}"
-case "${PV}" in
-	9999)
-		inherit git-r3
-		;;
-	*)
-		SRC_URI="${EGIT_REPO_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		KEYWORDS="~amd64"
-esac
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-DESCRIPTION="Manipulate ASCII art as you would do with raster images"
-HOMEPAGE="https://github.com/fakefred/ascim"
-LICENSE="MIT"
-
-SLOT="0"
diff --git a/dev-python/asyncpg/Manifest b/dev-python/asyncpg/Manifest
index 0843f7e44caa..4ccb5036a8e2 100644
--- a/dev-python/asyncpg/Manifest
+++ b/dev-python/asyncpg/Manifest
@@ -1,2 +1,2 @@
-DIST asyncpg-0.23.0.tar.gz 775098 BLAKE2B 8afcbf1a39de87b29089fec871bae36f4bdbb38114d08b9badf7b0e2b2d19b074efe5a2ea90b611bb1d32b3b9365124cc17bba10874d2d73a267fc13028aff6a SHA512 bfb47b9d7faac4c7a0d49164c062b68c3fa3a9abac822b75b975bf41c45f6c6be25c4537140e75e1323fe1615bb03353d5ba50ef13d64c5a646293629a643b39
 DIST asyncpg-0.25.0.tar.gz 804292 BLAKE2B 55e679716fe6dab82be9142f1abaa0e47671341b91f4fd182ad564e41a61dbc91990f767e6b0e7d0d00658d530075493d67f284272239c92d3015016ec0dfb2b SHA512 7afa5ae42c0d5cab93bb1c3266bad11ce2e7c271d7ffd2c5d92e373fd8e06be89e4b18e8fd3ffd7e750e913944630f1ae6c947e20faa63f99ded7d867ad6cd80
+DIST asyncpg-0.26.0.tar.gz 809997 BLAKE2B 360dfadcd729ade63c156e3a16def7f652dbc4d0c76189ac88e01fa814f9a3ab4f1bd2852658a93e22a8e275fb1a4e69df2e3c30f457110291f0641ac6d12d8d SHA512 ef92316fd430a1819aa8170abd67ecfc1cf29c42cb6dc06cf5047cdd71d4abf441c8b86bacafaaa8c0c0fd7c66daa275e9ed68b00e5166bb27929f25cab1dcbd
diff --git a/dev-python/asyncpg/asyncpg-0.23.0.ebuild b/dev-python/asyncpg/asyncpg-0.26.0.ebuild
index d672f1042bbf..dd479ad73b1e 100644
--- a/dev-python/asyncpg/asyncpg-0.23.0.ebuild
+++ b/dev-python/asyncpg/asyncpg-0.26.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{7,8,9,10} )  # doesn't build with pypy3
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
-DESCRIPTION="A fast PostgreSQL Database Client Library for Python/asyncio."
+DESCRIPTION="A fast PostgreSQL Database Client Library for Python/asyncio"
 HOMEPAGE="https://github.com/MagicStack/asyncpg"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
@@ -15,12 +15,17 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# ModuleNotFoundError: No module named 'asyncpg.protocol.protocol'
-# for some reason, still doesn't work if package is already installed
-# or with distutils_install_for_testing function
-RESTRICT="test"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
 distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx_rtd_theme
+
+python_compile() {
+	if use test; then
+		esetup.py build_ext --force --inplace
+		rm -r build || die
+	fi
+
+	distutils-r1_python_compile
+}
diff --git a/dev-python/autoflake/Manifest b/dev-python/autoflake/Manifest
index 1c009f0b695d..488179638d8d 100644
--- a/dev-python/autoflake/Manifest
+++ b/dev-python/autoflake/Manifest
@@ -1 +1 @@
-DIST autoflake-1.4.tar.gz 24219 BLAKE2B 622c82b9ab5e7fd68e8bc2678c5868282e605640e1c52d1a8f81fbaaba26dfb738ac1ceb9eb20195bb820256fbae27222953a5271130e74b8708988516e20e00 SHA512 53e542a765cbd18df7c35a90f16786e173bdc332b4410abfbc6d24f1009bf5d6f8a383e897e72558617bdf339573d8aa9b8de6901aac392caf48889aacf0c9a6
+DIST autoflake-1.4.gh.tar.gz 24219 BLAKE2B 622c82b9ab5e7fd68e8bc2678c5868282e605640e1c52d1a8f81fbaaba26dfb738ac1ceb9eb20195bb820256fbae27222953a5271130e74b8708988516e20e00 SHA512 53e542a765cbd18df7c35a90f16786e173bdc332b4410abfbc6d24f1009bf5d6f8a383e897e72558617bdf339573d8aa9b8de6901aac392caf48889aacf0c9a6
diff --git a/dev-python/autoflake/autoflake-1.4-r1.ebuild b/dev-python/autoflake/autoflake-1.4-r1.ebuild
index b51e045d28b3..487398f4628a 100644
--- a/dev-python/autoflake/autoflake-1.4-r1.ebuild
+++ b/dev-python/autoflake/autoflake-1.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Removes unused imports and unused variables as reported by pyflakes"
@@ -12,17 +12,15 @@ HOMEPAGE="
 	https://github.com/myint/autoflake
 	https://pypi.org/project/autoflake/
 "
-SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-DEPEND=">=dev-python/pyflakes-1.1.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-python/pyflakes-1.1.0[${PYTHON_USEDEP}]"
 
-RESTRICT="!test? ( test )"
+distutils_enable_tests setup.py
 
 python_test() {
 	"${EPYTHON}" test_autoflake.py || die
diff --git a/dev-python/b2sdk/Manifest b/dev-python/b2sdk/Manifest
index 38390b803f39..05576c6cdbe0 100644
--- a/dev-python/b2sdk/Manifest
+++ b/dev-python/b2sdk/Manifest
@@ -1,2 +1,2 @@
 DIST b2sdk-1.12.0.tar.gz 273412 BLAKE2B e67cf20a6d7277c3d2990e6f6c46cf9df253b3a46a8c8672cbdc810ca851e8c0cd6b6033b9034ce00283a577e2838cdb0c15410b12546f87c480581b5920074b SHA512 4d5eff1f9efed551c474a472a4c531b67b3356e959dde1d1058aad797abd5fd160781700753019d62ac2f05bd711bf1e6a0b15c0f5f86fd93bab17347a83cb13
-DIST b2sdk-1.8.0.tar.gz 250511 BLAKE2B dad792589148fc3cad91fed1aeb43e02afca6f67f35e2f8239510606d601067abbdd36a3f0b2b2b8264697004d548d8077c999437f027c058072d7383d13c48c SHA512 ee1e1987f127835b2016bba9485c7a9d9503b4a675662a7364310fec7c963214805ed6bc15b3a1f07477f202bbe06325f480997eb202bcdfa1cb24f006d0a900
+DIST b2sdk-1.17.2.tar.gz 308753 BLAKE2B 07b6f71f604475d861257a1a7c567fc561a90c1c8c5768d21d63a82ff1c57240a81f8ebf96f1b3113cbea181140a128ebad9ed524e410a9c163a04a1de1ee2a0 SHA512 e618e18de16b021dc86a4b5ee9d315294eba5c3421318a4ea668681dc0420d6c3798f17c17be6475dddad7cfada8bf615916a5dc41ef905b8ecd7623b2a0c7bb
diff --git a/dev-python/b2sdk/b2sdk-1.17.2.ebuild b/dev-python/b2sdk/b2sdk-1.17.2.ebuild
new file mode 100644
index 000000000000..298323d474e5
--- /dev/null
+++ b/dev-python/b2sdk/b2sdk-1.17.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2021-2022 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="The client library for BackBlaze's B2 product"
+HOMEPAGE="https://github.com/Backblaze/b2-sdk-python"
+SRC_URI="https://github.com/Backblaze/b2-sdk-python/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.17.2-disable-requirement-installation.patch"
+)
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/arrow-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/logfury-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
+		>=dev-python/tqdm-4.5.0[${PYTHON_USEDEP}]
+	')
+"
+
+distutils_enable_tests pytest
+
+BDEPEND+=" test? (
+	$(python_gen_cond_dep '
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-lazy-fixture-0.6.3[${PYTHON_USEDEP}]
+	')
+)"
+
+# These tests seem to require some b2 authentication (they're integration tests
+# so this is not unreasonable)
+python_test() {
+	epytest \
+		--deselect test/integration/test_large_files.py::TestLargeFile::test_large_file \
+		--deselect test/integration/test_raw_api.py::test_raw_api \
+		--deselect test/integration/test_download.py::TestDownload::test_large_file \
+		--deselect test/integration/test_download.py::TestDownload::test_small \
+		--deselect test/integration/test_download.py::TestDownload::test_small_unverified \
+		--deselect test/integration/test_download.py::TestDownload::test_gzip \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_invalid_profile_name \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_profile_and_file_name_conflict \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_profile_and_env_var_conflict \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_profile_and_xdg_config_env_var \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_profile \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_file_name \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_env_var \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_default_file_if_exists \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_xdg_config_env_var \
+		--deselect test/unit/account_info/test_sqlite_account_info.py::TestSqliteAccountProfileFileLocation::test_default_file
+}
diff --git a/dev-python/b2sdk/b2sdk-1.8.0.ebuild b/dev-python/b2sdk/b2sdk-1.8.0.ebuild
deleted file mode 100644
index 24d0e2a3bfbf..000000000000
--- a/dev-python/b2sdk/b2sdk-1.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 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="The client library for BackBlaze's B2 product"
-HOMEPAGE="https://github.com/Backblaze/b2-sdk-python"
-SRC_URI="https://github.com/Backblaze/b2-sdk-python/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.0-skip-integration-test.patch"
-	"${FILESDIR}/${PN}-1.8.0-disable-requirement-installation.patch"
-)
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/arrow-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/logfury-0.1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-		>=dev-python/tqdm-4.5.0[${PYTHON_USEDEP}]
-	')
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-		' pypy3 python3_7)
-"
-
-distutils_enable_tests pytest
-
-BDEPEND+=" test? (
-	$(python_gen_cond_dep '
-		>=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	')
-)"
diff --git a/dev-python/b2sdk/files/b2sdk-1.17.2-disable-requirement-installation.patch b/dev-python/b2sdk/files/b2sdk-1.17.2-disable-requirement-installation.patch
new file mode 100644
index 000000000000..d6d1952b0755
--- /dev/null
+++ b/dev-python/b2sdk/files/b2sdk-1.17.2-disable-requirement-installation.patch
@@ -0,0 +1,22 @@
+# This will disable the setup.py features that attempt to install missing
+# requirements using pip
+--- a/setup.py
++++ b/setup.py
+@@ -102,7 +102,7 @@ setup(
+     # your project is installed. For an analysis of "install_requires" vs pip's
+     # requirements files see:
+     # https://packaging.python.org/en/latest/requirements.html
+-    install_requires=read_requirements(),
++    # install_requires=read_requirements(),
+ 
+     # List additional groups of dependencies here (e.g. development
+     # dependencies). You can install these using the following syntax,
+@@ -109,7 +109,7 @@ setup(
+     # for example:
+     # $ pip install -e .[dev,test]
+     extras_require={'doc': read_requirements('doc')},
+-    setup_requires=['setuptools_scm<6.0'],
++    # setup_requires=['setuptools_scm<6.0'],
+     use_scm_version=True,
+ 
+     # If there are data files included in your packages that need to be
diff --git a/dev-python/b2sdk/files/b2sdk-1.2.0-skip-integration-test.patch b/dev-python/b2sdk/files/b2sdk-1.2.0-skip-integration-test.patch
deleted file mode 100644
index bd13d9944696..000000000000
--- a/dev-python/b2sdk/files/b2sdk-1.2.0-skip-integration-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/integration/test_raw_api.py b/test/integration/test_raw_api.py
-index e6cd288..ec89604 100644
---- a/test/integration/test_raw_api.py
-+++ b/test/integration/test_raw_api.py
-@@ -15,6 +15,7 @@ from b2sdk import raw_api
- 
- 
- # TODO: move the test_raw_api test logic here
-+@pytest.mark.skip(reason="Cannot do this in portage")
- def test_raw_api():
-     application_key_id = os.environ.get('B2_TEST_APPLICATION_KEY_ID')
-     if application_key_id is None:
diff --git a/dev-python/baron/Manifest b/dev-python/baron/Manifest
index 1ca7a27b6ffb..78c5b0c3383f 100644
--- a/dev-python/baron/Manifest
+++ b/dev-python/baron/Manifest
@@ -1 +1 @@
-DIST baron-0.9.tar.gz 835127 BLAKE2B be5aee3b5f7d8c317295cb88429eb2feb45c2fba135ba1a57370a070bd27dd6ee1fea8048201f40d7579bea56c535855a8605d6304f1987f4b138ed5591d0b77 SHA512 ed31bad1442b8d868ab9872f057db31ad8730654a7e8d49119c75d5631c881b074baf5754b0b0b5023dad62eda1f40461e4445321695248cfa3530b608d48c8e
+DIST baron-0.9.gh.tar.gz 835127 BLAKE2B be5aee3b5f7d8c317295cb88429eb2feb45c2fba135ba1a57370a070bd27dd6ee1fea8048201f40d7579bea56c535855a8605d6304f1987f4b138ed5591d0b77 SHA512 ed31bad1442b8d868ab9872f057db31ad8730654a7e8d49119c75d5631c881b074baf5754b0b0b5023dad62eda1f40461e4445321695248cfa3530b608d48c8e
diff --git a/dev-python/baron/baron-0.9.ebuild b/dev-python/baron/baron-0.9.ebuild
index 8f8684f7e0ec..294b83e5143f 100644
--- a/dev-python/baron/baron-0.9.ebuild
+++ b/dev-python/baron/baron-0.9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Full Syntax Tree for python to make writing refactoring code a realist task"
 HOMEPAGE="https://github.com/PyCQA/baron https://baron.pycqa.org"
-SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -20,6 +20,7 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
 # Doc building fails:
 # RuntimeError: Non Expected warning in `/var/tmp/portage/dev-python/baron-0.9/work/baron-0.9/docs/advanced.rst` line 48
 #distutils_enable_sphinx docs dev-python/matplotlib dev-python/ipython
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ba9850752f65..52fd854f885d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,3 +2,4 @@ DIST boto3-1.24.22.gh.tar.gz 513301 BLAKE2B 1b71d128cc8f8224fd1ef521988e6b5e9415
 DIST boto3-1.24.26.gh.tar.gz 515531 BLAKE2B 34f99c4dd224731e07c2f0b175d6d172661ce454a7af16be6856053af1bfac69b7f56ada5b154fb625fe2ba1fb22fbe34b5150c550890e46a923b48f2466b06b SHA512 a3980ec79abd5e2656d7d02b36dff6b8c2acb67033eff134d96dccbb9d8bbc2d711698b87d08d537256fad7e3b3cd7af008018ef567b12d63ef0fc871a8f3b3e
 DIST boto3-1.24.31.gh.tar.gz 519387 BLAKE2B 8581d1018f0e1f0802779851edb52fdb6860c44bf46e6315eddd3b603cb65a0763707686286aa06447e90df6c8e6cae3de0e6bae8a9836ad90e5a3f4335797bf SHA512 370773f2365f4dcc7b73d0828bc84f0de5c15b189d23b799738c2358b1b0119e5e457f26529b7a6c90d637c2142121a2874d088671715c8deb4b793afbf7fd38
 DIST boto3-1.24.32.gh.tar.gz 519061 BLAKE2B f890c39f1cd3fd539e2e99ee3b5b9898da4197a2c00c6409366c70fb0ceb7e957879f2190321c06ac26638310992add19b8a54b2994d3c8d0749496cc0774c5d SHA512 0578112dbccfb76720565c2207c85a8f9e63c51a25ac367cda7ee4c8acce02cb5274d30e1051c049bf90e98f5898a91c71bcea7a187662be61c1ff16ac0c1805
+DIST boto3-1.24.33.gh.tar.gz 520287 BLAKE2B b9bbf7f265e1a3b4dfbda0cfe1d020d211239a7ac67f63a95f7740d4da447dd301ec770e08590365de08bb72cebf703a9c28debe90828206539d939448bbac36 SHA512 6e6a8f04ffd5aa4f87f5cbb884900a3eb6f0831b7bba76d1b8f9a865b3467e98afe9c50e1e2e8fe329a63942925990919d73f0e542edb7ba2b018bd97288ea82
diff --git a/dev-python/boto3/boto3-1.24.33.ebuild b/dev-python/boto3/boto3-1.24.33.ebuild
new file mode 100644
index 000000000000..e4a98e2e28f5
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.33.ebuild
@@ -0,0 +1,68 @@
+# 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 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 0ae7d7a80b80..7500a63d5196 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,3 +2,4 @@ DIST botocore-1.27.22.tar.gz 9151155 BLAKE2B e3aa6e9814e07bca2bd67d16f6548303af7
 DIST botocore-1.27.26.tar.gz 9167551 BLAKE2B 9e95c1e6e5261b08247615446a589318d92cc86768c5e3999f99fb8e2a4a888309d72d4d3d66a1ebf9c1e2b6ccab6265a1d94ad9dcbf9da22aa1ae012aa2bfb3 SHA512 bbb563c2bc8eb3fe022f0b7be263ef16de93aadb02fb7a8e242f53a957a97e8f8b5d043ea8897a7b268d4d64b1e4972f2ccc91b8255f232c858f6a9ba1d93f34
 DIST botocore-1.27.31.tar.gz 9184651 BLAKE2B 01dcd9e94490923f7d0f463d3019007f58c5e441ae65ea2c365ed20417e8f7b532228a335c6f461ca97411269aaa78aa48fa33cccd8b2e45a6665c2410bb4352 SHA512 27f810e0519144fae71600ea7f6d9a15cca30386ee0f2b06beeeb64c06da8728b54709fb770673f708697dd930fe744703728ce00b6a1149361ab550fef9ccb4
 DIST botocore-1.27.32.tar.gz 9191251 BLAKE2B 757aa8e1efe16db3e9bedb545c32e9013eb80fc2b0b6fd61903c2c34d4c5140cce41f7c62822b277119079bdb921102d7d1c431edc5617131ab8cd8d6983054c SHA512 3ae2d0d092961bc061d744e74bbf3a387120a400173f54f4d62284535ee2e505a887f57be7c44f306560ce6d6f82c4ff435d0a9221e8e7f406eb13c7dd26ec11
+DIST botocore-1.27.33.tar.gz 9194408 BLAKE2B 1e942308a19a827b5b05187879860e7f3b78c8a184bf948c2ea6c424410f878bef01feb452b89d3cb60b241c17024a4974ad6997373e8e2423e1f725d137c4b3 SHA512 b3b36e75822188f9080808188de6b2f435fd9fb2f76efc41b1052e24008120a399c75a4f944976732257a936eea9290dbca995db03d377f96f8910f2307a8427
diff --git a/dev-python/botocore/botocore-1.27.33.ebuild b/dev-python/botocore/botocore-1.27.33.ebuild
new file mode 100644
index 000000000000..1f52e2694e84
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.33.ebuild
@@ -0,0 +1,66 @@
+# 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 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/curio/Manifest b/dev-python/curio/Manifest
index 7edce9f79609..6e217e5294a2 100644
--- a/dev-python/curio/Manifest
+++ b/dev-python/curio/Manifest
@@ -1,3 +1 @@
-DIST curio-0.9.tar.gz 482459 BLAKE2B 7ef65d22806eb10ee3e757dc0d63a202c13036cdb1995962e193332c50dd73585ab27449614de5995f874c03d8623ea27f967101aa99b15166d19a48f4cdaaea SHA512 a6ae4db76358536e6e299ecfa923fd63746cba4bc5374fbfdeb4127032552c960d1e199fdf17d95b039ca2bd000325c637f663007cd6850313bc00bc9a2a3d68
-DIST curio-1.4.tar.gz 230144 BLAKE2B befe36251e6e9ef39cc220d383d9195e7ed4126aafe64403598b857551fe54ef6fff293e9ddb802dc155c9c6264d9f7b86e7393786b7bd1da4ca8882716a5d77 SHA512 105fe0d3edea0310b98bb93e74ca750516d9f33e4f8c3866be3e92a582485baf885fd58b007fb33c3e24b4a8e73b532f20899ed106c4a6ac23f97b444c4b3ffc
 DIST curio-1.5.tar.gz 234920 BLAKE2B 26e3c0de872d77478f433990f88f9ac35f9615621aadfcc7b8d766488ffe390fd4698854640792bda4e649fc0d1224fa7cb5bf89777268fee4349500a5365547 SHA512 8c78d866b949da862ddb29d6a8db6881d00dedb33637529d02d4e3010de0e1ecd15e74f52c011828738ac7d54e5f04425c8ffb43abaf1e77c21d28d874ff711b
diff --git a/dev-python/curio/curio-0.9.ebuild b/dev-python/curio/curio-0.9.ebuild
deleted file mode 100644
index e0ebbe1013e7..000000000000
--- a/dev-python/curio/curio-0.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 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="Curio is a coroutine-based library for concurrent systems programming"
-HOMEPAGE="
-	https://github.com/dabeaz/curio
-	https://pypi.org/project/curio/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-IUSE="examples"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="test? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Contains hard coded path, fails in emerge
-	rm -r tests/__pycache__ || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/curio/curio-1.4-r1.ebuild b/dev-python/curio/curio-1.4-r1.ebuild
deleted file mode 100644
index a3d4a3feaec6..000000000000
--- a/dev-python/curio/curio-1.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Curio is a coroutine-based library for concurrent systems programming"
-HOMEPAGE="
-	https://github.com/dabeaz/curio
-	https://pypi.org/project/curio/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-IUSE="examples"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="test? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# requires internet connection
-	sed -i -e 's:test_ssl_outgoing:_&:' \
-		tests/test_network.py || die
-
-	# AttributeError: module 'asyncio' has no attribute 'run'
-	sed -i -e 's:test_uqueue_asyncio_consumer:_&:' \
-		tests/test_queue.py || die
-	sed -i -e 's:test_uevent_get_asyncio_set:_&:' \
-		-e 's:test_uevent_get_asyncio_wait:_&:' \
-		-e 's:test_universal_error:_&:' \
-		-e 's:test_universal_value:_&:' \
-		tests/test_sync.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/fchroot/Manifest b/dev-python/fchroot/Manifest
deleted file mode 100644
index 8b4e0d3ad646..000000000000
--- a/dev-python/fchroot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fchroot-0.1.2.tar.gz 8351 BLAKE2B 342d9fcd3df13ce0e6ef2d9ccefb66f98cd4c6cd24855bcbce2299f5a6896408a310020c85b09079778bb904476b8bb8728099a135ba4a499528acbfd578cc55 SHA512 b1cead02a25d980d42ca22bcde6c421d7ff3e6d6357f979d59286c870f3d726950a115b7e63c4e990ddcf078c58a9393271b9a756104fe539102070e4af7c77e
diff --git a/dev-python/fchroot/fchroot-0.1.2.ebuild b/dev-python/fchroot/fchroot-0.1.2.ebuild
deleted file mode 100644
index faf1d8389674..000000000000
--- a/dev-python/fchroot/fchroot-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +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="Franken-chroot tool. Chroot arm/64 arches into amd64/x86"
-HOMEPAGE="https://pypi.org/project/fchroot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+static-libs"
-
-RDEPEND="
-	app-emulation/qemu[qemu_softmmu_targets_x86_64,qemu_softmmu_targets_aarch64,qemu_softmmu_targets_arm,static-user]
-	dev-libs/glib[static-libs]
-	sys-apps/attr[static-libs]
-	sys-libs/zlib[static-libs]
-	dev-libs/libpcre[static-libs]
-"
diff --git a/dev-python/fchroot/metadata.xml b/dev-python/fchroot/metadata.xml
deleted file mode 100644
index 736a1167c898..000000000000
--- a/dev-python/fchroot/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 94b2b134425d..34e7a77f9365 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,3 +2,4 @@ DIST google-api-python-client-2.50.0.gh.tar.gz 30751763 BLAKE2B 4fa967932d13fa03
 DIST google-api-python-client-2.51.0.gh.tar.gz 31181726 BLAKE2B 465cbc3beb870a543bb54b69342d1a4e75026fa3c83846a3641e048b922cfa14ccb56593a0e8feadf4bf30568425347b14f5f1dd081d5d74fa1112bb0d57caa3 SHA512 ea9e9424aa36e077f10922dba9d6bf43f376d5e059c5d0fc7a31ef919232eb7778a891104fe3a7328e841381d5cd2cd76cdfb1fb80458c979f83a935f8b1df5a
 DIST google-api-python-client-2.52.0.gh.tar.gz 31712232 BLAKE2B 573226a90617aaf2b0272393694759f2796cbaf26629f4d79ecb661424c6304689fafda7c2d60289840445f118dbae4cf0ffbd6444bc0c428ee4bb8879a57c92 SHA512 55fc06c50240b22ed51ecd84e797eebc4c57852da9c45ca8c0face7e961ab0debe06d6ac91fcc6ef81878fc4b851b8bec7a192a4e149f611fe9e4d8b15cccdc4
 DIST google-api-python-client-2.53.0.gh.tar.gz 32251370 BLAKE2B 880024a220bb793b53042c8b2192dee666b7f5ad6dd8b0b68d51ff7b18ebd2ba220974f86656ac13b4c421c191ec66b269007a3f68a1992b0672623db046ef6b SHA512 1cb251d8abbec0b33b62b661ea8235224e94f807571b47e8422b6908b6636f844c639328cf0c07b4820a083b265e71f54dc3f6c48447f0cfd20bca738d7ab86a
+DIST google-api-python-client-2.54.0.gh.tar.gz 32389268 BLAKE2B 568ff657ea5093ff927208cd38d0125bf4aea8b725c5ded0a232c4de77f59c97f639b7f2b0ab8cf0e121bafd4512c23f9ac4c3c6cce6b6ab407c6ad2bb5a4983 SHA512 f33525bee9b6cede8955af4e208b64d1c82185cff08173d9ae30a704c3239b9a2ee9972e083fd4a823091b76669a7df02bf60cd950a3e20ddf21c6fd2e5ee18b
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.54.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.54.0.ebuild
new file mode 100644
index 000000000000..95188afdf1fa
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.54.0.ebuild
@@ -0,0 +1,53 @@
+# 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="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index 51f3c3063225..d5de939af4af 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1,2 +1,3 @@
 DIST gpep517-6.gh.tar.gz 9757 BLAKE2B f1b39f30b7d775330bddfd353610de7c26e34c5572cdaedbb078cc61c711e90e1c520b5e6e5532b0879ccc1eb7025a793c6f8d9745d93967eabbdd9edef69c6a SHA512 681108dab418d0d2d5b017f19bf8802479655f22eb6b72e9d78c6bbd2d08583751a465377c2006c507f0ea258d2d46bf9300865896af4458a763b56a86abe329
 DIST gpep517-7.gh.tar.gz 10606 BLAKE2B ca4dfbd79d3e360e9dad1aed7f6ccbfb5e1e3b250badacc38a201b5158235d84b6482676bb7885f6cbd82720ff3749bd9961a01d9717aa9dc213e70f4fe06ced SHA512 d6a36c83ede5525c598390000ced6c36cfb258289626e35f8eccfff4aada5871a8a0b9b53b09379e3ab63782a903eaa4396cfb089e3d30f49e3ef6eb0bfcc351
+DIST gpep517-8.gh.tar.gz 12858 BLAKE2B d02acc844f79495847b151449e2cbc3378122eaf4ae97957f4a3a447cac0adcb9d7fa065e79c52e3901bead5c2112ad140e16689e56fa1a09b8b68078c41210c SHA512 40a405e0d4700a62c7e1aaa8b2679849e18ad5d76b4b733c18632c549c4038ba8594fb48a86ba612b162ef9f433cad90fa3ee7fc92f45b13b88fed7e4cca16b0
diff --git a/dev-python/gpep517/gpep517-8.ebuild b/dev-python/gpep517/gpep517-8.ebuild
new file mode 100644
index 000000000000..db24e141454b
--- /dev/null
+++ b/dev-python/gpep517/gpep517-8.ebuild
@@ -0,0 +1,41 @@
+# 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=no
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A backend script to aid installing Python packages in Gentoo"
+HOMEPAGE="
+	https://pypi.org/project/gpep517/
+	https://github.com/mgorny/gpep517/
+"
+SRC_URI="
+	https://github.com/mgorny/gpep517/archive/v${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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install() {
+	python_domodule gpep517
+	python_newscript - gpep517 <<-EOF
+		#!${EPREFIX}/usr/bin/python
+		import sys
+		from gpep517.__main__ import main
+		sys.exit(main())
+	EOF
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 9dedebde9f39..75f2658799a8 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,4 +1,5 @@
 DIST hypothesis-6.49.1.gh.tar.gz 9316607 BLAKE2B 936d6e6ae293c4648b3ced9eb0fa242a8212182a0c0f988c3c25d748ceea4eeee2074e0da8db1375c2ad32da2061141d3801d037ab370df15546363eb188783f SHA512 14b232ad1b2c233566d26eae2be1557ce543109748b5f835f74acbc9aad6aba2d75e4f9c357ee6dbc3bc75e175413058b4796d2853921c23ff083d66424cf7b4
 DIST hypothesis-6.52.1.gh.tar.gz 9321216 BLAKE2B a05c1778088455010c444be13e5c46976c0b77dde7ae168213303facebd75e4d1b3593a847d7a98d3225c1617621e06f50ffb3d154e736c933556c191a4faae6 SHA512 648db1475a63ff734668529e1b8780f0879bead7ce908d21a0069b2fa784a24a8b0b6d9468b00afd68a62bf4305661cafdf9a2b671fb7d67e39461d2375abc98
 DIST hypothesis-6.52.2.gh.tar.gz 9321530 BLAKE2B d54b97bf15895b503d14629c61cd99d120f318d485c37d2d2e0c012f3a55c361a11caea6329d76baaa1e39635fcd24d0694b45edbf2d0976d29848501c1030f4 SHA512 ac912865374297a299aea0a1f9b56cd5ddd89b8659f81112e7993039ccfb726835730103c756067c6c7ae00833352cda8dd4d555e3c11741b527b8f9c9b83fd4
+DIST hypothesis-6.52.3.gh.tar.gz 9321591 BLAKE2B 50415d463d2513b023b8a6ac87a2bb6dae433b823fd209ec1137a26184bb5550fb9606e006cffecbff09c523fb244b9f8c119e1c9dc765b925f8aa6b0dc43bed SHA512 f8aae5976cc2bd47e157310434d2717caea5e639daf1d794fa6c45332fe44fc5873904451f1fb0b53d56e64147428c4c87e130b4776fd3b14e2c2b961660231d
 DIST hypothesis-hypothesis-python-6.46.11.gh.tar.gz 9312248 BLAKE2B 78b5ca5bd38bd62d2fe50ab929df075e253c059aed329d6b52051fb01449f8de84ae340ba42a4af94ef592411139a45d34aad232fe4bb2d8412165730bbeca01 SHA512 6fdd54f28d275eb65a4f6e6919437d503eba6254c25e22298c34ac67e6de03cd99a5178b1a475b1da7f7afeed8406e89c20b4818436143f442222d26f0d94796
diff --git a/dev-python/hypothesis/hypothesis-6.52.3.ebuild b/dev-python/hypothesis/hypothesis-6.52.3.ebuild
new file mode 100644
index 000000000000..5b926953a2fd
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.52.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+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/identify/Manifest b/dev-python/identify/Manifest
index b721cef550e9..28cb2159a070 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1 +1,2 @@
 DIST identify-2.5.1.gh.tar.gz 101393 BLAKE2B 8586721838c427b00a7c70e842d2ab1a2f0437909d84d5cba6614aff3f8265f17b5137628bdd78e5f324fbf6a0fef8b5ca0246e6861af023c2d9a1a323cc43f6 SHA512 8b61dd03bcdb8908a1a7f3b13d66121bb4f4bb3aab57672bff55a84232dcff310214ed0a90cfcf79846da9abc111bff08761ec9dd40c8b9b183bfbbf365efac4
+DIST identify-2.5.2.gh.tar.gz 101399 BLAKE2B f0ef048c6543b32016ad47a84e4b4b049a88424e496b159ce6ec1a1358172a87849e132b045a7345e818b02aee359e6d9458c458430a4d5d2b9f918cba685ed7 SHA512 72aaf406e5aa7acc83189820c389e82e90cf775541013e4ad91e5d25abdecd8526d1c47d203baa8ab8e5e028836da755a7045e74fded7e8e3167397557d4b1f0
diff --git a/dev-python/identify/identify-2.5.2.ebuild b/dev-python/identify/identify-2.5.2.ebuild
new file mode 100644
index 000000000000..77bcb9aabee1
--- /dev/null
+++ b/dev-python/identify/identify-2.5.2.ebuild
@@ -0,0 +1,29 @@
+# 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="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 9666a5900758..42f128d7d32b 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -2,3 +2,4 @@ DIST mypy-0.942.tar.gz 2701940 BLAKE2B 5501466e57b4afb8825e6c804cbdc270c79ff457c
 DIST mypy-0.950.tar.gz 2746164 BLAKE2B 8466012fd3622f5e730acef774115ac84ff8c6f5488213a450de63d5acc790f937b7c69a1b05b46deef6fe8f81a13ed8e85f83c6c22cce9abdbb73b2ecf4179c SHA512 949d1dade3f225bbef0934fff040f7d5aec47039f554a669ca491d6cb46d56de3fcae0186864cdcaf5dec1347bc3af453218520536a0afa77e89a5c0e4640500
 DIST mypy-0.960.tar.gz 2767017 BLAKE2B 54ca4b9ffeef1f9211569ae8daee3ae201bfc6239eb9530dd5b7bb53983b0f9d343951dc49e4c4cd257660491be3805d7b8a3b5621dd25f1b7726f522a1c74df SHA512 1caa5ea5d87631a00acabd712053193aac4ed2f475760da90e395d64c44092797e45a4793a5fa2dc05458e9d2411b5cde14811c8a5112376c00baf9792df923f
 DIST mypy-0.961.gh.tar.gz 2767264 BLAKE2B 333e860f2416d065fd26f29f818e88c25f223c8f558bd174280ccfbe856c823253095830cc9cc44dd453b3661583d7626e5679ce1e44479b62ed75139051a9a2 SHA512 f7f57d38777256a45c950a45e832b6f1b9465a6663056472a9b32dc8c1d38b4d28ed856f4de12202de5910eeb6197a22073e12924a1e3f58d5631aaa938c0f2a
+DIST mypy-0.971.gh.tar.gz 2808674 BLAKE2B 7f3b183a4c5342ddfc501b8091c078ac55803db86d43042220e18e3e616664ce91ddeb341b45b1d80c7686f8c2f3606af074a5dcb9c9eaacd6307578d3689981 SHA512 5088efbd74385b5a8c155ae6e756deed274bf3e597df13e57970a29c029c34c91453c45fc1d2d03b7d83cd786b8930a387a781e1b9cb72102c1f07263a346c6d
diff --git a/dev-python/mypy/mypy-0.971.ebuild b/dev-python/mypy/mypy-0.971.ebuild
new file mode 100644
index 000000000000..67f294702db1
--- /dev/null
+++ b/dev-python/mypy/mypy-0.971.ebuild
@@ -0,0 +1,63 @@
+# 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 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="
+	http://www.mypy-lang.org/
+	https://github.com/python/mypy/
+	https://pypi.org/project/mypy/
+"
+SRC_URI="
+	https://github.com/python/mypy/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/filelock-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/furo
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 792c8d974dd4..ca140fbe7cb9 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST python-phonenumbers-8.12.50.gh.tar.gz 4904755 BLAKE2B 60353aa081e4d4d0909302a97a45a89c1f94aac323a6a68fd93cd67146090189d0901b947c40e80e54e1718ce4a45c4a83d2799701ff1323666e82570174d358 SHA512 7a4406626d04a85e010036ceca20430a2562939ad8e7e2651afd65f0d5eb26feb1fbbe0c11f081ab58a9ab8bd81da2ccc153ad22f12eb8135b4f604077b5b29d
 DIST python-phonenumbers-8.12.51.gh.tar.gz 4903034 BLAKE2B 6d97e25c3601f817ad51eb8dac550fec4a13799dd9321235c9105386ca2a1ab3a7fa6403f31643197a5a2f162be50edf6b3705c8947098f2d9ff744f6af1dab6 SHA512 80f5ad4356e31bc505c929a8bb9b577ed1571b9173e7f8faebe972f62c16f5a5d764eab5e3bd8aa939faae2c4ebbe2b0fa11a5f2e6fe334be98148a68881c912
+DIST python-phonenumbers-8.12.52.gh.tar.gz 4904385 BLAKE2B c063fee535e3d1dd30844ea7a974601962fb8fd6b56608046e0c488e638624456020100b2b775f979f770ea1690bda38044d4f7457341d1261132f4323a6de86 SHA512 638ec8e09d58adc5131e855a9436b45f1f0252c084638a13130df793d5357fc249e695668e2cce4902a534300c4683b64078e08620fdd2636857f6d328a45d82
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild
new file mode 100644
index 000000000000..9767e4c2d82d
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/phx-class-registry/phx-class-registry-3.0.5.ebuild b/dev-python/phx-class-registry/phx-class-registry-3.0.5-r1.ebuild
index 6a033523d5b1..79d9e11d1fb6 100644
--- a/dev-python/phx-class-registry/phx-class-registry-3.0.5.ebuild
+++ b/dev-python/phx-class-registry/phx-class-registry-3.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 8cf4a8f80438..3698c1428533 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,2 +1,2 @@
-DIST pudb-2021.1.tar.gz 216707 BLAKE2B 1287fa48607e9b73dd0bed063b29933dd4de6ab598ad99217ab13a719a6b9654765bc44c28150962ba22703733a4e956c39e843414444c3b7fff67cefe70d7d8 SHA512 54d62f1342ab461e58a382c0eb654ecc9d3bd759844bab2f0a339e91ba805670e4dc7ccd84e8188f34e06a07ac770f1c0cddd4a4ef916885af0bdc638db81fcf
 DIST pudb-2022.1.1.tar.gz 218514 BLAKE2B 860e7a176d48a3a5424f86ec6dfabea70173b7e73ff3bc512e17c00ac3d7ff7e4f0a3b021e5ce1f38546643d035f4c567003b9808982e0fc4e49428cb08ae7b6 SHA512 0d098b2dac3442913ecf0827ed272dd57d6d03d44d6c67c6ddb8ef61bfc06f153e17aad60e5a0c17a490a675aba610b768289acf13ce9bc2603791b3c4012e4b
+DIST pudb-2022.1.2.tar.gz 219735 BLAKE2B fc2007b2be3a362d1198230815fd1642557c455ee0501e75784402ab88252e34806af1dbec20bc18f743b04b7133bde8466f48583d306002b341f3dececa62ab SHA512 73b9259a2ade953389d13b4e7df7179c54244700ffb1475e2fc5e3bb4a73259afa7b2b09a316aacbe47476fb6da3cf5b952cb082de51d6a953cd96a1eaf9cc4f
diff --git a/dev-python/pudb/pudb-2021.1.ebuild b/dev-python/pudb/pudb-2022.1.2.ebuild
index 08ade20d4f72..092c91013101 100644
--- a/dev-python/pudb/pudb-2021.1.ebuild
+++ b/dev-python/pudb/pudb-2022.1.2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
+
 inherit distutils-r1
 
 DESCRIPTION="A full-screen, console-based Python debugger"
@@ -12,14 +14,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
+	dev-python/urwid_readline[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pylatexenc/Manifest b/dev-python/pylatexenc/Manifest
index a340c67f9e0e..ebd6284223fd 100644
--- a/dev-python/pylatexenc/Manifest
+++ b/dev-python/pylatexenc/Manifest
@@ -1 +1 @@
-DIST pylatexenc-2.10.tar.gz 721836 BLAKE2B 8512e052271c127809105280360706217f5134b2349d4b21dcec720addb4cff4157173f8350115de4142aea491da2efb1a2854b4310c48ec98061470be21654e SHA512 9728731e0c84324685b77ce17fae0bea445815e2c54394d2722c4412bbd914da49280ef36b5f3a0a0346e5d2129ca2d8d3b3b92356de3c6af9eed4247cf8bd43
+DIST pylatexenc-2.10.gh.tar.gz 721836 BLAKE2B 8512e052271c127809105280360706217f5134b2349d4b21dcec720addb4cff4157173f8350115de4142aea491da2efb1a2854b4310c48ec98061470be21654e SHA512 9728731e0c84324685b77ce17fae0bea445815e2c54394d2722c4412bbd914da49280ef36b5f3a0a0346e5d2129ca2d8d3b3b92356de3c6af9eed4247cf8bd43
diff --git a/dev-python/pylatexenc/metadata.xml b/dev-python/pylatexenc/metadata.xml
index d6781acb9c90..eb416c9da2b3 100644
--- a/dev-python/pylatexenc/metadata.xml
+++ b/dev-python/pylatexenc/metadata.xml
@@ -5,11 +5,15 @@
   <email>gaboroszkar@protonmail.com</email>
   <name>Gábor Oszkár Dénes</name>
  </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
  <longdescription>
     Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion.
     The pylatexenc.latexencode module provides a function unicode_to_latex() which converts a unicode string into LaTeX text and escape sequences. It should recognize accented characters and most math symbols. A couple of switches allow you to alter how this function behaves.
     You can also run latexencode in command-line to convert plain unicode text (from the standard input or from files given on the command line) into LaTeX code, written on to the standard output.
   </longdescription>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pylatexenc/pylatexenc-2.10.ebuild b/dev-python/pylatexenc/pylatexenc-2.10.ebuild
index 4dc4a74100f7..489379dd4154 100644
--- a/dev-python/pylatexenc/pylatexenc-2.10.ebuild
+++ b/dev-python/pylatexenc/pylatexenc-2.10.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion"
 HOMEPAGE="https://github.com/phfaist/pylatexenc"
-SRC_URI="https://github.com/phfaist/pylatexenc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/phfaist/pylatexenc/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-constraint/Manifest b/dev-python/python-constraint/Manifest
index c91937213f66..8ba24b510129 100644
--- a/dev-python/python-constraint/Manifest
+++ b/dev-python/python-constraint/Manifest
@@ -1 +1 @@
-DIST python-constraint-1.4.0.tar.gz 24966 BLAKE2B 5ada7926f226536a1384bf9a082da41824e46d683ee71a278c50e1e5ca0a21eb3acbde4c0b47d6b48c53864ab4ea47d602fc9acb976423035aee74b0c6f3ed85 SHA512 fbc65ba5854e227e62469290e2d8362ed3247931592e2ac7eb5bcd5d3f9f720bbab8a984a8f7cf9dce989663f13965c5401286a1bdc673c2c076c8b22e19f0cd
+DIST python-constraint-1.4.0.gh.tar.gz 24966 BLAKE2B 5ada7926f226536a1384bf9a082da41824e46d683ee71a278c50e1e5ca0a21eb3acbde4c0b47d6b48c53864ab4ea47d602fc9acb976423035aee74b0c6f3ed85 SHA512 fbc65ba5854e227e62469290e2d8362ed3247931592e2ac7eb5bcd5d3f9f720bbab8a984a8f7cf9dce989663f13965c5401286a1bdc673c2c076c8b22e19f0cd
diff --git a/dev-python/python-constraint/metadata.xml b/dev-python/python-constraint/metadata.xml
index 0324a62cd37d..f2fd571b7632 100644
--- a/dev-python/python-constraint/metadata.xml
+++ b/dev-python/python-constraint/metadata.xml
@@ -5,9 +5,13 @@
   <email>gaboroszkar@protonmail.com</email>
   <name>Gábor Oszkár Dénes</name>
  </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
  <longdescription>
     The Python constraint module offers solvers for Constraint Satisfaction Problems (CSPs) over finite domains in simple and pure Python. CSP is class of problems which may be represented in terms of variables (a, b, ...), domains (a in [1, 2, 3], ...), and constraints (a &lt; b, ...).
   </longdescription>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/python-constraint/python-constraint-1.4.0.ebuild b/dev-python/python-constraint/python-constraint-1.4.0.ebuild
index 7ca5f19b9d8c..c8bc67d048fe 100644
--- a/dev-python/python-constraint/python-constraint-1.4.0.ebuild
+++ b/dev-python/python-constraint/python-constraint-1.4.0.ebuild
@@ -10,12 +10,14 @@ inherit distutils-r1
 
 DESCRIPTION="Constraint Solving Problem resolver for Python"
 HOMEPAGE="https://github.com/python-constraint/python-constraint"
-SRC_URI="https://github.com/python-constraint/python-constraint/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/python-constraint/python-constraint/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-distutils_enable_tests pytest
+PATCHES=(
+	"${FILESDIR}/python-constraint-1.4.0-exclude-examples.patch"
+)
 
-PATCHES=( "${FILESDIR}/python-constraint-1.4.0-exclude-examples.patch" )
+distutils_enable_tests pytest
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 376cbac9a72b..3e6801efb6fb 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1 +1,2 @@
 DIST python-daemon-2.3.0.tar.gz 82831 BLAKE2B 6e7fa082a513827283f46044347dfd445633db0d1781a33aa1bc5b14c340da784310ae6bd07d6cf3673cd05cb14a9d090ab51857d26cca52d09bc8c3b195360f SHA512 30bb70821aae720d09032c8c666524fa9a1a486314ffff73eb161231a1f2b954914295b4ad41f9c8529bc045fb6d0f89256bc59f8979a4f8a6698e9bd4d7441a
+DIST python-daemon-2.3.1.tar.gz 82856 BLAKE2B d1ede5fde50f179b0bf3e3ed89bd988469bae1f57667ab601d44452706a84264f55fc9beb89226e5fb1bb6d92f88fc2a5c2497628de16990407a0e01cfbacd84 SHA512 128fd8ac125eac613936668bb555635c8cec576d5c23513210f0956983c70720dd93906adeee581b192b57480a3df93dc1e08f6f7b62e38b2404fa00aba4805a
diff --git a/dev-python/python-daemon/python-daemon-2.3.1.ebuild b/dev-python/python-daemon/python-daemon-2.3.1.ebuild
new file mode 100644
index 000000000000..5a790c61561e
--- /dev/null
+++ b/dev-python/python-daemon/python-daemon-2.3.1.ebuild
@@ -0,0 +1,33 @@
+# 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="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"
+
+# build system and tests use GPL-3.0+ but none of these files are installed
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/lockfile[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index 09435e4f03d0..846e1eba2203 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,3 +1,4 @@
 DIST python-dbusmock-0.27.5.tar.gz 89775 BLAKE2B 316bb1ae06c894702d54b7a54d0c422a877c50fb7e8aa4a1bb3c9ac342acdec8f6adaafea86afa5aa041414a283fdd284e27b58728efa234fb8bcbbf92b25f27 SHA512 6e5f5eddfc949c610b64a766434988c142397893e088b8522e6895e31383ec3c14d2f053f9aab17f00137e883a01bf95be35326f7ca97ee8c9780d6704e7d1dc
 DIST python-dbusmock-0.28.0.gh.tar.gz 85445 BLAKE2B 65038699f11de8fd8c50937023c1da113964ea81f39ba151bddf9cb69021c33f3de67b9fe5f7ac5d0a484f324b705b83d462fd1ffbab642d827ef1a3d82460a4 SHA512 62db0e6e8292f0d6426ec6f13af9aada8175ea5d5e84bf4d3890f0c3897c0ea06295de0625ec6041a86bb688fad28d6da9a1b3310daafeae4e56d7a596a90092
 DIST python-dbusmock-0.28.1.gh.tar.gz 85927 BLAKE2B f513e571f7aa30f19a86eb12439028ef141016d0a2df8684bf92378081ce6f8675c6f2033ab2f2dd27f9687ae3de09e1c36127d3b9468ae5239f17eeff861bfd SHA512 92fafa96f5c3dc216e25092a35a70775f1af257eb6ef3c3df00fa3ea062e1bf366f8c2113604ec1fc480d5586b0c1aeb72ce6d25447752b33591b15f637ca6ef
+DIST python-dbusmock-0.28.4.gh.tar.gz 86900 BLAKE2B af6ca30e15e803e66aec63d40d56d121c93e9fe253d7640111104c8e8c0ea5e0491b53f551d6b454ae7370cbbb7f8fb14c07b5be92a8425efa39e04f962311f5 SHA512 f388425ebb68c20b5110a831879bee0d7d0a3941687fd61c9975c4aaa9950b05709e7fc2a9b885c89935a915f473bb7a9b97e93ca79cf3dc6769911a66aeaea7
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild
new file mode 100644
index 000000000000..082b5a9bc103
--- /dev/null
+++ b/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild
@@ -0,0 +1,40 @@
+# 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="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="
+	https://github.com/martinpitt/python-dbusmock/
+	https://pypi.org/project/python-dbusmock/
+"
+SRC_URI="
+	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+	# linter tests, fragile to newer linter versions
+	rm tests/test_code.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/qiskit-aer/Manifest b/dev-python/qiskit-aer/Manifest
index c71d77b9ad68..1dd95accffd1 100644
--- a/dev-python/qiskit-aer/Manifest
+++ b/dev-python/qiskit-aer/Manifest
@@ -1 +1 @@
-DIST qiskit-aer-0.10.3.tar.gz 6657490 BLAKE2B 443f7df2259c720fb93a60659da9b1cded25f9dbdf585bd0322e9f4effe4c5955daf6587d6c3964ab4a7e4a8bf6270f857abae1cf4e6b0718801daa6a96c2aec SHA512 c882624bac373566b003a01fffa6963d4ad8796ce18786b50ef85350daac26814c147b36067eb6fce4f264919b3680246e767b5c13ac338817fd394620392079
+DIST qiskit-aer-0.10.3.gh.tar.gz 6657490 BLAKE2B 443f7df2259c720fb93a60659da9b1cded25f9dbdf585bd0322e9f4effe4c5955daf6587d6c3964ab4a7e4a8bf6270f857abae1cf4e6b0718801daa6a96c2aec SHA512 c882624bac373566b003a01fffa6963d4ad8796ce18786b50ef85350daac26814c147b36067eb6fce4f264919b3680246e767b5c13ac338817fd394620392079
diff --git a/dev-python/qiskit-aer/metadata.xml b/dev-python/qiskit-aer/metadata.xml
index 333195718f87..35fe2ec9f7ad 100644
--- a/dev-python/qiskit-aer/metadata.xml
+++ b/dev-python/qiskit-aer/metadata.xml
@@ -5,10 +5,14 @@
   <email>gaboroszkar@protonmail.com</email>
   <name>Gábor Oszkár Dénes</name>
  </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
  <longdescription>
     Qiskit is an open-source framework for working with noisy quantum computers at the level of pulses, circuits, and algorithms.
     Qiskit is made up of elements that each work together to enable quantum computing. This element is Aer, which provides high-performance quantum computing simulators with realistic noise models.
   </longdescription>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/qiskit-aer/qiskit-aer-0.10.3.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.10.3.ebuild
index 1016ff037532..847f9a092dd1 100644
--- a/dev-python/qiskit-aer/qiskit-aer-0.10.3.ebuild
+++ b/dev-python/qiskit-aer/qiskit-aer-0.10.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="High performance simulator for quantum circuits that includes noise models"
 HOMEPAGE="https://github.com/Qiskit/qiskit-aer"
-SRC_URI="https://github.com/Qiskit/qiskit-aer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Qiskit/qiskit-aer/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/qiskit-terra/Manifest b/dev-python/qiskit-terra/Manifest
index ab8d976069fd..a8227925a43f 100644
--- a/dev-python/qiskit-terra/Manifest
+++ b/dev-python/qiskit-terra/Manifest
@@ -1 +1 @@
-DIST qiskit-terra-0.19.2.tar.gz 9536647 BLAKE2B 966370a782179512f3c4cd209f604f536ac4ac503f4805681d5729f4d6df4020bbaa5a2beb2fc393506eaa67a81666254375f14b827e07e1c1478a381fde5b45 SHA512 d02c028a86927610f1bca63830cb489069e68e016ed744a4092a96ddde163ea8ca1071048fc82b1807d4136e1fb2b0fcdde6d1a639ffc2ebe7c99dfd50c2e3d4
+DIST qiskit-terra-0.19.2.gh.tar.gz 9536647 BLAKE2B 966370a782179512f3c4cd209f604f536ac4ac503f4805681d5729f4d6df4020bbaa5a2beb2fc393506eaa67a81666254375f14b827e07e1c1478a381fde5b45 SHA512 d02c028a86927610f1bca63830cb489069e68e016ed744a4092a96ddde163ea8ca1071048fc82b1807d4136e1fb2b0fcdde6d1a639ffc2ebe7c99dfd50c2e3d4
diff --git a/dev-python/qiskit-terra/metadata.xml b/dev-python/qiskit-terra/metadata.xml
index 4f750d353178..1ebd92304807 100644
--- a/dev-python/qiskit-terra/metadata.xml
+++ b/dev-python/qiskit-terra/metadata.xml
@@ -5,6 +5,10 @@
   <email>gaboroszkar@protonmail.com</email>
   <name>Gábor Oszkár Dénes</name>
  </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
  <longdescription>
     Qiskit is an open-source framework for working with noisy quantum computers at the level of pulses, circuits, and algorithms.
     Qiskit is made up of elements that work together to enable quantum computing. This element is Terra and is the foundation on which the rest of Qiskit is built.
@@ -13,5 +17,5 @@
  <use>
   <flag name="visualization">Enable visualization modules</flag>
  </use>
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild
index dd47bb480367..66a71b3197bf 100644
--- a/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild
+++ b/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Terra is the foundation on which Qiskit is built"
 HOMEPAGE="https://github.com/Qiskit/qiskit-terra"
-SRC_URI="https://github.com/Qiskit/qiskit-terra/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Qiskit/qiskit-terra/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild b/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
index ccd04436773e..420571615b22 100644
--- a/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
+++ b/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
@@ -23,13 +23,15 @@ KEYWORDS="~amd64"
 RDEPEND="
 	dev-python/cssselect[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
-	|| ( ( $(python_gen_cond_dep \
-			'dev-python/cchardet[${PYTHON_USEDEP}]' python3_{8..10}) )
+	|| (
 		dev-python/chardet[${PYTHON_USEDEP}]
+		( $(python_gen_cond_dep \
+			'dev-python/cchardet[${PYTHON_USEDEP}]' python3_{8..10}) )
 	)
 "
 BDEPEND="
 	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep \
 			'dev-python/timeout-decorator[${PYTHON_USEDEP}]' python3_{8..11})
 	)
diff --git a/dev-python/retworkx/Manifest b/dev-python/retworkx/Manifest
index 692e30950f56..ed5e3a7acd23 100644
--- a/dev-python/retworkx/Manifest
+++ b/dev-python/retworkx/Manifest
@@ -52,7 +52,7 @@ DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb
 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
-DIST retworkx-0.11.0.tar.gz 332386 BLAKE2B ec84e208d5a7e6135578ea1c0c053e49e10ccdbfd118e02631304425a880112877472fa4e3d9801bfbf32eb3ab043f71bdaff013de0c13dff2633a01946bd21e SHA512 2b20962add7c9c6716a846144e617a6b4a729739cd1227b91967dbefc6014703739562a639d66ee6f1e7431efc5e25a8e18ea29068aecbed6361744565c4572f
+DIST retworkx-0.11.0.gh.tar.gz 332386 BLAKE2B ec84e208d5a7e6135578ea1c0c053e49e10ccdbfd118e02631304425a880112877472fa4e3d9801bfbf32eb3ab043f71bdaff013de0c13dff2633a01946bd21e SHA512 2b20962add7c9c6716a846144e617a6b4a729739cd1227b91967dbefc6014703739562a639d66ee6f1e7431efc5e25a8e18ea29068aecbed6361744565c4572f
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST syn-1.0.76.crate 233723 BLAKE2B 99b781b6ffa926ca71d0a09ae81dacfc6ee713e15fd057232e527761b73f088c30967eb13d624bdf34a089c5a33fa28ecf6ca069e3dfd7061932643849243967 SHA512 0f32138d219ca74fcff1ee5ee5bb89f965a30b74c10a040bd8361332cb84900322194dd85ad7571c4bce72c1f66368546db5881165939800f2587b15ce07298a
diff --git a/dev-python/retworkx/metadata.xml b/dev-python/retworkx/metadata.xml
index 853442ed8670..5c9811c70e41 100644
--- a/dev-python/retworkx/metadata.xml
+++ b/dev-python/retworkx/metadata.xml
@@ -5,9 +5,13 @@
   <email>gaboroszkar@protonmail.com</email>
   <name>Gábor Oszkár Dénes</name>
  </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
  <longdescription>
     retworkx is a general purpose graph library for python3 written in Rust to take advantage of the performance and safety that Rust provides. It was built as a replacement for qiskit's previous (and current) networkx usage (hence the name) but is designed to provide a high performance general purpose graph library for any python application. The project was originally started to build a faster directed graph to use as the underlying data structure for the DAG at the center of qiskit-terra's transpiler, but it has since grown to cover all the graph usage in Qiskit and other applications.
   </longdescription>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/retworkx/retworkx-0.11.0.ebuild b/dev-python/retworkx/retworkx-0.11.0.ebuild
index 252dfec50aaa..5d9797882637 100644
--- a/dev-python/retworkx/retworkx-0.11.0.ebuild
+++ b/dev-python/retworkx/retworkx-0.11.0.ebuild
@@ -78,7 +78,7 @@ inherit cargo distutils-r1
 
 DESCRIPTION="A high performance Python graph library implemented in Rust"
 HOMEPAGE="https://github.com/Qiskit/retworkx"
-SRC_URI="https://github.com/Qiskit/retworkx/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/Qiskit/retworkx/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT"
@@ -97,11 +97,11 @@ BDEPEND="dev-python/setuptools-rust
 
 RDEPEND=">=dev-python/numpy-1.16.0"
 
-distutils_enable_tests pytest
-
 # Libraries built with rust do not use CFLAGS and LDFLAGS.
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/retworkx/retworkx.*\\.so"
 
+distutils_enable_tests pytest
+
 python_test() {
 	# We have to hide the source code directory so tests
 	# do not use these, but instead the compiled library.
diff --git a/dev-python/rst2ansi/rst2ansi-0.1.5.ebuild b/dev-python/rst2ansi/rst2ansi-0.1.5-r1.ebuild
index eb4565725428..571e181e85ac 100644
--- a/dev-python/rst2ansi/rst2ansi-0.1.5.ebuild
+++ b/dev-python/rst2ansi/rst2ansi-0.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/thriftrw/Manifest b/dev-python/thriftrw/Manifest
deleted file mode 100644
index 4de95eb6045f..000000000000
--- a/dev-python/thriftrw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST thriftrw-1.8.1.gh.tar.gz 91370 BLAKE2B 8e267b77f80ce1dec0bfd04a0a047cbe8279374f65f7a928ad65019ee11bb44afc991182c8f5525c34e3e6ce736deb1eb6a2e8428cf4e8853ad2d2e18649e8ed SHA512 ea40d4aa35d8f5f097557cb0b1c8800b2a935fc738c33266951163f4ade783b2a5d866a18433afe4e304f435b8de012f52c6d717e812b604e34c7a4ee61fd0fa
diff --git a/dev-python/thriftrw/files/thriftrw-1.8.1-no-install-examples.patch b/dev-python/thriftrw/files/thriftrw-1.8.1-no-install-examples.patch
deleted file mode 100644
index 0cc86410765e..000000000000
--- a/dev-python/thriftrw/files/thriftrw-1.8.1-no-install-examples.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -148,7 +148,7 @@
-     author='Abhinav Gupta',
-     author_email='abg@uber.com',
-     url='https://github.com/thriftrw/thriftrw-python',
--    packages=find_packages(exclude=('tests', 'tests.*')),
-+    packages=find_packages(exclude=('tests', 'tests.*', 'examples', 'examples*')),
-     license='MIT',
-     install_requires=['six', 'ply'],
-     tests_require=['pytest', 'mock'],
diff --git a/dev-python/thriftrw/files/thriftrw-1.8.1-tool-pytest.patch b/dev-python/thriftrw/files/thriftrw-1.8.1-tool-pytest.patch
deleted file mode 100644
index 5bb3774c6f30..000000000000
--- a/dev-python/thriftrw/files/thriftrw-1.8.1-tool-pytest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -2,7 +2,7 @@
- create-wheel = yes
- python-file-with-version = thriftrw/__init__.py
- 
--[pytest]
-+[tool:pytest]
- addopts = --tb short --benchmark-autosave --benchmark-save-data
- 
- [egg_info]
diff --git a/dev-python/thriftrw/metadata.xml b/dev-python/thriftrw/metadata.xml
deleted file mode 100644
index b4e2232081f7..000000000000
--- a/dev-python/thriftrw/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/thriftrw/thriftrw-python/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/thriftrw/thriftrw-1.8.1.ebuild b/dev-python/thriftrw/thriftrw-1.8.1.ebuild
deleted file mode 100644
index 0b4395c43193..000000000000
--- a/dev-python/thriftrw/thriftrw-1.8.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-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
-
-MY_PN="${PN}-python"
-DESCRIPTION="A Thrift encoding library for Python"
-HOMEPAGE="
-	https://github.com/thriftrw/thriftrw-python
-	https://pypi.org/project/thriftrw/
-"
-SRC_URI="https://github.com/thriftrw/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-# broken tests
-RESTRICT="test"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/cython-0.17[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-benchmark-3.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-install-examples.patch"
-	"${FILESDIR}/${P}-tool-pytest.patch"
-)
-
-DOCS=( CHANGELOG.rst CONTRIBUTING.md README.rst TODO.rst )
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs dev-python/alabaster
-
-python_prepare_all() {
-	rm tests/protocol/test_binary.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	use test && esetup.py build_ext --force --inplace
-	distutils-r1_python_compile
-}
diff --git a/dev-python/tweedledum/Manifest b/dev-python/tweedledum/Manifest
index 135a4f9993f3..0ca31a66f0e4 100644
--- a/dev-python/tweedledum/Manifest
+++ b/dev-python/tweedledum/Manifest
@@ -1 +1,2 @@
-DIST tweedledum-1.1.1.tar.gz 5105832 BLAKE2B 71e3e9baaccc345910d5be3831ea0476b06bc3171311d17fc3f160b7d4c9026bab719b1e80f1d462183cdcc1feb750542e2649c2aab5cdc6d4551ab258866649 SHA512 eda9c0d895d59450150946d52d942174652d305a863a10bafa60300cde63a692a8105b7bb5dcc86aeb610b666945215905cf95859f3726b875c88d5cd3d34891
+DIST tweedledum-1.1.1-fmt-e73beb23a3feeba02a851e3f8131e3c85a29de2b.patch 4394926 BLAKE2B 1035945714e7a5f5ac8cc41f9b799c6a3f0ded13b2f86098be11705d09029578d7e019cd784c6fb783c1bbaddb49425b5e2ec4bed142f01436620c6ac793e8f5 SHA512 1307e63be3366ec0b52e4238e3ac58c793f437acca95840b0bf15499efb3eae0e339d3c75c61b9a0c2734eaa6be416b6a35b51f784884aef98d86613e0b540d1
+DIST tweedledum-1.1.1.gh.tar.gz 5105832 BLAKE2B 71e3e9baaccc345910d5be3831ea0476b06bc3171311d17fc3f160b7d4c9026bab719b1e80f1d462183cdcc1feb750542e2649c2aab5cdc6d4551ab258866649 SHA512 eda9c0d895d59450150946d52d942174652d305a863a10bafa60300cde63a692a8105b7bb5dcc86aeb610b666945215905cf95859f3726b875c88d5cd3d34891
diff --git a/dev-python/tweedledum/metadata.xml b/dev-python/tweedledum/metadata.xml
index 2720cc7717a2..9feeffff148b 100644
--- a/dev-python/tweedledum/metadata.xml
+++ b/dev-python/tweedledum/metadata.xml
@@ -5,9 +5,13 @@
   <email>gaboroszkar@protonmail.com</email>
   <name>Gábor Oszkár Dénes</name>
  </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
  <longdescription>
     tweedledum is a library for synthesis, compilation, and optimization of quantum circuits. The library is written to be scalable up to problem sizes in which quantum circuits outperform classical ones. Also, it is meant to be used both independently and alongside established tools.
   </longdescription>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/tweedledum/tweedledum-1.1.1.ebuild b/dev-python/tweedledum/tweedledum-1.1.1-r1.ebuild
index abbff1b127bc..894819a73123 100644
--- a/dev-python/tweedledum/tweedledum-1.1.1.ebuild
+++ b/dev-python/tweedledum/tweedledum-1.1.1-r1.ebuild
@@ -10,22 +10,33 @@ inherit distutils-r1
 
 DESCRIPTION="Library for analysis, compilation, synthesis, optimization of quantum circuits"
 HOMEPAGE="https://github.com/boschmitt/tweedledum"
-SRC_URI="https://github.com/boschmitt/tweedledum/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/boschmitt/tweedledum/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+# Drop on next bump, see bug #858200
+SRC_URI+=" https://github.com/boschmitt/tweedledum/commit/e73beb23a3feeba02a851e3f8131e3c85a29de2b.patch -> ${P}-fmt-e73beb23a3feeba02a851e3f8131e3c85a29de2b.patch"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-# >=dev-python/setuptools-42.0.0
-# >=dev-python/wheel
-# dev-util/ninja
-BDEPEND="
-	>=dev-util/cmake-3.18
-	>=dev-python/scikit-build-0.12.0"
+# Unbundle dev-python/pybind11[${PYTHON_USEDEP}]?
+RDEPEND="
+	dev-cpp/nlohmann_json
+	dev-libs/libfmt:=
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen
+"
+BDEPEND=">=dev-python/scikit-build-0.12.0"
+
+PATCHES=(
+	"${DISTDIR}"/${P}-fmt-e73beb23a3feeba02a851e3f8131e3c85a29de2b.patch
+)
 
 distutils_enable_tests pytest
 
 python_compile() {
+	# -DTWEEDLEDUM_USE_EXTERNAL_PYBIND11=ON
 	local -x SKBUILD_CONFIGURE_OPTIONS="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
 	distutils-r1_python_compile
 }
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-07-20 12:45:52 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-07-20 12:45:52 +0000
commit	47198eeb843e4962abdbc4d277f83ae457384598 (patch)
tree	d3b51e416c1ce8e536fa835919e53e4edd2b3380 /dev-python
parent	9e33818a225446f30080d52799f56c1c4ff9d22d (diff)
download	baldeagleos-repo-47198eeb843e4962abdbc4d277f83ae457384598.tar.gz baldeagleos-repo-47198eeb843e4962abdbc4d277f83ae457384598.tar.xz baldeagleos-repo-47198eeb843e4962abdbc4d277f83ae457384598.zip