From 6c318905ea87b746e0167bf853d85d00dc4d2a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Thu, 29 May 2025 08:35:36 +0200
Subject: [PATCH] dev-python/protobuf: Strip explicit namespaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/956779
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 ...{protobuf-5.29.4.ebuild => protobuf-5.29.4-r1.ebuild} | 9 ++++++++-
 ...{protobuf-6.30.2.ebuild => protobuf-6.30.2-r1.ebuild} | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)
 rename dev-python/protobuf/{protobuf-5.29.4.ebuild => protobuf-5.29.4-r1.ebuild} (84%)
 rename dev-python/protobuf/{protobuf-6.30.2.ebuild => protobuf-6.30.2-r1.ebuild} (84%)

diff --git a/dev-python/protobuf/protobuf-5.29.4.ebuild b/dev-python/protobuf/protobuf-5.29.4-r1.ebuild
similarity index 84%
rename from dev-python/protobuf/protobuf-5.29.4.ebuild
rename to dev-python/protobuf/protobuf-5.29.4-r1.ebuild
index 657632c70b3d2..590c6fa1c2666 100644
--- a/dev-python/protobuf/protobuf-5.29.4.ebuild
+++ b/dev-python/protobuf/protobuf-5.29.4-r1.ebuild
@@ -8,7 +8,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 PYPI_PN="protobuf"
 
 inherit distutils-r1 pypi
@@ -27,3 +27,10 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-3)"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip old-style namespace
+	rm google/__init__.py || die
+}
diff --git a/dev-python/protobuf/protobuf-6.30.2.ebuild b/dev-python/protobuf/protobuf-6.30.2-r1.ebuild
similarity index 84%
rename from dev-python/protobuf/protobuf-6.30.2.ebuild
rename to dev-python/protobuf/protobuf-6.30.2-r1.ebuild
index 657632c70b3d2..590c6fa1c2666 100644
--- a/dev-python/protobuf/protobuf-6.30.2.ebuild
+++ b/dev-python/protobuf/protobuf-6.30.2-r1.ebuild
@@ -8,7 +8,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 PYPI_PN="protobuf"
 
 inherit distutils-r1 pypi
@@ -27,3 +27,10 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-3)"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip old-style namespace
+	rm google/__init__.py || die
+}