commit:     1e13cb1943bd0aa843bee89edd08644bfa56865e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  1 13:35:31 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 13:35:49 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e13cb19

dev-python/protobuf: Revert incorrect namespace backport from 6.x

Upstream changed the way namespaces are installed in 6.x, but 5.x
still uses the deprecated `namespace_packages=` key.  Revert
the `__init__.py` removal to fix installing packages and reenable
the old eclass logic.

Bug: https://bugs.gentoo.org/956779
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{protobuf-5.29.4-r1.ebuild => protobuf-5.29.4-r2.ebuild}       | 7 -------
 .../protobuf/{protobuf-5.29.5.ebuild => protobuf-5.29.5-r1.ebuild} | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/dev-python/protobuf/protobuf-5.29.4-r1.ebuild 
b/dev-python/protobuf/protobuf-5.29.4-r2.ebuild
similarity index 88%
rename from dev-python/protobuf/protobuf-5.29.4-r1.ebuild
rename to dev-python/protobuf/protobuf-5.29.4-r2.ebuild
index 590c6fa1c266..c7bb73fae092 100644
--- a/dev-python/protobuf/protobuf-5.29.4-r1.ebuild
+++ b/dev-python/protobuf/protobuf-5.29.4-r2.ebuild
@@ -27,10 +27,3 @@ 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-5.29.5.ebuild 
b/dev-python/protobuf/protobuf-5.29.5-r1.ebuild
similarity index 88%
rename from dev-python/protobuf/protobuf-5.29.5.ebuild
rename to dev-python/protobuf/protobuf-5.29.5-r1.ebuild
index 116324351ddf..80ade606cf1f 100644
--- a/dev-python/protobuf/protobuf-5.29.5.ebuild
+++ b/dev-python/protobuf/protobuf-5.29.5-r1.ebuild
@@ -27,10 +27,3 @@ 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
-}

Reply via email to