Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/, dev-ada/langkit/
Date: Thu, 26 Mar 2020 19:50:59
Message-Id: 1585252228.9581a0b568efbe0f22efde7bf54d66024e159ebc.tupone@gentoo
commit:     9581a0b568efbe0f22efde7bf54d66024e159ebc
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 19:50:28 2020 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 19:50:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9581a0b5

dev-ada/langkit: fix usage of pyyaml

Closes: https://bugs.gentoo.org/713340
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/langkit/files/langkit-2019-pyyaml.patch | 11 +++++++++++
 dev-ada/langkit/langkit-2018.ebuild             |  8 +++++---
 dev-ada/langkit/langkit-2019.ebuild             |  9 ++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/dev-ada/langkit/files/langkit-2019-pyyaml.patch b/dev-ada/langkit/files/langkit-2019-pyyaml.patch
new file mode 100644
index 00000000000..58a64992a7c
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-2019-pyyaml.patch
@@ -0,0 +1,11 @@
+--- 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
index 348ef449845..743c42e819d 100644
--- a/dev-ada/langkit/langkit-2018.ebuild
+++ b/dev-ada/langkit/langkit-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,6 @@ DEPEND="${PYTHON_DEPS}
 	dev-ada/gnatcoll-bindings[iconv,shared]
 	dev-python/mako
 	dev-python/pyyaml
-	<dev-python/pyyaml-5
 	dev-python/enum34
 	dev-python/funcy
 	dev-python/docutils
@@ -33,7 +32,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}-src
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-2019-pyyaml.patch
+)
 
 src_test() {
 	testsuite/testsuite.py -j $(makeopts_jobs) --show-error-output | tee testsuite.log

diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild
index 229fdd526dc..31a57f6edd4 100644
--- a/dev-ada/langkit/langkit-2019.ebuild
+++ b/dev-ada/langkit/langkit-2019.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-ada/gnatcoll-bindings[iconv,shared]
 	dev-python/mako
-	<dev-python/pyyaml-5
+	dev-python/pyyaml
 	dev-python/enum34
 	dev-python/funcy
 	dev-python/docutils"
@@ -34,7 +34,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MYP}-src
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-pyyaml.patch
+)
 
 src_test() {
 	testsuite/testsuite.py -j $(makeopts_jobs) --show-error-output | tee testsuite.log