Adding metadata

19 files changed, 278 insertions, 127 deletions

diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index fb22138c9790..f4c2edc515f5 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -3,3 +3,4 @@ DIST dns-lexicon-3.8.4.tar.gz 7850337 BLAKE2B f72a338c00346091df2cf53fa01cbc34e8
 DIST dns-lexicon-3.8.5.tar.gz 7850115 BLAKE2B 27dfb837385e370142d82bc682627fa96efc8a4868f9a5532ace608e2739afbecee82dcb531e9a4e0cdf9b2c68e639ae5c7ad1f4774e80f989c13eaa86c93d7a SHA512 e50fdb5c0b0d250babaff0a2d485f9112732a9e975cb853329dbcec33fe592e80a28c469b17cc0a5544909285805c1c20578b5e5f4b22ff6259b624be8c6acde
 DIST dns-lexicon-3.9.0.tar.gz 7843652 BLAKE2B de6339c8f739d00aefca831adfccaed3914c0d9103e7dd5a175215761a27e29eca3c2e26c08239df2e6a34afbe7228013cab7123572c6481ed4e31fa2a20236d SHA512 4bc26018e0702345e86fa352eddff89358b34e878864e6273e89798cce81c4ef9e4ff06a1298481c8496237bb26d8d7c3286c82aac99117a49faa64ea329c307
 DIST dns-lexicon-3.9.2.tar.gz 7833249 BLAKE2B 48ea6da7f47f6de72bf1d11c1226e2e31001ffe08f45ed3b1b0ca42ea134076c0fe4025fa38c4eca9255ef7f4f005555b2dbfa0116680c4d112c2bc37e603090 SHA512 f4052e2837ee43ce8aaadc9e5adbb522f2a9035a5d1813b35c3bd84fb651e10a42594529328d12153d086f2b8d84bb35eb4af2425010df4e8784f4972de00027
+DIST dns-lexicon-3.9.4.tar.gz 8358079 BLAKE2B d029044ca1afed1e392c3f73fbace9019f94a2be4126dcde991f7a279bed60d00225a97e584268540219c1ceb4a33cb244baa6fd9769db937e25c50cd8c76aa5 SHA512 5a982a4727fbe88fbc5a505c6ce4712d455fc208dbb3917f74cb6a2a9d7f1891afc39badd6cef200c336aec220da6de435f0680ab972e6e40dac27b5388dc391
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.9.4.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.9.4.ebuild
new file mode 100644
index 000000000000..35dea200c3e8
--- /dev/null
+++ b/dev-python/dns-lexicon/dns-lexicon-3.9.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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 optfeature
+
+DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
+HOMEPAGE="https://pypi.org/project/dns-lexicon/"
+SRC_URI="https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/lexicon-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tldextract[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/zeep[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# Requires the "localzone" module
+	lexicon/tests/providers/test_localzone.py
+	# Requires the "softlayer" module
+	lexicon/tests/providers/test_softlayer.py
+	# Requires the "transip" module
+	lexicon/tests/providers/test_transip.py
+	# Requires the "oci" module
+	lexicon/tests/providers/test_oci.py
+	# Uses tldextract which needs Internet access to download its database
+	lexicon/tests/providers/test_auto.py
+)
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature_header \
+			"Install the following packages to enable support for additional DNS providers:"
+		optfeature Gransy dev-python/zeep
+		optfeature Route53 dev-python/boto3
+		optfeature DDNS dev-python/dnspython
+	fi
+}
diff --git a/dev-python/github3/github3-3.1.0.ebuild b/dev-python/github3/github3-3.1.0.ebuild
index c6b408c2d12c..3e249ab139a1 100644
--- a/dev-python/github3/github3-3.1.0.ebuild
+++ b/dev-python/github3/github3-3.1.0.ebuild
@@ -34,3 +34,8 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 24d27b3a1ca0..4081f723ddff 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,2 +1,3 @@
 DIST importlib_metadata-4.10.1.tar.gz 42013 BLAKE2B 056a8e16cacc961bef5168c903f5143a764eeee028f576da964fa4b1462ecb98b5baa1b59653cf15a49b0f8d8c31cc9993c16c89d04d188cb1a99d3943ac4ec4 SHA512 96ceb9286145e2933ca3a1724fde4519819c27a1dc0947ef8e0c399a4cc2026875e673ab352f08bb4dd6aa10d78d8c9773a6fb0138e3065961df7e850ff37757
 DIST importlib_metadata-4.11.0.tar.gz 42170 BLAKE2B b1f0a887c3b62981b3312a06b0ebb0bc8e03313f6b1cfb58f59ef934f15aeb5247cf58befba7551f3485bd7162ed8a3c90633a88445a03257aeb9c15a101c08a SHA512 d959fdbf947c034fcac921677041a9f765a09b9b63566f83680f4fe68260d09278f5a3fe443ce0c63a8e561f9cc6e0b48721e75c065af3c89a91cdffe6d2d451
