gentoo Easter resync : 12.04.2020

4 files changed, 19 insertions, 3 deletions

diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 6a20f4de92a1..5b2ed5d66f35 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,8 +1,9 @@
 AUX libadalang-2017-gentoo.patch 927 BLAKE2B 3c0a92df8aee109faa4be73bc1950af46fbf083a165582bc6ee270171d4317508fe794f8583b5cf6da7ad72ab8ff706befe4339d44319559341228a823b4c188 SHA512 0436780f1eb872c10b30405d467534a752a293d49b5522ff1fafa9524474b3fbc99889a991030ce81178461cb875dca31e1283a3f89a3fc338f4ec3d1a9de4fb
 AUX libadalang-2018-gentoo.patch 678 BLAKE2B ebc0c63b62a0b5c2b53a036de1a71ca33af992dd3774d894f4e0407e291bee15fac5be358c5f2600516ecb15c7b7846c7213b1fdd3c522ecd2f1393247d4b4b4 SHA512 346b561e2db3258e768bc4c4ee92a3ba6977f58de3cdae0ab84df9c31ba178dad3788309db2505c2dc8c8fd4319ef68201499303a6b92d837508a6bd91e49779
 AUX libadalang-2019-gentoo.patch 2826 BLAKE2B 11269fd6165c6138cfc67f28d460768376af4b2ba96c694b6fd8145b1b091a5396c26ad34a8d6b330cf80793138bc59782bfe8e653ae2d1659fbbfc4110ef001 SHA512 8657243bad9f63455c0c3670669114743a9c988f1a6a3dbe89eed8c2d6b730af286498dcedab36cb51ca0951a2abed0acecaab27085fc9e1aa8b603d4d2c1464
+AUX libadalang-2019-pyyaml.patch 566 BLAKE2B 409cdd5e18c4ac3e11c05b8ba4c5a6dac4ca204e57c6e74ac9001b1ce60356fd713434c313ca25d469a588b7131d1af9b31103276947e63a01bc38c7ab994dda SHA512 bb81a09d90129ed21e59c9b26c76f50aa43b707e84f3d566146b17d54a7e54756beb9221f0f2404e45fbe8175d126deeced9d69c7cb2fe6a3c143a7beec65580
 DIST libadalang-2019-20190510-19916-src.tar.gz 2345942 BLAKE2B 807fd6ea0183b5535e96b258998a0540aa77dec0669db81bae10b56894e12bbb381b356bd55d6684156101d2ea0e5439c2551a4213a81e79e4697a7ff6ba5df2 SHA512 9ebf8d0c01d12f5a8081fced9504b78a45cbde6ecc0e6abeed99aff03abd0b241c1ecba85b256911e474cb77e10e5e387f64d51a2d9b18596baf40313f44f089
 DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
-EBUILD libadalang-2018-r2.ebuild 1435 BLAKE2B e87441fb65d37148c0f254ba803392c79d7eb53f695d328c8d15d19e42c077df3f903cedbacbe751064681096bfd2bedc634fc7d6ac57c026a7fff2dde22939c SHA512 5f5693443efdd6adad23b226618137b5cf2654b4946b992fd87e1f724d530237e938893c84f7d0e7439c98cfb1f91ab9d6823380812aff0212852b55216ff149
-EBUILD libadalang-2019-r1.ebuild 1541 BLAKE2B 11e3e52b1720b65f81bf4be43a9b54d96d5faf97248cae7fd99cf616378a4d105fec3aca2340d0395c6eae900670052c256a82b283d6aaf7b266a2d309ece49b SHA512 bf8a9b5b3b268022ed9dd9ba2f783f537b51024dd61b4c5fddb559474b2603fbcc2ce49f7c10375ab3409f710e209b9a0f9ddf317f7db97d56138ac9f070bf92
+EBUILD libadalang-2018-r2.ebuild 1474 BLAKE2B 800933f822c6eebf2df5fc028cc2466e7a710c9c9781018c5adace37411e52f37ad7991c53b72ffcda2c6495708647670a74c251bd15147ccce5eae779c6362e SHA512 d86bc8c8bf9820c2798e718ad7921d41190a53c7d1937681dab1d6dfb0f8a44a922c688d6d8f6e28a6f13419b198cc9d333af52eed1784852f26b0b99ab389eb
+EBUILD libadalang-2019-r1.ebuild 1575 BLAKE2B 903e51b81f03f4d355e141777912b9eedca60aff518f3d1d2a505cb4074929515cacb6390f24af761c1f4c47d26bfa4636fe490cc3a3969f1b02033213b803f8 SHA512 b7e7f2b2e8fde34faa64f04e59c2b9c7de50ee4120fbf83b73bb7c00a3cf675e570cd8168de530c538c2664b3dac1714d4c17af389b7bfc0530063bf422c1d56
 MISC metadata.xml 574 BLAKE2B d8d9f0fb7ec754f8da6d372845758ef8738e6642eee742532ea1b0389029c4cbcf6cc502886ca11add1ca4dffa6cdc7b708efe397fda10921fe2b67afa1de03f SHA512 62f862b759c82a402015b3dbf6d6979240c642724df3c9591f31ef00a85e65fb3187138672b93f71cbd122083666731be61447acf4e46e24b81d8568778cdad9
diff --git a/dev-ada/libadalang/files/libadalang-2019-pyyaml.patch b/dev-ada/libadalang/files/libadalang-2019-pyyaml.patch
new file mode 100644
index 000000000000..ad78d5af1f33
--- /dev/null
+++ b/dev-ada/libadalang/files/libadalang-2019-pyyaml.patch
@@ -0,0 +1,11 @@
+--- a/ada/testsuite/testsuite_support/polyfill.py	2020-03-26 20:52:45.678476467 +0100
++++ b/ada/testsuite/testsuite_support/polyfill.py	2020-03-26 20:53:13.612979979 +0100
+@@ -368,7 +368,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/libadalang/libadalang-2018-r2.ebuild b/dev-ada/libadalang/libadalang-2018-r2.ebuild
index bbb04ac9fc4f..976d27263cc3 100644
--- a/dev-ada/libadalang/libadalang-2018-r2.ebuild
+++ b/dev-ada/libadalang/libadalang-2018-r2.ebuild
@@ -39,6 +39,7 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${PN}-2017-gentoo.patch
+	"${FILESDIR}"/${PN}-2019-pyyaml.patch
 )
 
 src_configure() {
diff --git a/dev-ada/libadalang/libadalang-2019-r1.ebuild b/dev-ada/libadalang/libadalang-2019-r1.ebuild
index 2d2c39e9b8db..7acb3a03a872 100644
--- a/dev-ada/libadalang/libadalang-2019-r1.ebuild
+++ b/dev-ada/libadalang/libadalang-2019-r1.ebuild
@@ -37,7 +37,10 @@ pkg_setup() {
 	ada_pkg_setup
 }
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-pyyaml.patch
+)
 
 src_configure() {
 	ada/manage.py -v debug generate || die