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

[Alfredo Tupone]

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
-}