commit: 45b43fa10756c3f2583494d6e771f387c358a2b2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Tue Feb 18 19:36:38 2025 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Tue Feb 18 19:37:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b43fa1
dev-ada/langkit-contrib: Fix build due to e3 & AdaSAT Closes: https://bugs.gentoo.org/949820 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ada/langkit-contrib/Manifest | 1 + ...25.0.0.ebuild => langkit-contrib-25.0.0-r1.ebuild} | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dev-ada/langkit-contrib/Manifest b/dev-ada/langkit-contrib/Manifest index bd8784fd9dfc..484d9831676f 100644 --- a/dev-ada/langkit-contrib/Manifest +++ b/dev-ada/langkit-contrib/Manifest @@ -1 +1,2 @@ +DIST AdaSAT-25.0.0.tar.gz 30707 BLAKE2B 7256fa3db93273657d52b7b895e51efa95c102753efbe498d283ef33a6bed067ddf2975e72a357483aa67b5ce7d8073d4a192e9a4741ab204ce159ec0f57b529 SHA512 7781a683c5aef9efa9a6b57e82070184c02d734fcf448aa5aa79d9aaa3b40d181d87d7487d9c204f7dcd584a3d2dc1c9ebc027e82b2532c3418c25a2395fd9af DIST langkit-25.0.0.tar.gz 1560623 BLAKE2B ef03755397e85fde9b968dced7cf6bc72e85c21b6baef41160e527840caf32e0ea573d52f66c4b82ce9fa7e2dd0120286e06a3f3525e0acad5f9f11037be29b9 SHA512 27ffecb9b6c5568ebdba4864d9c5ef7e511718083fe087e3af60cfe8cc994b6ea7353cc745bc33395d33e169aaaf6916d991fa4941774932904df3e9b455f1dc diff --git a/dev-ada/langkit-contrib/langkit-contrib-25.0.0.ebuild b/dev-ada/langkit-contrib/langkit-contrib-25.0.0-r1.ebuild similarity index 88% rename from dev-ada/langkit-contrib/langkit-contrib-25.0.0.ebuild rename to dev-ada/langkit-contrib/langkit-contrib-25.0.0-r1.ebuild index 5989b4b34583..f591a7b0a5b7 100644 --- a/dev-ada/langkit-contrib/langkit-contrib-25.0.0.ebuild +++ b/dev-ada/langkit-contrib/langkit-contrib-25.0.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{11..13} ) +PYTHON_COMPAT=( python3_{11..12} ) ADA_COMPAT=( gcc_12 gcc_13 gcc_14 ) DISTUTILS_USE_PEP517=setuptools @@ -12,7 +12,9 @@ inherit python-single-r1 ada multiprocessing DESCRIPTION="A Python framework to generate language parsers - Contrib" HOMEPAGE="https://www.adacore.com/community"; SRC_URI="https://github.com/AdaCore/langkit/archive/refs/tags/v${PV}.tar.gz - -> langkit-${PV}.tar.gz" + -> langkit-${PV}.tar.gz + https://github.com/AdaCore/AdaSAT/archive/refs/tags/v${PV}.tar.gz + -> AdaSAT-${PV}.tar.gz" S="${WORKDIR}"/langkit-${PV} @@ -32,6 +34,10 @@ RDEPEND="${PYTHON_DEPS} dev-ada/langkit[${PYTHON_USEDEP}] ')" BDEPEND="${RDEPEND} + dev-ada/e3-core + $(python_gen_cond_dep ' + dev-ada/e3-core[${PYTHON_USEDEP}] + ') dev-ada/gprbuild[${ADA_USEDEP}]" pkg_setup() { @@ -40,10 +46,11 @@ pkg_setup() { } src_configure() { - cd contrib/python - ${EPYTHON} manage.py generate -P --disable-warning undocumented-nodes - cd ../lkt - ${EPYTHON} manage.py generate -P + export GPR_PROJECT_PATH="${WORKDIR}"/AdaSAT-${PV} + cd contrib/python || die + ${EPYTHON} manage.py generate -P --disable-warning undocumented-nodes || die + cd ../lkt || die + ${EPYTHON} manage.py generate -P || die } src_compile() {
