| 1 |
commit: 9581a0b568efbe0f22efde7bf54d66024e159ebc |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 26 19:50:28 2020 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 26 19:50:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9581a0b5 |
| 7 |
|
| 8 |
dev-ada/langkit: fix usage of pyyaml |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/713340 |
| 11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-ada/langkit/files/langkit-2019-pyyaml.patch | 11 +++++++++++ |
| 15 |
dev-ada/langkit/langkit-2018.ebuild | 8 +++++--- |
| 16 |
dev-ada/langkit/langkit-2019.ebuild | 9 ++++++--- |
| 17 |
3 files changed, 22 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-ada/langkit/files/langkit-2019-pyyaml.patch b/dev-ada/langkit/files/langkit-2019-pyyaml.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..58a64992a7c |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-ada/langkit/files/langkit-2019-pyyaml.patch |
| 24 |
@@ -0,0 +1,11 @@ |
| 25 |
+--- a/testsuite/testsuite_support/polyfill.py 2020-03-26 20:43:40.861154768 +0100 |
| 26 |
++++ b/testsuite/testsuite_support/polyfill.py 2020-03-26 20:44:07.874675123 +0100 |
| 27 |
+@@ -376,7 +376,7 @@ |
| 28 |
+ # First load data provided by this testcase |
| 29 |
+ try: |
| 30 |
+ with open(os.path.join(test_dir, 'test.yaml'), 'r') as f: |
| 31 |
+- test_data = yaml.load(f) |
| 32 |
++ test_data = yaml.safe_load(f) |
| 33 |
+ except (IOError, yaml.error.YAMLError) as exc: |
| 34 |
+ status = 'PROBLEM' |
| 35 |
+ message = 'Invalid test.yaml: {}'.format(exc) |
| 36 |
|
| 37 |
diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild |
| 38 |
index 348ef449845..743c42e819d 100644 |
| 39 |
--- a/dev-ada/langkit/langkit-2018.ebuild |
| 40 |
+++ b/dev-ada/langkit/langkit-2018.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2019 Gentoo Authors |
| 43 |
+# Copyright 1999-2020 Gentoo Authors |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
EAPI=6 |
| 47 |
@@ -24,7 +24,6 @@ DEPEND="${PYTHON_DEPS} |
| 48 |
dev-ada/gnatcoll-bindings[iconv,shared] |
| 49 |
dev-python/mako |
| 50 |
dev-python/pyyaml |
| 51 |
- <dev-python/pyyaml-5 |
| 52 |
dev-python/enum34 |
| 53 |
dev-python/funcy |
| 54 |
dev-python/docutils |
| 55 |
@@ -33,7 +32,10 @@ RDEPEND="${DEPEND}" |
| 56 |
|
| 57 |
S="${WORKDIR}"/${MYP}-src |
| 58 |
|
| 59 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 60 |
+PATCHES=( |
| 61 |
+ "${FILESDIR}"/${P}-gentoo.patch |
| 62 |
+ "${FILESDIR}"/${PN}-2019-pyyaml.patch |
| 63 |
+) |
| 64 |
|
| 65 |
src_test() { |
| 66 |
testsuite/testsuite.py -j $(makeopts_jobs) --show-error-output | tee testsuite.log |
| 67 |
|
| 68 |
diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild |
| 69 |
index 229fdd526dc..31a57f6edd4 100644 |
| 70 |
--- a/dev-ada/langkit/langkit-2019.ebuild |
| 71 |
+++ b/dev-ada/langkit/langkit-2019.ebuild |
| 72 |
@@ -1,4 +1,4 @@ |
| 73 |
-# Copyright 1999-2019 Gentoo Authors |
| 74 |
+# Copyright 1999-2020 Gentoo Authors |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
|
| 77 |
EAPI=7 |
| 78 |
@@ -24,7 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 79 |
RDEPEND="${PYTHON_DEPS} |
| 80 |
dev-ada/gnatcoll-bindings[iconv,shared] |
| 81 |
dev-python/mako |
| 82 |
- <dev-python/pyyaml-5 |
| 83 |
+ dev-python/pyyaml |
| 84 |
dev-python/enum34 |
| 85 |
dev-python/funcy |
| 86 |
dev-python/docutils" |
| 87 |
@@ -34,7 +34,10 @@ DEPEND="${RDEPEND} |
| 88 |
|
| 89 |
S="${WORKDIR}"/${MYP}-src |
| 90 |
|
| 91 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 92 |
+PATCHES=( |
| 93 |
+ "${FILESDIR}"/${P}-gentoo.patch |
| 94 |
+ "${FILESDIR}"/${P}-pyyaml.patch |
| 95 |
+) |
| 96 |
|
| 97 |
src_test() { |
| 98 |
testsuite/testsuite.py -j $(makeopts_jobs) --show-error-output | tee testsuite.log |
Archives