gentoo resync : 10.11.2019

3 files changed, 0 insertions, 117 deletions

diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index cd5aa1fd2bd3..854f15b76967 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,10 +1,7 @@
-AUX langkit-2017-gentoo.patch 3616 BLAKE2B 3730635b5cb4a2285e3ef283c903705b8f40194bdb65049ca07f651ea9d122e72e863cf132e096f139b9dc6f57a1d7faf7f333a3580e641caa88d4fea4b22009 SHA512 b69c84f3d79adefb254f764ba06c6d5fda81f95a8070b4b651d7a4f2ad078a48e341e5ad94e5ce7e2f756961d943dde3de891c5825c0e367cf7f816e08a31791
 AUX langkit-2018-gentoo.patch 2962 BLAKE2B 7da72c1739c972c6d1aa01c84e8fab3f8864c5449bb3717c8515c41f63eb1a2258ae9be0cfd5bb3bf54327fbe552c2448aa2fb80d69814c1d46f34611683d7db SHA512 72c6ba5e4994ef22f6246a196fdae81ee5f77f7f0420fd31b9bfecb32740b8878863ba75d342cb0c5326ca7031260aefc21f57d430866f7008515470d9ee0899
 AUX langkit-2019-gentoo.patch 3308 BLAKE2B 266bd5bd1d507a565c325e5668eebc3a2a96a448656a6c1f74644d222a4fbdb1cc77eb0c51a33d9453c19a958ed0867bdb59245f09c2b383c59cbd62f699c277 SHA512 d85677824a2da7a8b3c06b665a8e517d7151da4ff458fa595e7c5b71dcf4f78a5a0914e9fe8f8a700b0422071af4d6e4890bc8e70c539f59ae25f89c19d4a8d9
 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
-EBUILD langkit-2017.ebuild 911 BLAKE2B f75a3fdec74b278be740b37993909e2627a7f4084d6967c2c9a5a7f41cfa2bfd777e45f5d6143fe88b2ba15ead72d47766d94c59d3283f6c18ab98c7959c409d SHA512 2f2c5939fdb316b63f740e230e442ad33e3ab2bee21b08d3a3688391bc8a40c17a3f9fa578062fe0cd58ea4747c27b8a4ed2689dc1a153043a5bf2d9d04fc1fd
 EBUILD langkit-2018.ebuild 1031 BLAKE2B 70e31054892cb9d53288827932fbbc57d6584ec87168a3dc461c993618eb46198ea9045600fb2f76d595ba63b6faa0bd28c2a9effac09691818552049eaa3024 SHA512 819a47dec6c36f66ac1240f2dd7d7cfb469604f8c12d10d095ba4010d9aadc04ae6cf72cf4a08b37cacc87ebd9cdc0baef85c6945c48f32dc9c4200c37b11b84
 EBUILD langkit-2019.ebuild 1051 BLAKE2B b2d9f137be3bd39deef51864af08f1b1a38a0d334df3d161bec6e963b91cf4fe42e3d896033af0d9249191c3f4c91da4dfc92544670f3da136bf9341542b45ab SHA512 ea814d9477fbc593bf0471b63e653c3be5f769277e453ebc4a74beed021069f83ce2acdd9d02661d82515e244dc1abd3346c534fd7ea7d53670a24ebc755852f
 MISC metadata.xml 716 BLAKE2B e32738d2a347420bf4e01dcbcf953cfab18b1c6920a6b52b6278d9fcf26dd26fdb1fb8b490a2f050cbf33efb952768eea2bfeadeb40781783a69ebdad97001de SHA512 8c986d121e0afc68640dc9c5d1e6d3b9dc3bf79fd2ca783a9386c82319a10f8734170b330702cb82d4c790f22d67626606904072f8e57cee32dda5f5fa275714
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 7b6501ed8a70..000000000000
--- 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 57790df219e3..000000000000
--- 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
-}