From 1d1fa5bb30df70070bbbbd2b777b839d31f09c41 Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Tue, 12 Apr 2022 13:55:10 +0000
Subject: Adding metadata

---
 .../google-api-core-2.7.1-r1.ebuild                | 66 +++++++++++++++++++++
 dev-python/google-auth/Manifest                    |  3 -
 dev-python/google-auth/google-auth-2.3.3-r1.ebuild | 56 ------------------
 dev-python/google-auth/google-auth-2.4.0.ebuild    | 55 ------------------
 dev-python/google-auth/google-auth-2.5.0.ebuild    | 55 ------------------
 dev-python/google-auth/google-auth-2.6.3-r1.ebuild | 57 ++++++++++++++++++
 .../googleapis-common-protos-1.56.0-r1.ebuild      | 28 +++++++++
 dev-python/gpep517/Manifest                        |  1 +
 dev-python/gpep517/gpep517-3.ebuild                | 44 ++++++++++++++
 .../protobuf-python-3.19.3-r1.ebuild               | 67 ++++++++++++++++++++++
 .../protobuf-python/protobuf-python-9999.ebuild    | 45 ++++++++-------
 dev-python/python-lsp-black/Manifest               |  2 -
 .../python-lsp-black/python-lsp-black-1.0.1.ebuild | 23 --------
 .../python-lsp-black/python-lsp-black-1.1.0.ebuild | 29 ----------
 14 files changed, 287 insertions(+), 244 deletions(-)
 create mode 100644 dev-python/google-api-core/google-api-core-2.7.1-r1.ebuild
 delete mode 100644 dev-python/google-auth/google-auth-2.3.3-r1.ebuild
 delete mode 100644 dev-python/google-auth/google-auth-2.4.0.ebuild
 delete mode 100644 dev-python/google-auth/google-auth-2.5.0.ebuild
 create mode 100644 dev-python/google-auth/google-auth-2.6.3-r1.ebuild
 create mode 100644 dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild
 create mode 100644 dev-python/gpep517/gpep517-3.ebuild
 create mode 100644 dev-python/protobuf-python/protobuf-python-3.19.3-r1.ebuild
 delete mode 100644 dev-python/python-lsp-black/python-lsp-black-1.0.1.ebuild
 delete mode 100644 dev-python/python-lsp-black/python-lsp-black-1.1.0.ebuild

(limited to 'dev-python')

diff --git a/dev-python/google-api-core/google-api-core-2.7.1-r1.ebuild b/dev-python/google-api-core/google-api-core-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..950217af5a31
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.7.1-r1.ebuild
@@ -0,0 +1,66 @@
+# 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="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+"
+# grpcio support is broken if grpcio-status is not installed,
+# and we do not package the latter
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::Test_StreamingResponseIterator::test___next___w_rpc_error
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+	# TODO
+	tests/unit/test_operation.py::test_exception_with_error_code
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace google
+	cd "${T}" || die
+	epytest -p no:aiohttp -p no:trio "${S}/tests"
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 3e3c29564f14..62a3223fc179 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,6 +1,3 @@
-DIST google-auth-2.3.3.tar.gz 186600 BLAKE2B 52b1269b88d27fafafcb053219c93c7f180cac11cdf32b140531553dda547d02087b0418d44edc6497eb37793859d86d4beaad1a7a128c86839202785584c9ab SHA512 3ab6d97e71988ef5e338e0a643545f8fa504f5ea04f4176afd9417ecf0e9a3fa45333f0c2c7ea5bf32423df32c48ec59ac9d16ef8bfc35a1aa4c0fcc114fef63
-DIST google-auth-2.4.0.tar.gz 188032 BLAKE2B 27cd5a9fec2a0f98e26e4c5cfada446f9561834d8471a91bcab54b2965231ecf9d40d8d6d4240355adf0da5ffc9533ce745940a9d9eaca3fd97ed8c759e55939 SHA512 bb107b4dcf556e98f2a994d9baf10492d249b679d92c26bd96c79764d886bfb001940ac168ff0932456af15e4f2de38edc62d7c9beecadafad5e6350b13e0d95
-DIST google-auth-2.5.0.tar.gz 189396 BLAKE2B 85b6cccf46acaa15ebc58b0cc4ea906c405e8f5e1f9d5c67c1790105689bba47e9f57355751a31a051ec6f20f828e2e2d0d9e792afc5d877791deab8a3e18503 SHA512 7323f253789364d14c1c1adf148cbfff2abceec06c539e93c8f5ae4a5ee978838480f9923e3d62988d903a239434257f980ec1095a8cedc678e263d0adff6cce
 DIST google-auth-2.6.0.tar.gz 188477 BLAKE2B 19baf9ec41e2b8667b8800687f4920d0e53df6cbfd17830e352f808b1438b21d952a4480f3b0fbc8e83dd215c0cd49b393f4798952eea1eb808b5417d578af85 SHA512 160fae0afcebd62dc0d46bf5e1102be34c6084cf188941105facd00b4a9b2bf6b36b58623e84595111849af0cb16b4f4a09b1e13ce095be025831fa4e7241b4c
 DIST google-auth-2.6.2.tar.gz 189490 BLAKE2B 5506b4d316a40274cd8ce0cea8c6a76b882e14f4f7e28f5a50e67c8828353d3078f713f874e36ba4c81537228325cf19c7ea1c3040b04d4b6338e456a8622024 SHA512 196bcec8f90ddc7ba95f03576f496aab38526c2305d729db806f07c0b44e578c6bfcb3a79224f4edaacb8760a3c7bb17a0af90cb2986aff3fdc5f767328fb247
 DIST google-auth-2.6.3.tar.gz 189685 BLAKE2B 68718ce4031c4e764dcfec19361b034ed5e1efa602d5c734b61a853020f40aaa856f9d9a3b964470e148fbfcb081dbc7d2c8bf0a53fc843d9360dbc72623bcdf SHA512 cba3228dbc0887c127d50cc45eb134e3a0b2bea044b8a1e65807918a3808e550fd58217a236c07b6cb908e5a080d9c1c1a2e9ee1853968d8c0bd50b7228ea262
