From d5f52f9d3eee5ec13f9d24acdff687d510b87f57 Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 10 Feb 2026 11:53:58 +0100 Subject: [PATCH] dev-embedded/esp-idf-kconfig: fix patch for kconfiglib compatibility Signed-off-by: David Roman --- .../esp-idf-kconfig-2.5.1-r1.ebuild | 26 +++++++++++++++++++ ...-idf-kconfig-2.5.1-rename-kconfiglib.patch | 15 +++++++++++ 2 files changed, 41 insertions(+) create mode 100644 dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.5.1-r1.ebuild diff --git a/dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.5.1-r1.ebuild b/dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.5.1-r1.ebuild new file mode 100644 index 0000000000..1217061923 --- /dev/null +++ b/dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.5.1-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{{11..14},13t} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Kconfig tooling for esp-idf" +HOMEPAGE="https://github.com/espressif/esp-idf-kconfig" + +LICENSE="Apache-2.0" +SLOT="0" + +KEYWORDS="~amd64" + +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${P}-rename-kconfiglib.patch" ) + +src_prepare() { + default + rm -r docs || die +} diff --git a/dev-embedded/esp-idf-kconfig/files/esp-idf-kconfig-2.5.1-rename-kconfiglib.patch b/dev-embedded/esp-idf-kconfig/files/esp-idf-kconfig-2.5.1-rename-kconfiglib.patch index 73ed62e643..416f18f956 100644 --- a/dev-embedded/esp-idf-kconfig/files/esp-idf-kconfig-2.5.1-rename-kconfiglib.patch +++ b/dev-embedded/esp-idf-kconfig/files/esp-idf-kconfig-2.5.1-rename-kconfiglib.patch @@ -1,5 +1,7 @@ # Needed to avoid conflicts with dev-python/kconfiglib # See https://github.com/espressif/esp-idf-kconfig/issues/13 for context +diff --git c/esp_idf_kconfig/gen_kconfig_doc.py w/esp_idf_kconfig/gen_kconfig_doc.py +index 87d0c1a..cb83260 100644 --- c/esp_idf_kconfig/gen_kconfig_doc.py +++ w/esp_idf_kconfig/gen_kconfig_doc.py @@ -11,7 +11,7 @@ @@ -11,12 +13,15 @@ # Indentation to be used in the generated file INDENT = " " +diff --git c/kconfiglib/__init__.py w/espkconfiglib/__init__.py similarity index 100% rename from kconfiglib/__init__.py rename to espkconfiglib/__init__.py +diff --git c/kconfiglib/core.py w/espkconfiglib/core.py similarity index 99% rename from kconfiglib/core.py rename to espkconfiglib/core.py +index 971b53e..cf2a5ec 100644 --- c/kconfiglib/core.py +++ w/espkconfiglib/core.py @@ -2,7 +2,7 @@ @@ -37,9 +42,11 @@ rename to espkconfiglib/core.py parser = Parser(kconfig=self) +diff --git c/kconfiglib/kconfig_grammar.py w/espkconfiglib/kconfig_grammar.py similarity index 99% rename from kconfiglib/kconfig_grammar.py rename to espkconfiglib/kconfig_grammar.py +index d4c8fee..5f00c1f 100644 --- c/kconfiglib/kconfig_grammar.py +++ w/espkconfiglib/kconfig_grammar.py @@ -29,7 +29,7 @@ from pyparsing import one_of @@ -51,9 +58,11 @@ rename to espkconfiglib/kconfig_grammar.py class KconfigBlock(Token): +diff --git c/kconfiglib/kconfig_parser.py w/espkconfiglib/kconfig_parser.py similarity index 99% rename from kconfiglib/kconfig_parser.py rename to espkconfiglib/kconfig_parser.py +index 86e6f7f..4bab061 100644 --- c/kconfiglib/kconfig_parser.py +++ w/espkconfiglib/kconfig_parser.py @@ -17,7 +17,7 @@ from pyparsing import ParseResults @@ -65,6 +74,8 @@ rename to espkconfiglib/kconfig_parser.py from .core import AND from .core import BOOL +diff --git c/kconfgen/core.py w/kconfgen/core.py +index dbcf8c3..37f3205 100755 --- c/kconfgen/core.py +++ w/kconfgen/core.py @@ -27,7 +27,7 @@ from typing import Set @@ -76,6 +87,8 @@ rename to espkconfiglib/kconfig_parser.py from esp_idf_kconfig import __version__ +diff --git c/kconfserver/core.py w/kconfserver/core.py +index fead552..8693663 100644 --- c/kconfserver/core.py +++ w/kconfserver/core.py @@ -13,7 +13,7 @@ import tempfile @@ -87,6 +100,8 @@ rename to espkconfiglib/kconfig_parser.py from esp_idf_kconfig import __version__ # Min/Max supported protocol versions +diff --git c/menuconfig/core.py w/menuconfig/core.py +index 1d71292..2fa6cdd 100755 --- c/menuconfig/core.py +++ w/menuconfig/core.py @@ -2,7 +2,7 @@