commit:     94275ca6b1ad818669356be3ce1a00793a5152d7
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sat Dec 13 05:25:13 2025 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Sat Dec 13 05:25:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=94275ca6

dev-libs/nanopb: requires matching protobuf versions at runtime

- nanopb generator requires matching protobuf versions at runtime
- requires dev-python/protobuf (not support python3_13t)
- enable py3.14 and disable python3_13t

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 dev-libs/nanopb/nanopb-0.4.9.1.ebuild | 15 +++++++++++++--
 dev-libs/nanopb/nanopb-9999.ebuild    | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/dev-libs/nanopb/nanopb-0.4.9.1.ebuild 
b/dev-libs/nanopb/nanopb-0.4.9.1.ebuild
index b6b86cc205..ba8a4cc495 100644
--- a/dev-libs/nanopb/nanopb-0.4.9.1.ebuild
+++ b/dev-libs/nanopb/nanopb-0.4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..13} python3_13t )
+PYTHON_COMPAT=( python3_{11..14} )
 
 inherit cmake flag-o-matic python-single-r1
 
@@ -23,9 +23,20 @@ IUSE="+pb-malloc static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# nanopb generator requires matching protobuf versions at runtime
+# dev-libs/protobuf-29.x requires dev-python/protobuf-5.29.x
+# dev-libs/protobuf-3X.Y requires dev-python/protobuf-6.3X.Y
 RDEPEND="
-       dev-libs/protobuf
        ${PYTHON_DEPS}
+       $(python_gen_cond_dep '
+               || (
+                       ( =dev-libs/protobuf-29* 
=dev-python/protobuf-5*[${PYTHON_USEDEP}] )
+                       ( =dev-libs/protobuf-30* 
=dev-python/protobuf-6.30*[${PYTHON_USEDEP}] )
+                       ( =dev-libs/protobuf-31* 
=dev-python/protobuf-6.31*[${PYTHON_USEDEP}] )
+                       ( =dev-libs/protobuf-32* 
=dev-python/protobuf-6.32*[${PYTHON_USEDEP}] )
+                       ( =dev-libs/protobuf-33* 
=dev-python/protobuf-6.33*[${PYTHON_USEDEP}] )
+               )
+       ')
 "
 
 DEPEND="

diff --git a/dev-libs/nanopb/nanopb-9999.ebuild 
b/dev-libs/nanopb/nanopb-9999.ebuild
index 2b92abfa41..d95000646d 100644
--- a/dev-libs/nanopb/nanopb-9999.ebuild
+++ b/dev-libs/nanopb/nanopb-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..13} python3_13t )
+PYTHON_COMPAT=( python3_{11..14} )
 
 inherit cmake flag-o-matic python-single-r1
 
@@ -23,9 +23,20 @@ IUSE="+pb-malloc static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# nanopb generator requires matching protobuf versions at runtime
+# dev-libs/protobuf-29.x requires dev-python/protobuf-5.29.x
+# dev-libs/protobuf-3X.Y requires dev-python/protobuf-6.3X.Y
 RDEPEND="
-       dev-libs/protobuf
        ${PYTHON_DEPS}
+       $(python_gen_cond_dep '
+               || (
+                       ( =dev-libs/protobuf-29* 
=dev-python/protobuf-5*[${PYTHON_USEDEP}] )
+                       ( =dev-libs/protobuf-30* 
=dev-python/protobuf-6.30*[${PYTHON_USEDEP}] )
+                       ( =dev-libs/protobuf-31* 
=dev-python/protobuf-6.31*[${PYTHON_USEDEP}] )
+                       ( =dev-libs/protobuf-32* 
=dev-python/protobuf-6.32*[${PYTHON_USEDEP}] )
+                       ( =dev-libs/protobuf-33* 
=dev-python/protobuf-6.33*[${PYTHON_USEDEP}] )
+               )
+       ')
 "
 
 DEPEND="

Reply via email to