gentoo resync : 16.06.2019

3 files changed, 116 insertions, 0 deletions

diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index fa838fd0e45f..fb288bfcdfd2 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,7 +1,10 @@
 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 2878 BLAKE2B 6a3e560c26d86688100b183e5e8ce369b7dc7d60462cdd327f2669db4eda9bf7c67266f755863be52a8d26536fffd43b3587d0c9d716d11519a2979d87f60f81 SHA512 7ffc277ad883ba010c883f5c85ae1d88760f94d702d004398d5958321b02715419f5cb2316f99bb1bf9d6204ade8be491080284d9c33afe1389ce66b4b5b2eec
+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 917 BLAKE2B a7d50141e6a26768aa62a590670624ca43114c0d66472f5e797a023c40efe03e2e747d10b49cf4cad394e78ea9c41a0cf4b2df980578900d4d6ac8f145499121 SHA512 7cc768a8e9829af8711e0adbcedadd2e1d6e02a6fa21d6f7b2a2a6e7e261e1af2cd5c849b6e8b81272ec615dd3e83ab20b754fc9662dcfa7e14cfe607f5e9151
+EBUILD langkit-2019.ebuild 1126 BLAKE2B 4c9c8acb3010d5f905ccff98fcc9a6f25283925126f255f4a3d106462cdb254afd4e2cdfaf1adeed75c456994d28a66330c01dbd8620bbf87d42cd56754f46aa SHA512 8ee57e758dfefbdae5d072638a33aac206b982f00ff0fc6cd763c671998de77fc146ed619fbeb31d02bad3bf9729b8b8d283613ac1f1632c71d84b61192b7e98
 MISC metadata.xml 748 BLAKE2B 29a7b386b6d8d1b2f2bc8fc16739c28129b7886c8cdae6784d54bfaadea87502a5338ed6113f536e7c5701cefb42d5912f6189dccb55ddd704445ae65f5c4176 SHA512 8a3183336e00f01eeb51a5b7d06833599b408801b71713575d83131d39b82c8c74fda8ce133b352dc356135721ef19ca488ef17723172579cd1507d4c1d7c809
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 000000000000..13a5eb9df232
--- /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 000000000000..b18dc16f8d4b
--- /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
+}