From 1e13cb1943bd0aa843bee89edd08644bfa56865e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 1 Jun 2025 15:35:31 +0200 Subject: [PATCH] dev-python/protobuf: Revert incorrect namespace backport from 6.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- ...protobuf-5.29.4-r1.ebuild => protobuf-5.29.4-r2.ebuild} | 7 ------- .../{protobuf-5.29.5.ebuild => protobuf-5.29.5-r1.ebuild} | 7 ------- 2 files changed, 14 deletions(-) rename dev-python/protobuf/{protobuf-5.29.4-r1.ebuild => protobuf-5.29.4-r2.ebuild} (88%) rename dev-python/protobuf/{protobuf-5.29.5.ebuild => protobuf-5.29.5-r1.ebuild} (88%) 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 590c6fa1c2666..c7bb73fae0922 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 116324351ddfc..80ade606cf1f8 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 -}