diff --git a/dev-python/google-auth/google-auth-2.3.3-r1.ebuild b/dev-python/google-auth/google-auth-2.3.3-r1.ebuild
deleted file mode 100644
index 601eed826a74..000000000000
--- a/dev-python/google-auth/google-auth-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-5.0.0[${PYTHON_USEDEP}]
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.4.0.ebuild b/dev-python/google-auth/google-auth-2.4.0.ebuild
deleted file mode 100644
index 5a0eb420db41..000000000000
--- a/dev-python/google-auth/google-auth-2.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.5.0.ebuild b/dev-python/google-auth/google-auth-2.5.0.ebuild
deleted file mode 100644
index 5a0eb420db41..000000000000
--- a/dev-python/google-auth/google-auth-2.5.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.6.3-r1.ebuild b/dev-python/google-auth/google-auth-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..c685c7ed35a5
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.6.3-r1.ebuild
@@ -0,0 +1,57 @@
+# 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 Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild
new file mode 100644
index 000000000000..bf96252f2210
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r1.ebuild
@@ -0,0 +1,28 @@
+# 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="python classes generated from the common protos in the googleapis repository"
+HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/protobuf-python-3.12.0[${PYTHON_USEDEP}]
+"
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+# no tests as this is all generated code
diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index da0085de5540..16cc2c5fb292 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1 +1,2 @@
 DIST gpep517-2.gh.tar.gz 6904 BLAKE2B 5d6f8c02805fec0b9c9929a133817be5d06c76ca2dd5ecd6b59d04eca1ca746b2a63a84df29c929ca06a026eef741a2d872abede6f1d0ac3719ff2005cf20043 SHA512 2b1fce7193a5c03175c34251987f42fe82c79a6eef324759fe5728e0f3b66a10f8aa644ece2193c912e9977f21b14a28fe5c9443e3b01ca8cdacf862afe0838c
