dev-python/protobuf-python: add 4.22.0, update 3.20.1

Signed-off-by: Andreas Billmeier <b@edevau.net>

dev-python/protobuf-python/Manifest

@@ -1,3 +1,5 @@
-DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
-EBUILD protobuf-python-3.20.1.ebuild 1360 BLAKE2B b565e3296a77169cef2d872de81588d20b282890d4929a78e67f5816243e41d6cd6c9ee7d638a9cca26b31f8a761702f5946ad39f1a617e982ed497c650e6359 SHA512 393a90e7f08315480a9dc3c4d86135f87ca2044f88a4339453e8e9ef66688f7edec7f58d3a6fb13f6f691f704eb0ca8f6746e7509a1622aadf5bb87010de0e36
-MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
+DIST protobuf-22.0.gh.tar.gz 4920528 BLAKE2B 4d1c17a7245e81803c9a4bf8742b69f97ebdc93d8aac60487ba347193708e96d4fba2bd0467fbadca79df6db80202cd32631b013c9165832b9cc12460e5e7504 SHA512 76c833d958341f690b2c4e2ae48d2e47642941e378bca0086f9e46c7745458cce4c31999fe72cc919c7f78aba6fbd708f35417c17fde3a0a85c5240bb4654a14
+DIST protobuf-3.20.1.gh.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
+EBUILD protobuf-python-3.20.1.ebuild 1244 BLAKE2B 59e44fabab11f8678839b980ce461781aca3318f5bcf3669751850bb4015883a7f99f252cd2c6c4bddabb76c022d0b24fe434ec6dc59aac4000d4926b043a26a SHA512 a7e2299b0fe2aacabbd141af7690c6854c427ed5e4688fe9a76437cb1c86a7710fd650ac0e33d5520edd82303aee92af13d554e19da5fd64bb9449008f888336
+EBUILD protobuf-python-4.22.0.ebuild 1643 BLAKE2B 1d7e66295597144038241c9418379f5f843ef607d5ab2f5fcf823274bf7b54f4c33b0531dc3db9f95b73e66b2be35c30c2835451837084c748903d3cddbcd17a SHA512 7d89e3e421cc822884a3f48fdd7671cf76f3b7280cf4f06ea5b9382f8d336e1a03adec9f31d97ad5426a305676043609e0d15d0f3824240b176709bfdd56ad8a
+MISC metadata.xml 616 BLAKE2B 35e07d1a7c8aaa8acccc63a692866655a2b81a8329db0eac300d53320aa83953ef6045e0c45882bb4ae1f4873d8d4ee5db2597c7204a24f17884228610cce73a SHA512 e530cdedf530ba032983d8a2b55c163a838685aac4e55616c5a89e11569b60e9371cdd41a31ec863be8a55da29721d01e945aa38ec662d1646c7ffe4c2adc2ed

dev-python/protobuf-python/metadata.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>arfrever.fta@gmail.com</email>
-		<name>Arfrever Frehtes Taifersar Arahesis</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<slots>
-		<subslots>Soname version number of Protobuf</subslots>
-	</slots>
-	<upstream>
-		<remote-id type="github">protocolbuffers/protobuf</remote-id>
-	</upstream>
+  <maintainer type="person" proxied="yes">
+    <email>arfrever.fta@gmail.com</email>
+    <name>Arfrever Frehtes Taifersar Arahesis</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <slots>
+    <subslots>Soname version number of Protobuf</subslots>
+  </slots>
+  <upstream>
+    <remote-id type="github">protocolbuffers/protobuf</remote-id>
+    <remote-id type="pypi">protobuf</remote-id>
+  </upstream>
 </pkgmetadata>

dev-python/protobuf-python/protobuf-python-3.20.1.ebuild

@@ -1,10 +1,10 @@
-# Copyright 2008-2022 Gentoo Authors
+# Copyright 2008-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -24,14 +24,14 @@ HOMEPAGE="
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="
 		https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz
-			-> protobuf-${PV}.tar.gz
+			-> protobuf-${PV}.gh.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"
+KEYWORDS="amd64 arm arm64 x86"
 
 BDEPEND="
 	${PYTHON_DEPS}
@@ -44,7 +44,6 @@ DEPEND="
 "
 RDEPEND="
 	${BDEPEND}
-	!dev-python/namespace-google
 "
 
 if [[ "${PV}" == "9999" ]]; then

dev-python/protobuf-python/protobuf-python-4.22.0.ebuild

@@ -0,0 +1,80 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+PARENT_PN="${PN/-python/}"
+PARENT_PV="$(ver_cut 2-)"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+KEYWORDS="amd64 arm arm64 x86"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://pypi.org/project/protobuf/
+"
+
+LICENSE="BSD"
+SLOT="0/32"
+
+S="${WORKDIR}/${PARENT_P}/python"
+
+BDEPEND="
+"
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+
+distutils_enable_tests setup.py
+
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.20.3-python311.patch
+)
+
+python_prepare_all() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --cpp_implementation )
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
+}