+DIST importlib_metadata-4.11.1.tar.gz 42224 BLAKE2B 7d376d0bfaf3304ea8412559bcbafd2a92ee88a045432a1245b5127ac1766c2842374f4e05e140e95f0e7e73072cdfe6fba6b140c656470f1c24aae8500b662f SHA512 1f7a5469b378b9f3080ae893637eb5aa778267250c50c8a56786d912ef8cd2f737cc580686f7ce37351505728493ac5feb243823ec37b7afc978746e7dc70cef
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.1.ebuild
new file mode 100644
index 000000000000..b17d4dd46f2c
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.11.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' 3.8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index dfac5e5cfb91..3adc08ec7be3 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1 +1,2 @@
+DIST nbclient-0.5.11.gh.tar.gz 75556 BLAKE2B 5c9e44ea1efc05457427ba6fb9bbb319efd5eb314ca4964e0df4b842faa3341f4f51ef74565434ddaf0dcf56c9e2a83ce7bd36ab6c50cc1d0349ecc50af75b51 SHA512 e4142dd28e21be7803651b8b7ed646e168a302edc2ec806b58fdd79454059fea3fedf270e1aaec6152433a15c2280bd38e4dfb0d740091a2ab2987530dbe3c6a
 DIST nbclient-0.5.5.gh.tar.gz 72661 BLAKE2B b2be54c03c12a2cdc641e329946bae37a7b8c1c4aee8ac686c6e3350f27cf7a0a2e64653afb8acac7e373f5cbbab05feba3c1c4d7e8856974621f0d1c96005df SHA512 3066f847c175ac26ab6918b71e84a8f87bc922f624011b707f8b0a6d872c123d7979a5ffec24a933b6f98a7f83bf530926ecccb5a1c6f24bd84b3fbda07fdf48
