* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2017-12-23 20:33 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2017-12-23 20:33 UTC (permalink / raw
To: gentoo-commits
commit: df124d65f1c4eb996e4bff76d9b22f60d49a275f
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 20:32:49 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 20:32:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df124d65
dev-ada/langkit: Add dev-ada/langkit
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-ada/langkit/Manifest | 1 +
dev-ada/langkit/files/langkit-2017-gentoo.patch | 36 ++++++++++++++++++++
dev-ada/langkit/langkit-2017.ebuild | 45 +++++++++++++++++++++++++
dev-ada/langkit/metadata.xml | 18 ++++++++++
4 files changed, 100 insertions(+)
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
new file mode 100644
index 00000000000..e7ad949e03c
--- /dev/null
+++ b/dev-ada/langkit/Manifest
@@ -0,0 +1 @@
+DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
new file mode 100644
index 00000000000..0260d44c888
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch
@@ -0,0 +1,36 @@
+--- langkit-gps-src/langkit/templates/project_file.mako.old 2017-07-11 14:19:12.841221846 +0200
++++ langkit-gps-src/langkit/templates/project_file.mako 2017-07-11 14:12:39.104981170 +0200
+@@ -82,9 +82,11 @@
+ for Default_Switches ("Ada") use
+ Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata");
+
+- for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0");
++ for Default_Switches ("C") use Common_C_Cargs &
++ ("-g3", "-O0", "-fPIC");
+
+- for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0");
++ for Switches ("quex_lexer.c") use Common_C_Cargs &
++ ("-g0", "-O0", "-fPIC");
+ -- This file is *huge* and the debugging information for it harms
+ -- Valgrind runs. We almost never have to debug this file so
+ -- this is acceptable.
+@@ -111,6 +111,7 @@
+ -- ... and this prevents OOM on other platforms
+ end case;
+ end case;
++ for Driver ("C") use External ("GCC", "gcc");
+ end Compiler;
+
+ package Binder is
+--- langkit-gps-src/langkit/compile_context.py.old 2017-12-13 22:12:38.689143125 +0100
++++ langkit-gps-src/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100
+@@ -1171,8 +1171,7 @@
+ # the Quex specification changed from last build.
+ if generate_lexer and self.cache.is_stale('quex_specification',
+ quex_spec):
+- quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py")
+- subprocess.check_call([sys.executable, quex_py_file, "-i",
++ subprocess.check_call(["quex", "-i",
+ quex_file,
+ "-o", "quex_lexer",
+ "--buffer-element-size", "4",
diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild
new file mode 100644
index 00000000000..1d2558ae90d
--- /dev/null
+++ b/dev-ada/langkit/langkit-2017.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+MYPN=${PN}-gps-src
+
+DESCRIPTION="A Python framework to generate language parsers"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
+ -> ${MYPN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ dev-ada/gnatcoll[gnat_2017,iconv]
+ dev-python/mako
+ dev-python/pyyaml
+ dev-python/enum34
+ dev-python/funcy
+ dev-python/docutils
+ dev-python/quex"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYPN}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_test() {
+ testsuite/testsuite.py | grep FAILED && die "Test failed"
+}
+
+src_install() {
+ default
+ python_domodule langkit
+ python_doscript scripts/create-project.py
+}
diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml
new file mode 100644
index 00000000000..bfb9cb6484b
--- /dev/null
+++ b/dev-ada/langkit/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
+ <longdescription lang="en">
+ Langkit (nickname for language kit) is a tool whose purpose is to make
+ it easy to create syntactic and semantic analysis engines. Write a
+ language specification in our Python DSL and Langkit will generate for
+ you an Ada library with bindings for the C and Python programming
+ languages.
+ The generated library is meant to provide a basis to write tooling,
+ including tools working on potentially changing and incorrect code,
+ such as IDEs.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2018-07-04 19:16 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2018-07-04 19:16 UTC (permalink / raw
To: gentoo-commits
commit: da6d489e7b1ac17110c9727b1ddd451fb6012b58
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 4 19:16:40 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jul 4 19:16:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6d489e
dev-ada/langkit: Add 2018 version
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-ada/langkit/Manifest | 1 +
dev-ada/langkit/files/langkit-2018-gentoo.patch | 21 +++++++++++
dev-ada/langkit/langkit-2018.ebuild | 48 +++++++++++++++++++++++++
3 files changed, 70 insertions(+)
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index e7ad949e03c..bdd44e3183f 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1 +1,2 @@
+DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f
DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch
new file mode 100644
index 00000000000..aacca6092c1
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/langkit/templates/project_file.mako 2017-07-11 14:19:12.841221846 +0200
++++ b/langkit/templates/project_file.mako 2017-07-11 14:12:39.104981170 +0200
+@@ -111,6 +111,7 @@
+ -- ... and this prevents OOM on other platforms
+ end case;
+ end case;
++ for Driver ("C") use External ("GCC", "gcc");
+ end Compiler;
+
+ package Binder is
+--- a/langkit/compile_context.py 2018-07-04 19:17:08.329346507 +0200
++++ b/langkit/compile_context.py 2018-07-04 19:17:57.276615724 +0200
+@@ -1684,7 +1684,7 @@
+ generate_lexer
+ ):
+ quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py")
+- subprocess.check_call([sys.executable, quex_py_file, "-i",
++ subprocess.check_call(["quex", "-i",
+ quex_file,
+ "-o", "quex_lexer",
+ "--buffer-element-size", "4",
diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild
new file mode 100644
index 00000000000..9bb818cf2e8
--- /dev/null
+++ b/dev-ada/langkit/langkit-2018.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="A Python framework to generate language parsers"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a
+ -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ || (
+ dev-ada/gnatcoll[gnat_2017,iconv,shared]
+ dev-ada/gnatcoll-bindings[gnat_2018,iconv,shared]
+ )
+ dev-python/mako
+ dev-python/pyyaml
+ dev-python/enum34
+ dev-python/funcy
+ dev-python/docutils
+ dev-python/quex"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_test() {
+ testsuite/testsuite.py | grep FAILED && die "Test failed"
+}
+
+src_install() {
+ default
+ python_domodule langkit
+ python_doscript scripts/create-project.py
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2018-11-22 7:04 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2018-11-22 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 3eb3db68d752e9a14b070ef95652f4c368b46e65
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 22 07:04:45 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 07:04:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb3db68
dev-ada/langkit: Stable
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/langkit/files/langkit-2018-gentoo.patch | 49 +++++++++++++++++++++++++
dev-ada/langkit/langkit-2018.ebuild | 9 ++---
2 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch
index 52920e906ee..62ff7ce17e5 100644
--- a/dev-ada/langkit/files/langkit-2018-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch
@@ -9,3 +9,52 @@
quex_file,
"-o", "quex_lexer",
"--buffer-element-size", "4",
+--- a/langkit/libmanage.py 2018-11-20 21:38:03.042086783 +0100
++++ b/langkit/libmanage.py 2018-11-20 21:39:50.562273656 +0100
+@@ -682,6 +682,8 @@
+
+ result = ['-XBUILD_MODE={}'.format(build_mode),
+ '-XLIBRARY_TYPE={}'.format(library_type),
++ '-XGPR_BUILD={}'.format(library_type),
++ '-XGNATCOLL_CORE_BUILD={}'.format(library_type),
+ '-XXMLADA_BUILD={}'.format(library_type)]
+
+ enable_build_warnings = getattr(args, 'enable_build_warnings', False)
+--- a/testsuite/python_support/utils.py 2018-11-20 21:41:46.156324084 +0100
++++ b/testsuite/python_support/utils.py 2018-11-20 21:42:26.049651194 +0100
+@@ -203,7 +203,8 @@
+ main_sources=', '.join('"{}"'.format(m) for m in ada_main)
+ ))
+ run('gprbuild', '-Pgen', '-q', '-p',
+- '-XLIBRARY_TYPE=relocatable', '-XXMLADA_BUILD=relocatable')
++ '-XLIBRARY_TYPE=relocatable', '-XGPR_BUILD=relocatable',
++ '-XXMLADA_BUILD=relocatable')
+
+ for i, m in enumerate(ada_main):
+ assert m.endswith('.adb')
+--- a/testsuite/testsuite_support/__init__.py 2018-11-20 21:45:08.828905205 +0100
++++ b/testsuite/testsuite_support/__init__.py 2018-11-20 21:46:10.837858988 +0100
+@@ -110,7 +110,9 @@
+ # Build Langkit_Support so that each testcase does not try to build it
+ # in parallel.
+ if not self.global_env['options'].disable_tear_up_builds:
+- gargs = ['-p', '-P', self.langkit_support_project_file]
++ gargs = ['-p']
++ gargs = gargs + ['-XGPR_BUILD=relocatable']
++ gargs = gargs + ['-P', self.langkit_support_project_file]
+ cargs = ['-cargs', '-O0', '-g']
+ if self.coverage_enabled:
+ gargs.append('--subdirs=gnatcov')
+--- a/testsuite/testsuite_support/base_driver.py 2018-11-20 22:04:54.199973719 +0100
++++ b/testsuite/testsuite_support/base_driver.py 2018-11-20 22:05:26.498436100 +0100
+@@ -312,7 +312,9 @@
+
+ :param str project_file: Project file name.
+ """
+- argv = ['gprbuild', '-P', project_file, '-p']
++ argv = ['gprbuild']
++ argv = argv + ['-XGPR_BUILD=relocatable']
++ argv = argv + ['-P', project_file, '-p']
+ cargs = ['-O0', '-g', '-gnata']
+ if self.coverage_enabled:
+ argv.append('--subdirs=gnatcov')
diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild
index 9bb818cf2e8..3eeaca02add 100644
--- a/dev-ada/langkit/langkit-2018.ebuild
+++ b/dev-ada/langkit/langkit-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,15 +16,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
- || (
- dev-ada/gnatcoll[gnat_2017,iconv,shared]
- dev-ada/gnatcoll-bindings[gnat_2018,iconv,shared]
- )
+ dev-ada/gnatcoll-bindings[iconv,shared]
dev-python/mako
dev-python/pyyaml
dev-python/enum34
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2019-06-09 19:02 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2019-06-09 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 4bb8e1790045df50a188cba0130131c143d7cc7e
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 19:02:36 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 19:02:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb8e179
dev-ada/langkit: bump to 2019
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
dev-ada/langkit/Manifest | 1 +
dev-ada/langkit/files/langkit-2019-gentoo.patch | 60 +++++++++++++++++++++++++
dev-ada/langkit/langkit-2019.ebuild | 53 ++++++++++++++++++++++
3 files changed, 114 insertions(+)
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index bdd44e3183f..da77d80482b 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,2 +1,3 @@
+DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b
DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f
DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
diff --git a/dev-ada/langkit/files/langkit-2019-gentoo.patch b/dev-ada/langkit/files/langkit-2019-gentoo.patch
new file mode 100644
index 00000000000..13a5eb9df23
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-2019-gentoo.patch
@@ -0,0 +1,60 @@
+--- a/testsuite/testsuite_support/__init__.py 2019-06-09 12:47:22.832308224 +0200
++++ b/testsuite/testsuite_support/__init__.py 2019-06-09 12:48:27.768399377 +0200
+@@ -126,8 +126,10 @@
+ # Build Langkit_Support so that each testcase does not try to build it
+ # in parallel.
+ if not self.global_env['options'].disable_tear_up_builds:
+- gargs = ['-p', '-P', self.langkit_support_project_file]
++ gargs = ['-p']
++ gargs = gargs + ['-XGPR_BUILD=relocatable']
++ gargs = gargs + ['-P', self.langkit_support_project_file]
+- cargs = ['-cargs', '-O0', '-g', '-gnatwae']
++ cargs = ['-cargs', '-O0', '-g', '-gnatwa']
+ if self.coverage_enabled:
+ gargs.append('--subdirs=gnatcov')
+ cargs.extend(['-fdump-scos', '-fpreserve-control-flow'])
+--- a/langkit/support/langkit_support.gpr 2019-06-09 14:00:50.239979207 +0200
++++ b/langkit/support/langkit_support.gpr 2019-06-09 14:00:56.580879634 +0200
+@@ -8,7 +8,7 @@
+ for Object_Dir use "obj";
+
+ package Compiler is
+- for Default_Switches ("Ada") use ("-gnatwae", "-gnatyg");
++ for Default_Switches ("Ada") use ("-gnatws", "-gnatyg");
+ end Compiler;
+
+ end Langkit_Support;
+--- a/langkit/templates/langkit_support_gpr.mako 2019-06-09 19:07:51.131902613 +0200
++++ b/langkit/templates/langkit_support_gpr.mako 2019-06-09 19:09:55.530096368 +0200
+@@ -61,7 +61,7 @@
+ case Build_Mode is
+ when "dev" =>
+ for Default_Switches ("Ada") use
+- Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata");
++ Common_Ada_Cargs & ("-g", "-O0", "-gnatws", "-gnata");
+
+ when "prod" =>
+ -- Debug information is useful even with optimization for
+--- a/testsuite/testsuite_support/base_driver.py 2019-06-09 20:00:21.202461893 +0200
++++ b/testsuite/testsuite_support/base_driver.py 2019-06-09 20:01:04.516848550 +0200
+@@ -327,7 +327,9 @@
+
+ :param str project_file: Project file name.
+ """
+- argv = ['gprbuild', '-P', project_file, '-p']
++ argv = ['gprbuild']
++ argv = argv + ['-XGPR_BUILD=relocatable']
++ argv = argv + ['-P', project_file, '-p']
+ cargs = ['-O0', '-g', '-gnata']
+ if self.coverage_enabled:
+ argv.append('--subdirs=gnatcov')
+--- a/langkit/libmanage.py 2019-06-09 20:40:14.885582672 +0200
++++ b/langkit/libmanage.py 2019-06-09 20:41:13.991738858 +0200
+@@ -745,6 +745,7 @@
+ result = ['-XBUILD_MODE={}'.format(build_mode),
+ '-XLIBRARY_TYPE={}'.format(library_type),
+ '-XGPR_BUILD={}'.format(library_type),
++ '-XGNATCOLL_GMP_BUILD={}'.format(library_type),
+ '-XXMLADA_BUILD={}'.format(library_type)]
+
+ enable_build_warnings = getattr(args, 'enable_build_warnings', False)
diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild
new file mode 100644
index 00000000000..b18dc16f8d4
--- /dev/null
+++ b/dev-ada/langkit/langkit-2019.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+MYP=${P}-20190510-19B8C
+
+DESCRIPTION="A Python framework to generate language parsers"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8f8a31e87a8f1c967d31
+ -> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-ada/gnatcoll-bindings[iconv,shared]
+ dev-python/mako
+ <dev-python/pyyaml-5
+ dev-python/enum34
+ dev-python/funcy
+ dev-python/docutils"
+
+DEPEND="${RDEPEND}
+ test? ( dev-ada/gnatcoll-bindings[gmp] )"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+ default
+ # Can't make this test working
+ rm -r testsuite/tests/misc/link_two_libs || die
+}
+
+src_test() {
+ testsuite/testsuite.py --show-error-output | tee testsuite.log
+ grep -q FAILED testsuite.log && die "Test failed"
+}
+
+src_install() {
+ default
+ python_domodule langkit
+ python_doscript scripts/create-project.py
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2019-06-17 7:58 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2019-06-17 7:58 UTC (permalink / raw
To: gentoo-commits
commit: 8c1830d5a146f733d7cfb2feea8d56a2568e8a7a
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 07:51:34 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 07:51:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1830d5
dev-ada/langkit: assign to ada <AT> gentoo.org
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
dev-ada/langkit/files/langkit-2019-gentoo.patch | 11 +++++++++++
dev-ada/langkit/langkit-2019.ebuild | 8 +-------
dev-ada/langkit/metadata.xml | 5 ++---
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/dev-ada/langkit/files/langkit-2019-gentoo.patch b/dev-ada/langkit/files/langkit-2019-gentoo.patch
index 13a5eb9df23..0358198d080 100644
--- a/dev-ada/langkit/files/langkit-2019-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2019-gentoo.patch
@@ -58,3 +58,14 @@
'-XXMLADA_BUILD={}'.format(library_type)]
enable_build_warnings = getattr(args, 'enable_build_warnings', False)
+--- a/testsuite/tests/misc/link_two_libs/test.yaml 2019-06-17 09:38:34.796029233 +0200
++++ b/testsuite/tests/misc/link_two_libs/test.yaml 2019-06-17 09:39:06.805549633 +0200
+@@ -1,7 +1,3 @@
+ driver: python
+ input_sources: []
+-expect_failure:
+- - if: [gnat_community_2018]
+- then: >
+- A known issue in the gprbuild furnished with GNAT Community 2018
+- prevents this test from passing.
++expect_failure: Gentoo failure
diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild
index b18dc16f8d4..a3dcb795c06 100644
--- a/dev-ada/langkit/langkit-2019.ebuild
+++ b/dev-ada/langkit/langkit-2019.ebuild
@@ -35,14 +35,8 @@ S="${WORKDIR}"/${MYP}-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-src_prepare() {
- default
- # Can't make this test working
- rm -r testsuite/tests/misc/link_two_libs || die
-}
-
src_test() {
- testsuite/testsuite.py --show-error-output | tee testsuite.log
+ testsuite/testsuite.py --show-error-output misc | tee testsuite.log
grep -q FAILED testsuite.log && die "Test failed"
}
diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml
index bfb9cb6484b..1d15b41d3ff 100644
--- a/dev-ada/langkit/metadata.xml
+++ b/dev-ada/langkit/metadata.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>tupone@gentoo.org</email>
- <name>Tupone Alfredo</name>
+ <maintainer type="project">
+ <email>ada@gentoo.org</email>
</maintainer>
<longdescription lang="en">
Langkit (nickname for language kit) is a tool whose purpose is to make
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2019-11-03 20:28 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2019-11-03 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 17f07cd9da176bc52795eeff3152d2ba3546873c
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 3 20:28:17 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Nov 3 20:28:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f07cd9
dev-ada/langkit: Remove old version
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/langkit/Manifest | 1 -
dev-ada/langkit/files/langkit-2017-gentoo.patch | 69 -------------------------
dev-ada/langkit/langkit-2017.ebuild | 45 ----------------
3 files changed, 115 deletions(-)
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index da77d80482b..325726889af 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,3 +1,2 @@
DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b
DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f
-DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
deleted file mode 100644
index 7b6501ed8a7..00000000000
--- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/langkit/compile_context.py 2017-12-13 22:12:38.689143125 +0100
-+++ b/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100
-@@ -1171,8 +1171,7 @@
- # the Quex specification changed from last build.
- if generate_lexer and self.cache.is_stale('quex_specification',
- quex_spec):
-- quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py")
-- subprocess.check_call([sys.executable, quex_py_file, "-i",
-+ subprocess.check_call(["quex", "-i",
- quex_file,
- "-o", "quex_lexer",
- "--buffer-element-size", "4",
---- a/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:28.461617512 +0100
-+++ b/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:58.912060490 +0100
-@@ -2196,7 +2196,7 @@
- -- printing them.
-
- function Hash (S : Lexical_Env) return Hash_Type is
-- (Hash_Type (To_Integer (S.all'Address)));
-+ (Hash_Type'Mod (To_Integer (S.all'Address)));
-
- package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps
- (Lexical_Env, Integer, Hash, "=");
---- a/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:04.977442020 +0200
-+++ b/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:45.422759387 +0200
-@@ -68,6 +68,8 @@
- # to build it in parallel.
- if not self.global_env['options'].disable_tear_up_builds:
-- p = Run(['gprbuild', '-p', '-f', '-P',
-+ p = Run(['gprbuild', '-p', '-f', '-XLIBRARY_TYPE=relocatable',
-+ '-XGPR_BUILD=relocatable',
-+ '-XXMLADA_BUILD=relocatable', '-P',
- os.path.join(self.root_dir, '..', 'langkit', 'support',
- 'langkit_support.gpr')], output=PIPE)
- report(p, "Langkit support")
---- a/testsuite/testsuite_support/langkit_support_driver.py 2018-05-03 08:01:20.019944992 +0200
-+++ b/testsuite/testsuite_support/langkit_support_driver.py 2018-05-03 08:02:50.146430288 +0200
-@@ -36,5 +36,8 @@
- ))
-
- self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-gnata',
-+ '-XLIBRARY_TYPE=relocatable',
-+ '-XGPR_BUILD=relocatable',
-+ '-XXMLADA_BUILD=relocatable',
- '-cargs', '-O0', '-g'])
- self.run_and_check(['./{}'.format(source[:-4])])
-+++ a/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:14:30.998698722 +0200
---- b/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:16:48.275417176 +0200
-@@ -41,6 +41,9 @@
- )
- ))
-
-- self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-cargs', '-O0',
-+ self.run_and_check(['gprbuild', '-p', '-XLIBRARY_TYPE=relocatable',
-+ '-XGPR_BUILD=relocatable',
-+ '-XXMLADA_BUILD=relocatable',
-+ '-P', 'p.gpr', '-cargs', '-O0',
- '-g'])
- self.run_and_check(['./{}'.format(source[:-4])])
---- a/langkit/libmanage.py 2018-11-14 22:02:20.283672719 +0100
-+++ b/langkit/libmanage.py 2018-11-14 22:02:39.970337338 +0100
-@@ -634,6 +634,7 @@
-
- result = ['-XBUILD_MODE={}'.format(build_mode),
- '-XLIBRARY_TYPE={}'.format(library_type),
-+ '-XGPR_BUILD={}'.format(library_type),
- '-XXMLADA_BUILD={}'.format(library_type)]
-
- enable_warnings = getattr(args, 'enable_warnings', False)
diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild
deleted file mode 100644
index 57790df219e..00000000000
--- a/dev-ada/langkit/langkit-2017.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-MYPN=${PN}-gps-src
-
-DESCRIPTION="A Python framework to generate language parsers"
-HOMEPAGE="https://www.adacore.com/community"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
- -> ${MYPN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- dev-ada/gnatcoll[iconv,shared]
- dev-python/mako
- dev-python/pyyaml
- dev-python/enum34
- dev-python/funcy
- dev-python/docutils
- dev-python/quex"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYPN}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_test() {
- testsuite/testsuite.py | grep FAILED && die "Test failed"
-}
-
-src_install() {
- default
- python_domodule langkit
- python_doscript scripts/create-project.py
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2021-12-09 18:33 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2021-12-09 18:33 UTC (permalink / raw
To: gentoo-commits
commit: d30e9c27107ba7f3788774fd3d4d9aac1742e4df
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 18:33:11 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 18:33:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d30e9c27
dev-ada/langkit: LIBRARY_TYPE is now handled in gnatcoll-bindings
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/langkit/files/langkit-22.0.0-test.patch | 20 --------------------
dev-ada/langkit/langkit-22.0.0-r1.ebuild | 1 -
2 files changed, 21 deletions(-)
diff --git a/dev-ada/langkit/files/langkit-22.0.0-test.patch b/dev-ada/langkit/files/langkit-22.0.0-test.patch
deleted file mode 100644
index b083e60f680d..000000000000
--- a/dev-ada/langkit/files/langkit-22.0.0-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/testsuite/python_support/utils.py 2021-12-08 14:12:47.457472580 +0100
-+++ b/testsuite/python_support/utils.py 2021-12-08 14:14:26.142767154 +0100
-@@ -379,6 +379,7 @@
- ))
- run('gprbuild', '-Pgen', '-q', '-p',
- '-XLIBRARY_TYPE=static',
-+ '-XGNATCOLL_GMP_BUILD=static',
- '-XXMLADA_BUILD=static')
-
- for i, m in enumerate(ada_main):
---- a/langkit/libmanage.py 2021-12-08 15:13:07.952581993 +0100
-+++ b/langkit/libmanage.py 2021-12-08 15:13:58.429825946 +0100
-@@ -897,6 +897,7 @@
- result = ['-XBUILD_MODE={}'.format(self.build_mode),
- '-XLIBRARY_TYPE={}'.format(library_type),
- '-XGPR_BUILD={}'.format(library_type),
-+ '-XGNATCOLL_GMP_BUILD={}'.format(library_type),
- '-XXMLADA_BUILD={}'.format(library_type)]
-
- if self.enable_build_warnings:
diff --git a/dev-ada/langkit/langkit-22.0.0-r1.ebuild b/dev-ada/langkit/langkit-22.0.0-r1.ebuild
index 398c3148071d..60713a0d90b8 100644
--- a/dev-ada/langkit/langkit-22.0.0-r1.ebuild
+++ b/dev-ada/langkit/langkit-22.0.0-r1.ebuild
@@ -30,7 +30,6 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-gnarl.patch
- "${FILESDIR}"/${P}-test.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2022-10-02 17:54 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2022-10-02 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 81a8882a480668357ce3798fc56ba970862a72bd
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 17:53:55 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 17:53:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a8882a
dev-ada/langkit: fix deprecated collections.Sequence
Closes: https://bugs.gentoo.org/873787
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/langkit/files/langkit-22.0.0-abc.patch | 24 ++++++++++++++++++++++
...t-22.0.0-r2.ebuild => langkit-22.0.0-r3.ebuild} | 2 ++
2 files changed, 26 insertions(+)
diff --git a/dev-ada/langkit/files/langkit-22.0.0-abc.patch b/dev-ada/langkit/files/langkit-22.0.0-abc.patch
new file mode 100644
index 000000000000..0b3e9bbf8f4f
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-22.0.0-abc.patch
@@ -0,0 +1,24 @@
+From cdc5768fb8db416e4eede97639f381a537ae9336 Mon Sep 17 00:00:00 2001
+From: Charles Pigott <charlespigott@googlemail.com>
+Date: Wed, 10 Nov 2021 20:42:12 +0000
+Subject: [PATCH] Use collections.abc.Sequence as the alias is set to be
+ removed
+
+Alias has been in place since Py 3.3, and minimum (test) version is 3.7.
+---
+ langkit/templates/python_api/module_py.mako | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/langkit/templates/python_api/module_py.mako b/langkit/templates/python_api/module_py.mako
+index 831fb6044..65373fdbc 100644
+--- a/langkit/templates/python_api/module_py.mako
++++ b/langkit/templates/python_api/module_py.mako
+@@ -1503,7 +1503,7 @@ class ${root_astnode_name}:
+ if isinstance(ast_type_or_pred, type):
+ sought_type = ast_type_or_pred
+ pred = lambda node: isinstance(node, sought_type)
+- elif isinstance(ast_type_or_pred, collections.Sequence):
++ elif isinstance(ast_type_or_pred, collections.abc.Sequence):
+ sought_types = ast_type_or_pred
+ pred = lambda node: isinstance(node, tuple(sought_types))
+ else:
diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r3.ebuild
similarity index 98%
rename from dev-ada/langkit/langkit-22.0.0-r2.ebuild
rename to dev-ada/langkit/langkit-22.0.0-r3.ebuild
index d9620aaca448..23c1cec4ad52 100644
--- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild
+++ b/dev-ada/langkit/langkit-22.0.0-r3.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${PYTHON_DEPS}
dev-ada/e3-core[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-abc.patch )
+
python_prepare_all() {
distutils-r1_python_prepare_all
cd testsuite/tests
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2023-02-25 18:21 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2023-02-25 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 44f7b873fbe429c5346ecd398c0000b9fcd00b98
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 18:19:39 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 18:21:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f7b873
dev-ada/langkit: update EAPI 7 -> 8
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/langkit/files/langkit-23.0.0-py311.patch | 88 ++++++++++++++++++++++++
dev-ada/langkit/langkit-23.0.0-r1.ebuild | 11 +--
2 files changed, 95 insertions(+), 4 deletions(-)
diff --git a/dev-ada/langkit/files/langkit-23.0.0-py311.patch b/dev-ada/langkit/files/langkit-23.0.0-py311.patch
new file mode 100644
index 000000000000..b85027ec2b8d
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-23.0.0-py311.patch
@@ -0,0 +1,88 @@
+--- a/langkit/expressions/collections.py 2023-02-25 17:31:43.261369482 +0100
++++ b/langkit/expressions/collections.py 2023-02-25 17:32:03.068054949 +0100
+@@ -265,15 +265,15 @@
+ " function"
+ )
+
+- argspec = inspect.getargspec(expr_fn)
++ argspec = inspect.getfullargspec(expr_fn)
+
+ check_multiple([
+ (len(argspec.args) in (1, 2),
+ 'Invalid collection iteration lambda: only one'
+ ' or two parameters expected'),
+- (not argspec.varargs and not argspec.keywords,
++ (not argspec.varargs and not argspec.varkw,
+ 'Invalid collection iteration lambda: no *args or **kwargs'),
+ (not argspec.defaults,
+ 'Invalid collection iteration lambda: No default values allowed'
+ 'Invalid matcher lambda'
+ )
+--- a/langkit/expressions/structs.py 2023-02-25 17:32:21.884756077 +0100
++++ b/langkit/expressions/structs.py 2023-02-25 17:32:32.382589322 +0100
+@@ -1327,9 +1327,9 @@
+ self.matchers = []
+
+ for i, match_fn in enumerate(self.matchers_functions):
+- argspec = inspect.getargspec(match_fn)
++ argspec = inspect.getfullargspec(match_fn)
+ check_source_language(
+ len(argspec.args) == 1 and
+ not argspec.varargs and
+- not argspec.keywords and
++ not argspec.varkw and
+ (not argspec.defaults or len(argspec.defaults) < 2),
+--- a/langkit/expressions/base.py 2023-02-25 17:29:35.964403798 +0100
++++ b/langkit/expressions/base.py 2023-02-25 17:30:28.362565456 +0100
+@@ -158,11 +158,11 @@
+ fn_arguments = []
+ fn_expr = None
+
+- argspec = inspect.getargspec(fn)
++ argspec = inspect.getfullargspec(fn)
+ defaults = argspec.defaults or []
+
+ check_multiple([
+- (not argspec.varargs or not argspec.keywords, 'Invalid'
++ (not argspec.varargs or not argspec.varkw, 'Invalid'
+ ' function signature: no *args nor **kwargs allowed'),
+
+ (len(argspec.args) == len(defaults), 'All parameters '
+@@ -2822,7 +2822,7 @@
+ lambda_fn = None
+
+ else:
+- argspec = inspect.getargspec(lambda_fn)
++ argspec = inspect.getfullargspec(lambda_fn)
+
+ var_names = argspec.args
+ var_exprs = argspec.defaults or []
+@@ -2843,10 +2843,10 @@
+ if self.lambda_fn is None:
+ return
+
+- argspec = inspect.getargspec(self.lambda_fn)
++ argspec = inspect.getfullargspec(self.lambda_fn)
+
+ check_multiple([
+- (not argspec.varargs and not argspec.keywords,
++ (not argspec.varargs and not argspec.varkw,
+ 'Invalid function for Let expression (*args and **kwargs '
+ 'not accepted)'),
+
+--- a/langkit/expressions/boolean.py 2023-02-25 17:30:59.820062103 +0100
++++ b/langkit/expressions/boolean.py 2023-02-25 17:31:10.565890137 +0100
+@@ -475,11 +475,11 @@
+ if self.then_expr:
+ return
+
+- argspec = inspect.getargspec(self.then_fn)
++ argspec = inspect.getfullargspec(self.then_fn)
+ check_source_language(
+ len(argspec.args) == 1
+ and not argspec.varargs
+- and not argspec.keywords
++ and not argspec.varkw
+ and not argspec.defaults,
+ 'Invalid lambda for Then expression: exactly one parameter is'
+ ' required, without a default value'
diff --git a/dev-ada/langkit/langkit-23.0.0-r1.ebuild b/dev-ada/langkit/langkit-23.0.0-r1.ebuild
index f0cf67a22fdb..dcae44ffc718 100644
--- a/dev-ada/langkit/langkit-23.0.0-r1.ebuild
+++ b/dev-ada/langkit/langkit-23.0.0-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_10 )
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+PYTHON_COMPAT=( python3_{10..11} )
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_12_2_0 )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 ada multiprocessing
@@ -35,7 +35,10 @@ RDEPEND="${PYTHON_DEPS}
dev-ada/e3-core[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-py311.patch
+)
python_prepare_all() {
distutils-r1_python_prepare_all
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
@ 2023-03-19 19:53 Alfredo Tupone
0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2023-03-19 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 03fa0b2ce8bdb625ccdcef676f95ba9617c1f207
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 19:53:10 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 19:53:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fa0b2c
dev-ada/langkit: drop 22.0.0-r3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/langkit/Manifest | 1 -
dev-ada/langkit/files/langkit-22.0.0-abc.patch | 24 -------
dev-ada/langkit/langkit-22.0.0-r3.ebuild | 90 --------------------------
3 files changed, 115 deletions(-)
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 59b6bdba50b4..9a010d224369 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,2 +1 @@
-DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909
DIST langkit-23.0.0.tar.gz 1178557 BLAKE2B c3b81cafea3afcfd90a87192dca5abd0f19c5ff4e195515dd7c4df70824bf328c24855a6761264b89bf44a56afc8dd77b78fbf322c6f92299082507aa65d61e5 SHA512 6cc6adacb157a47ebc8da46591e45a4ff212fba2cd5ac80c12adb2e84f4508735d98dc68ffce86aa5e5e8d873e6f51efb4f88f4d76a190b9eb0024bf69deefc1
diff --git a/dev-ada/langkit/files/langkit-22.0.0-abc.patch b/dev-ada/langkit/files/langkit-22.0.0-abc.patch
deleted file mode 100644
index 0b3e9bbf8f4f..000000000000
--- a/dev-ada/langkit/files/langkit-22.0.0-abc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cdc5768fb8db416e4eede97639f381a537ae9336 Mon Sep 17 00:00:00 2001
-From: Charles Pigott <charlespigott@googlemail.com>
-Date: Wed, 10 Nov 2021 20:42:12 +0000
-Subject: [PATCH] Use collections.abc.Sequence as the alias is set to be
- removed
-
-Alias has been in place since Py 3.3, and minimum (test) version is 3.7.
----
- langkit/templates/python_api/module_py.mako | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/langkit/templates/python_api/module_py.mako b/langkit/templates/python_api/module_py.mako
-index 831fb6044..65373fdbc 100644
---- a/langkit/templates/python_api/module_py.mako
-+++ b/langkit/templates/python_api/module_py.mako
-@@ -1503,7 +1503,7 @@ class ${root_astnode_name}:
- if isinstance(ast_type_or_pred, type):
- sought_type = ast_type_or_pred
- pred = lambda node: isinstance(node, sought_type)
-- elif isinstance(ast_type_or_pred, collections.Sequence):
-+ elif isinstance(ast_type_or_pred, collections.abc.Sequence):
- sought_types = ast_type_or_pred
- pred = lambda node: isinstance(node, tuple(sought_types))
- else:
diff --git a/dev-ada/langkit/langkit-22.0.0-r3.ebuild b/dev-ada/langkit/langkit-22.0.0-r3.ebuild
deleted file mode 100644
index a5c90c452b7b..000000000000
--- a/dev-ada/langkit/langkit-22.0.0-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 ada multiprocessing
-
-DESCRIPTION="A Python framework to generate language parsers"
-HOMEPAGE="https://www.adacore.com/community"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ${ADA_REQUIRED_USE}
- || ( shared static-libs static-pic )"
-
-RDEPEND="${PYTHON_DEPS}
- ${ADA_DEPS}
- dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
- dev-python/mako[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/funcy[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-ada/e3-core[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-abc.patch )
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- cd testsuite/tests
-
- # missing gprbuild option to build libraries static/relocatable
- rm -r {langkit_support,adalog,misc/link_two_libs} || die
-
- # require railroad-diagrams
- rm -r contrib/svg_railroad_diagrams || die
-}
-
-python_compile_all() {
- build () {
- gprbuild -j$(makeopts_jobs) -p -v \
- -XLIBRARY_TYPE=$1 -P support/langkit_support.gpr -XBUILD_MODE=dev \
- -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
- }
- if use shared; then
- build relocatable
- fi
- if use static-libs; then
- build static
- fi
- if use static-pic; then
- build static-pic
- fi
-}
-
-python_test_all() {
- export GPR_PROJECT_PATH="${S}"/support
- ${EPYTHON} ./manage.py make --no-langkit-support || die
- eval $(./manage.py setenv)
- ${EPYTHON} ./manage.py test --verbose |& tee langkit.testOut
- grep -qw FAIL langkit.testOut && die
-}
-
-python_install_all() {
- build () {
- gprinstall -v -P support/langkit_support.gpr -p -XBUILD_MODE=dev \
- --prefix="${D}"/usr --build-var=LIBRARY_TYPE \
- --build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \
- --sources-subdir=include/langkit_support \
- -XLIBRARY_TYPE=$1 --build-name=$1 || die
- }
- if use shared; then
- build relocatable
- fi
- if use static-libs; then
- build static
- fi
- if use static-pic; then
- build static-pic
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-03-19 19:53 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-23 20:33 [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2018-07-04 19:16 Alfredo Tupone
2018-11-22 7:04 Alfredo Tupone
2019-06-09 19:02 Alfredo Tupone
2019-06-17 7:58 Alfredo Tupone
2019-11-03 20:28 Alfredo Tupone
2021-12-09 18:33 Alfredo Tupone
2022-10-02 17:54 Alfredo Tupone
2023-02-25 18:21 Alfredo Tupone
2023-03-19 19:53 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox