gentoo resync : 16.04.2022

3 files changed, 93 insertions, 22 deletions

diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index eeee626c72ee..edba0f614a01 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -3,6 +3,7 @@ AUX protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patc
 DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
 EBUILD protobuf-python-3.19.1.ebuild 1316 BLAKE2B bbe5716cf480132506b3764849c1f89b00e5fe55c20ee526068989d35b581e1897eb3d67807fd6502590baff044e341630d6e185c630a7622616bdcda5687486 SHA512 47c81eda428c26a326618082aafe22b86e2f9efe8a81efbf78a03bfd874bcc4ed6d53c75332d4b82b82d14440d533143f6ca95a1e98f2bdb032a60eff0a6e806
+EBUILD protobuf-python-3.19.3-r1.ebuild 1494 BLAKE2B 2323f619de22a834601af6b848f7aaaeaecf8be44382e6c07b0002cf586d2933175ef1c37904a9c8e8a77c44ec1cf56cf1e8374e3fe30a41eab660d26a2dc5cc SHA512 4ee32a5df565b3252f12bd67cf198850001d9d770ed32c58298f22f08e63595091a3f1ba46501b7392ad53a58d3408c6b44a2cff68b0384f164bd8ff518cd5b7
 EBUILD protobuf-python-3.19.3.ebuild 1558 BLAKE2B c518816f05766547a6a6d51d8e63998316bd8a1b06168e2174526b7068fa0c8d77f86fadad614917ea451c93038428f2a85fa6b3fb2148c19cd357216f682bae SHA512 29a8e3b48a88578af46c3fcfd2e9402100ca04b30c5e850e986ff14e924619a3f865fa84c17d44536389979328b1299e28bd3a605481fa88ba534cd6586b64f8
-EBUILD protobuf-python-9999.ebuild 1361 BLAKE2B 3eff9b195b3b375f4208a634c70bc900b12af2563aba12248c288e463ca9e35246ea88c2303cd0e3f08e18a21bd8800fdc9e4456cde35d3934bce9c384eca685 SHA512 60996706e6895fe4e1cb107f4d2e506bd0d3a026a84466ae6a3a2d28beeb6d03001274e8e02f304b490d93d442f2c74bf3383c42a5d66c88341cd7223081477f
+EBUILD protobuf-python-9999.ebuild 1295 BLAKE2B e65e4dd49f95055d23b41d2dfca4875cd832fd403299bcd0b8119145403cd9dca2d6de33b3f7ced611e71423558637cd2f346bb9970ae005f9b86cc5d3ba6bf2 SHA512 ddaa6bbbe2804cfba415bc5e93cf62733895b19b435d04d8c9102264b96c0533afe7567df199676b1a1b923c77de28d055400a1bd95af3884e2316edd65859cc
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
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..e29ffa1c55e7
--- /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_{8..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 6eb7e579382a..34d32b251ad3 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_{8..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
 }