diff --git a/dev-python/nbclient/nbclient-0.5.11.ebuild b/dev-python/nbclient/nbclient-0.5.11.ebuild
new file mode 100644
index 000000000000..4d49e8824720
--- /dev/null
+++ b/dev-python/nbclient/nbclient-0.5.11.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020-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="A client library for executing Jupyter notebooks"
+HOMEPAGE="
+	https://nbclient.readthedocs.io/en/latest/
+	https://github.com/jupyter/nbclient/
+	https://pypi.org/project/nbclient/"
+SRC_URI="
+	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/xmltodict[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/osrf_pycommon/Manifest b/dev-python/osrf_pycommon/Manifest
index 753f5a7633c2..34446f944791 100644
--- a/dev-python/osrf_pycommon/Manifest
+++ b/dev-python/osrf_pycommon/Manifest
@@ -1,2 +1,3 @@
 DIST osrf_pycommon-1.0.0.tar.gz 45084 BLAKE2B 83bfd5393575a5032e72ae93c9c3eec87d2907ce3fbd3e9fe14a94e5470d61594ab75bca394ec4b7960bbdb16c3ec060966bd6bf47f9a4037d530501c7ce947f SHA512 ff7204116c94eef972b7071f8d6c68fd7cdb1a518fd6c77cd47f54e5390815ff4b6a7d265ef3ed0093c1baa20eb332d69e92926e856da0e34b7186100b688d83
 DIST osrf_pycommon-2.0.0.tar.gz 45467 BLAKE2B bcf111183b66dd19e24182e6fee75674f0481bdeb2498ea2a0d10c56977651da60f94444706df525ee71f64d5eb1a24e2e5b4acaf13f19f94b787ce5b424c81e SHA512 ebb06a86c3527ea9dfb24778410a7f84d5560216aedd4ed5fe0b22660b6fbf9625d093dc8653db58a2cc7f3a81e6c4a2770fca90694441cdb141fb840935c50e
+DIST osrf_pycommon-2.0.1.tar.gz 45839 BLAKE2B 9961eade38c8de980cee01debbc177ae8ef3ef872d2525c9c6a1660e2323a5bfc02d9f5e6295aeada0cb3a9506da27637eb3c042a1328aff7b5e0e6435bd4dc4 SHA512 9f8affe81c6adc7436ccf9481a84b98a32650c6a0d6bff9c378faf1a9202bfeccb9f72046fecdcdd38f5d6047319db97e6e7e090446ab2fce759949046590f4b
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-2.0.1.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-2.0.1.ebuild
new file mode 100644
index 000000000000..ecdc9e382754
--- /dev/null
+++ b/dev-python/osrf_pycommon/osrf_pycommon-2.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-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="Commonly needed Python modules used by Python software developed at OSRF"
+HOMEPAGE="https://github.com/osrf/osrf_pycommon"
+SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# linting is something upstreams do
+	# for us, it either means unneeded deps or breakage due to changes
+	epytest --ignore tests/test_code_format.py
+}
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index 49d7eb3da03d..e16e8c857cf5 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,5 +1,2 @@
-DIST proto-plus-1.19.2.gh.tar.gz 61183 BLAKE2B 8c1c0a70ae573fc8c64004e4bd923f403bf82dbb3f9aef19239770fcd316e513ba11e6e47c56bda65c88e476072f0d90af02c83eb0fe8a4045cf3ceeccca3fc7 SHA512 c3cfb1b6aabeb4eab7f6c2c16551c1f9fbf29dc3199b496bc4b47b4b80cbe4684e5c97abe26fa4c1afd03c844a2e8f006f16c24932d2a7cf8190452943c2fad0
-DIST proto-plus-1.19.7.gh.tar.gz 64614 BLAKE2B 918bb04a084cff8a2188a68c31f08aebd25443fd399d69ba9734d002f773df2769904e4aa551cd1d93586ee4710f2b7160e6a8eb4160fe1bb846be18155a7b29 SHA512 118187a852a998deba3b5d7e700cd084eab966b549c7dba6150f318e9602f950a9533e27d775f9f0bca2fedaed6375b592bae42c55cf5aee8b52708fcc4691c8
-DIST proto-plus-1.19.8.gh.tar.gz 64668 BLAKE2B d90ba4bd2404a0b05325e08e9ec39de0b819af00e9229ca54a7173364a99e0cedb584696093f3df7720d96f8291fad4f26b9963171de8ebd44396550dc932e17 SHA512 e9bd790ec7d2cc7fa54e5c8be374e4a7bc5c92899c5259e6985024fe1c9e25768c1355b808a9a4c38b132026412b2e7d91c5fe0098af661b1dac604b84aaf2ee
-DIST proto-plus-1.19.9.gh.tar.gz 64845 BLAKE2B 82f6021b912140c49e8625c51050a384f8375a3619a78537f6aadded03ce7524687e8f118cd4081c9a8376b3756c608ed781cac9808fb2c8d0bad9e32d2063ec SHA512 671dad31faf33a81bc90d98ffac599b51930f1f4f17c10c9a1dd5f242b3c55d04b9e59080197cdd42c1c430a72e1e812aadafbcf20cfb5da2fcd17c20e5a69e3
 DIST proto-plus-1.20.0.gh.tar.gz 65648 BLAKE2B 19cfcfde913896de83d17c36bacd7799a9f28ea20c4681266b2194c6521aef116f6a594df8be8912bdf55558d84a0ab09d283ec444ba114592ebb7017db257fe SHA512 1e399bc0ac686f33242c1d15c15255ec1815e94eaf87de03e5145cc6ed249048c3b8af081b70964cb7b6baf8286f6be2f461c3638331a2269a5b2d89976ffa6a
+DIST proto-plus-1.20.1.gh.tar.gz 66180 BLAKE2B ee0299c8e9c9882ce417f6f885df18cd833dfbad80e0e92ca4e589eea794b0b00577d4c01fa69790f97f31d8bdfd20f07f4c7601bdf6ee28a7427f0e56714eb4 SHA512 12d9f76230d592c68083421bbb40c4b57741545c238227a743c275820a4d7ae53ea45d7ae5e73495b14736a95aa96250e243220f8b9bb5c988c12a2f84f654d6
diff --git a/dev-python/proto-plus/proto-plus-1.19.2.ebuild b/dev-python/proto-plus/proto-plus-1.19.2.ebuild
deleted file mode 100644
index 28decb0df0f7..000000000000
--- a/dev-python/proto-plus/proto-plus-1.19.2.ebuild
+++ /dev/null
@@ -1,34 +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
-
-DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
-SRC_URI="
-	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/proto-plus/proto-plus-1.19.7.ebuild b/dev-python/proto-plus/proto-plus-1.19.7.ebuild
deleted file mode 100644
index 28decb0df0f7..000000000000
--- a/dev-python/proto-plus/proto-plus-1.19.7.ebuild
+++ /dev/null
@@ -1,34 +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
-
-DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
-SRC_URI="
-	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/proto-plus/proto-plus-1.19.8.ebuild b/dev-python/proto-plus/proto-plus-1.19.8.ebuild
deleted file mode 100644
index 28decb0df0f7..000000000000
--- a/dev-python/proto-plus/proto-plus-1.19.8.ebuild
+++ /dev/null
@@ -1,34 +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
-
-DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
-SRC_URI="
-	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/proto-plus/proto-plus-1.19.9.ebuild b/dev-python/proto-plus/proto-plus-1.20.1.ebuild
index 606dc306b5e0..606dc306b5e0 100644
--- a/dev-python/proto-plus/proto-plus-1.19.9.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.1.ebuild
diff --git a/dev-python/pygame/pygame-9999.ebuild b/dev-python/pygame/pygame-2.1.2-r1.ebuild
index 0eea56b76a01..5b6978d9e7fe 100644
--- a/dev-python/pygame/pygame-9999.ebuild
+++ b/dev-python/pygame/pygame-2.1.2-r1.ebuild
@@ -1,33 +1,38 @@
-# 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 git-r3
+inherit distutils-r1
 
 DESCRIPTION="Python bindings for SDL multimedia library"
 HOMEPAGE="https://www.pygame.org/"
-EGIT_REPO_URI="https://github.com/pygame/pygame.git"
+SRC_URI="
+	https://github.com/pygame/pygame/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc examples midi opengl test X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libpng:0=
 	>=media-libs/sdl2-image-1.2.2
 	>=media-libs/sdl2-mixer-1.2.4
 	>=media-libs/sdl2-ttf-2.0.6
 	>=media-libs/smpeg2-0.4.4-r1
+	virtual/jpeg
 	midi? ( media-libs/portmidi )
 	X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] )
 	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
 DEPEND="${RDEPEND}
 	test? (
-		media-libs/sdl2-image[gif,jpeg,png]
+		media-libs/sdl2-image[gif,jpeg,png,tiff]
 		media-libs/sdl2-mixer[mp3,vorbis,wav]
 	)"
 # fontconfig used for fc-list