+DIST gpep517-3.gh.tar.gz 7074 BLAKE2B 99a499ae13b6aac41e86d11735f0e49a5dc921881a1efa94bee19bfd779af6827707d05d6407ed15e4a3a6b518c8c0b3f50901e3b12df41081930f83b288e461 SHA512 90f756f5a1d783e9d402e098162a70b363a0a81e331e810e5c89c3302bb5839032603252bad1c98c176a7828b70adfac967e39ba455dcd3a20097e74923980c8
diff --git a/dev-python/gpep517/gpep517-3.ebuild b/dev-python/gpep517/gpep517-3.ebuild
new file mode 100644
index 000000000000..2495c732f866
--- /dev/null
+++ b/dev-python/gpep517/gpep517-3.ebuild
@@ -0,0 +1,44 @@
+# 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_SETUPTOOLS=manual
+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"
+
+RDEPEND="
+	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+# do not use any build system to avoid circular deps
+python_compile() { :; }
+
+python_install() {
+	python_domodule gpep517
+	python_newscript - gpep517 <<-EOF
+		#!/usr/bin/python
+		import sys
+		from gpep517.__main__ import main
+		sys.exit(main())
+	EOF
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.19.3-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.3-r1.ebuild
new file mode 100644
index 000000000000..153fe4a06533
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.19.3-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2008-2022 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
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://github.com/protocolbuffers/protobuf/
+"
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz
+			-> protobuf-${PV}.tar.gz
+	"
+fi
+S="${WORKDIR}/protobuf-${PV}/python"
+
+LICENSE="BSD"
+SLOT="0/30"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+"
+RDEPEND="${BDEPEND}"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=(--cpp_implementation)
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index 1214f5495123..94ef5c83a9f0 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 2008-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} )
 
 inherit distutils-r1
@@ -14,32 +15,39 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://github.com/protocolbuffers/protobuf/
+"
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz
+			-> protobuf-${PV}.tar.gz
+	"
 fi
+S="${WORKDIR}/protobuf-${PV}/python"
 
 LICENSE="BSD"
 SLOT="0/30"
 KEYWORDS=""
-IUSE=""
 
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
+	${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+"
 RDEPEND="${BDEPEND}"
 
-S="${WORKDIR}/protobuf-${PV}/python"
-
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 fi
 
+distutils_enable_tests setup.py
+
 python_prepare_all() {
 	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
 	eapply_user
@@ -48,16 +56,11 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_test() {
-	esetup.py test
+src_configure() {
+	DISTUTILS_ARGS=(--cpp_implementation)
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
-
 	find "${ED}" -name "*.pth" -type f -delete || die
 }
diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest
index 564368dd1d3b..c5610989d9b9 100644
--- a/dev-python/python-lsp-black/Manifest
+++ b/dev-python/python-lsp-black/Manifest
@@ -1,3 +1 @@
-DIST python-lsp-black-1.0.1.gh.tar.gz 7013 BLAKE2B 596ef3f468524269fb2765ad7ba0f8305c9e67ec4cf826dbe68ea20058f1fc595c004b34c5228c14a70b6a489e29f370fef93cd7a9ef48d24ace3464ec7cd011 SHA512 43699438bf64b9cfb5dfa97b30385870a06d15be90d5a023c5282f1b969188e8536961c2a2ee6f1016d4b8188e4df6a81d6127dd628242bbcd3fbcc640504a24
-DIST python-lsp-black-1.1.0.gh.tar.gz 7547 BLAKE2B e362e3800763b28c9505e9548f2324299fac5db792cc98755b2f3e5db02cec3cf0061193aa5dda40a843f2db0abfc252b8ebf6ae12a403953bb334155e90b028 SHA512 47c1652e7c1732a01d0eaa29c3b36adaa484b4b61aed8f6a99967c734d43353173716946cd15ea247974ee7801daa57e34979f5ed9b52eb88fdf96830af8bd19
 DIST python-lsp-black-1.2.0.gh.tar.gz 9226 BLAKE2B a9efe698c32ac86060f360e1d1129620783d0dd1588cf16b6f96a4f805845d5c94e862b265d63643e877afc68916ad0fbbe922fc0c17e224ea08f61756a3fb41 SHA512 b5f999b0e02abc63dc194a2973f028aa5f74b3110d0ac35e6aefb45a4260bf3fb5b1f142f71a85feec431765af98409977a47039d28a79cfac5746cc677794c7
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.0.1.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.0.1.ebuild
deleted file mode 100644
index dc06aefd17eb..000000000000
--- a/dev-python/python-lsp-black/python-lsp-black-1.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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} )
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python LSP Server"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-black
-	https://pypi.org/project/python-lsp-black/"
-SRC_URI="https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/python-lsp-server[${PYTHON_USEDEP}]
-	>=dev-python/black-19[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.1.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.1.0.ebuild
deleted file mode 100644
index 38163b5aa666..000000000000
--- a/dev-python/python-lsp-black/python-lsp-black-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python LSP Server"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-black
-	https://pypi.org/project/python-lsp-black/"
-SRC_URI="https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/python-lsp-server[${PYTHON_USEDEP}]
-	>=dev-python/black-19[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/toml[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-- 
cgit v1.3.1