[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/, profiles/

[Michał Górny]

commit:     a75c19a9f18fa8e8119828cd43536d316ced230c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 23:48:21 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 00:06:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a75c19a9

dev-ada/langkit: Remove last-rited pkg

Closes: https://bugs.gentoo.org/708338
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-ada/langkit/Manifest                        |  2 -
 dev-ada/langkit/files/langkit-2018-gentoo.patch | 60 ---------------------
 dev-ada/langkit/files/langkit-2019-gentoo.patch | 71 -------------------------
 dev-ada/langkit/files/langkit-2019-gnarl.patch  | 10 ----
 dev-ada/langkit/files/langkit-2019-pyyaml.patch | 11 ----
 dev-ada/langkit/langkit-2018.ebuild             | 49 -----------------
 dev-ada/langkit/langkit-2019-r1.ebuild          | 52 ------------------
 dev-ada/langkit/langkit-2019.ebuild             | 51 ------------------
 dev-ada/langkit/metadata.xml                    | 17 ------
 profiles/package.mask                           |  8 ---
 10 files changed, 331 deletions(-)

diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
deleted file mode 100644
index 325726889af..00000000000
--- a/dev-ada/langkit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b
-DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f

diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch
deleted file mode 100644
index 62ff7ce17e5..00000000000
--- a/dev-ada/langkit/files/langkit-2018-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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",
---- 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/files/langkit-2019-gentoo.patch b/dev-ada/langkit/files/langkit-2019-gentoo.patch
deleted file mode 100644
index 0358198d080..00000000000
--- a/dev-ada/langkit/files/langkit-2019-gentoo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- 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)
---- 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/files/langkit-2019-gnarl.patch b/dev-ada/langkit/files/langkit-2019-gnarl.patch
deleted file mode 100644
index fb69768dc9d..00000000000
--- a/dev-ada/langkit/files/langkit-2019-gnarl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/langkit/templates/mains_project_file.mako	2020-06-09 09:34:36.677265457 +0200
-+++ b/langkit/templates/mains_project_file.mako	2020-06-09 09:35:30.569451995 +0200
-@@ -40,4 +40,7 @@
-       for Switches ("ada") use ("-E");
-    end Binder;
- 
-+   package Linker is
-+      for Switches ("ada") use ("-lgnat", "-lgnarl");
-+   end Linker;
- end Mains;

diff --git a/dev-ada/langkit/files/langkit-2019-pyyaml.patch b/dev-ada/langkit/files/langkit-2019-pyyaml.patch
deleted file mode 100644
index 58a64992a7c..00000000000
--- a/dev-ada/langkit/files/langkit-2019-pyyaml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/testsuite/testsuite_support/polyfill.py	2020-03-26 20:43:40.861154768 +0100
-+++ b/testsuite/testsuite_support/polyfill.py	2020-03-26 20:44:07.874675123 +0100
-@@ -376,7 +376,7 @@
-         # First load data provided by this testcase
-         try:
-             with open(os.path.join(test_dir, 'test.yaml'), 'r') as f:
--                test_data = yaml.load(f)
-+                test_data = yaml.safe_load(f)
-         except (IOError, yaml.error.YAMLError) as exc:
-             status = 'PROBLEM'
-             message = 'Invalid test.yaml: {}'.format(exc)

diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild
deleted file mode 100644
index 743c42e819d..00000000000
--- a/dev-ada/langkit/langkit-2018.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 multiprocessing
-
-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-bindings[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
-	"${FILESDIR}"/${PN}-2019-pyyaml.patch
-)
-
-src_test() {
-	testsuite/testsuite.py -j $(makeopts_jobs) --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
-}

diff --git a/dev-ada/langkit/langkit-2019-r1.ebuild b/dev-ada/langkit/langkit-2019-r1.ebuild
deleted file mode 100644
index 1f7676ec30e..00000000000
--- a/dev-ada/langkit/langkit-2019-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 multiprocessing
-
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll-bindings[iconv,shared]
-	dev-python/mako
-	dev-python/pyyaml
-	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
-	"${FILESDIR}"/${P}-pyyaml.patch
-	"${FILESDIR}"/${P}-gnarl.patch
-)
-
-src_test() {
-	testsuite/testsuite.py -j $(makeopts_jobs) --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
-}

diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild
deleted file mode 100644
index 31a57f6edd4..00000000000
--- a/dev-ada/langkit/langkit-2019.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 multiprocessing
-
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll-bindings[iconv,shared]
-	dev-python/mako
-	dev-python/pyyaml
-	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
-	"${FILESDIR}"/${P}-pyyaml.patch
-)
-
-src_test() {
-	testsuite/testsuite.py -j $(makeopts_jobs) --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
-}

diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml
deleted file mode 100644
index 1d15b41d3ff..00000000000
--- a/dev-ada/langkit/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ada@g.o</email>
-	</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>

diff --git a/profiles/package.mask b/profiles/package.mask
index 31a5f32e866..cfa43198fcd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -340,14 +340,6 @@ kde-apps/kdebase-meta:5
 # Masked to allow py2.7 removal
 dev-lang/spark
 
-# Alfredo Tupone <tupone@g.o> (2020-08-16)
-# Ported to py3.8 but not yet released
-# Masked to allow py2.7 removal
-# Michał Górny <mgorny@g.o> (2021-01-01)
-# Masking for removal to prevent eclass from crashing on these packages.
-# Removal in 30 days.
-dev-ada/langkit
-
 # Mart Raudsepp <leio@g.o> (2020-08-15)
 # Development release, needs testing to ensure valac-0.50
 # works for existing packages