@@ -40,6 +45,13 @@ BDEPEND="
 		sys-apps/util-linux
 	)"
 
+src_prepare() {
+	if ! use midi; then
+		rm test/midi_test.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
 python_configure() {
 	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
 		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
@@ -51,27 +63,20 @@ python_configure() {
 }
 
 python_test() {
-	local -x PYTHONPATH=
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
 	local -x SDL_VIDEODRIVER=dummy
 	local -x SDL_AUDIODRIVER=disk
-	distutils_install_for_testing
-	script -eqc "${EPYTHON} -m pygame.tests" || die
+	script -eqc "${EPYTHON} -m pygame.tests -v" || die
 }
 
 python_install() {
 	distutils-r1_python_install
 
 	# Bug #497720
-	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
 	use examples && dodoc -r examples
 }
diff --git a/dev-python/pygame/pygame-2.1.2.ebuild b/dev-python/pygame/pygame-2.1.2.ebuild
index c23ccddd20ef..c280f5c21c2c 100644
--- a/dev-python/pygame/pygame-2.1.2.ebuild
+++ b/dev-python/pygame/pygame-2.1.2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
 DEPEND="${RDEPEND}
 	test? (
-		media-libs/sdl2-image[gif,jpeg,png]
+		media-libs/sdl2-image[gif,jpeg,png,tiff]
 		media-libs/sdl2-mixer[mp3,vorbis,wav]
 	)"
 # fontconfig used for fc-list
@@ -65,7 +65,7 @@ python_test() {
 	local -x SDL_VIDEODRIVER=dummy
 	local -x SDL_AUDIODRIVER=disk
 	distutils_install_for_testing --via-root
-	script -eqc "${EPYTHON} -m pygame.tests" || die
+	script -eqc "${EPYTHON} -m pygame.tests -v" || die
 }
 
 python_install() {
diff --git a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch b/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
new file mode 100644
index 000000000000..a01806fbc8c1
--- /dev/null
+++ b/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
@@ -0,0 +1,21 @@
+diff --git a/setup.py b/setup.py
+index a8122d3..c7bfe82 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,10 +36,12 @@ setup(
+     extras_require={
+         'cli': ['click>=5.0', ],
+     },
+-    entry_points='''
+-        [console_scripts]
+-        dotenv=dotenv.cli:cli
+-    ''',
++    entry_points={
++        "console_scripts": [
++            "dotenv=dotenv.cli:cli",
++            "python-dotenv=dotenv.cli:cli",
++        ],
++    },
+     license='BSD-3-Clause',
+     classifiers=[
+         'Development Status :: 5 - Production/Stable',
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.2-r1.ebuild
index 6074da794b86..aa0decdb356b 100644
--- a/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.19.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,11 @@ DEPEND="
 DOCS=( CHANGELOG.md README.md )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.0-second-entrypoint.patch  # bug 798648
+	# rename the entry point (note: old name is needed in tests)
+	# https://bugs.gentoo.org/798648
+	# also fix syntax since it doesn't seem to work anymore
+	# https://bugs.gentoo.org/833389
+	"${FILESDIR}"/python-dotenv-0.19.2-entry-points.patch
 )
 
 distutils_enable_tests --install pytest
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
new file mode 100644
index 000000000000..34366d2ca700
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
@@ -0,0 +1,44 @@
+# 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="Manage .env files"
+HOMEPAGE="https://github.com/theskumar/python-dotenv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	test? (
+		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGELOG.md README.md )
+
+PATCHES=(
+	# rename the entry point (note: old name is needed in tests)
+	# https://bugs.gentoo.org/798648
+	# also fix syntax since it doesn't seem to work anymore
+	# https://bugs.gentoo.org/833389
+	"${FILESDIR}"/python-dotenv-0.19.2-entry-points.patch
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid collision with dev-ruby/dotenv (bug #798648)
+	rm "${D}"/usr/bin/dotenv || die
+}