gentoo Easter resync : 12.04.2020

11 files changed, 49 insertions, 15 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 45506ff0c511..615e9c0a87ac 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 9dcef4363dfb..b70d5efed892 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -7,5 +7,5 @@ DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365
 DIST libadalang-tools-2019-20190517-195C4-src.tar.gz 625775 BLAKE2B 2ec69e307576c505d20a43d229b13404966f4442778e5390da327ae71cc065873de4fff03a720949fa6bfb5ce66f405e7d45f7f0c21032a639efcff208323aed SHA512 b7368606847244cbb08ff2111fabfbfc8a9aa7f58e953febc70838006d94711dba1fd75bfb69ed2081a37a2dfaaad46097127870696c882d7cc54de5d7b051a1
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
 EBUILD gps-2018-r3.ebuild 2840 BLAKE2B 7fc1ac79ada9aa38b00dd3a35522b2831633162b8af47cb8496038b7197aafc816eee2cd376cea1b3e3591a2ab2bdb353b5fd0127744c9605400a87ad4be8e6a SHA512 3ead8a7005ac456771da699fdb13c55ca135f44e9ba0202aef551de0784b918ed1904bf66c8fd6544d5ab4845f9bbedf4e511a2e8c93bf1a1400474d21007890
-EBUILD gps-2019-r1.ebuild 3167 BLAKE2B 84798d6f06772a5571e3e7e2cb892fa07af56690f7a36833c85f4b57033e86c9cb89d88cf9b586b58c16ecedf880ae58d2f296659c75852daea00819a5dd8108 SHA512 b9a173d7a620c26eb044f4191b75c9670788dc6604d43f020802ca1493d5b4a3b128f37dc27038dbb14d3e0f82f659709c2d6309df815f3bf1c2ff8efe80d53b
+EBUILD gps-2019-r1.ebuild 3189 BLAKE2B ea0b25f94474e0b97c9f91942c834052fa105e80d0d33fed9678e1b397112bcbfde7ae6f4ab98d2eeeadde8c5166c5f8269eb468656fbf06d533895eaede23d5 SHA512 4e68e5815300b096072a9b52f09c5557a553d5320e037feff14d6f57a0024d531e487dc48cbe4dbd00a5f2f655fd50020513f9ca5d7c0a88eeccbaa46e8a9a63
 MISC metadata.xml 406 BLAKE2B 663412f7328e2ed9ca4df57304073e48b2c18d43c84c6a5a4b8331f57f731bd63c38d7eb23b9edb4939e0644238a7883581e3ae50afb708cd263a9c39f936671 SHA512 7e13f81414da0346f385d66d88eca699dab64aeaf7d22a38ff05bec1ddc3fab5f98f7d2049902a75f63bfe10f918c599f15a1497cdb09799fec8330152251b46
diff --git a/dev-ada/gps/gps-2019-r1.ebuild b/dev-ada/gps/gps-2019-r1.ebuild
index 1985f108d722..58c5f6bc13bb 100644
--- a/dev-ada/gps/gps-2019-r1.ebuild
+++ b/dev-ada/gps/gps-2019-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
@@ -34,10 +34,11 @@ RDEPEND="${PYTHON_DEPS}
 	~dev-ada/libadalang-2019[${ADA_USEDEP}]
 	dev-libs/gobject-introspection
 	dev-libs/libffi
-	sys-devel/llvm:7
+	sys-devel/llvm:8
 	sys-devel/clang:=
 	x11-themes/adwaita-icon-theme
 	x11-themes/hicolor-icon-theme
+	dev-python/pygobject:3
 	$(python_gen_cond_dep '
 		dev-python/pep8[${PYTHON_MULTI_USEDEP}]
 		dev-python/jedi[${PYTHON_MULTI_USEDEP}]
@@ -55,7 +56,7 @@ S="${WORKDIR}"/${PN}-${commitId}
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 pkg_setup() {
-	LLVM_MAX_SLOT=7
+	LLVM_MAX_SLOT=8
 	llvm_pkg_setup
 	python-single-r1_pkg_setup
 	ada_pkg_setup
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 1cce10a0ee0d..3bd2035d44be 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,7 +1,8 @@
 AUX langkit-2018-gentoo.patch 2962 BLAKE2B 7da72c1739c972c6d1aa01c84e8fab3f8864c5449bb3717c8515c41f63eb1a2258ae9be0cfd5bb3bf54327fbe552c2448aa2fb80d69814c1d46f34611683d7db SHA512 72c6ba5e4994ef22f6246a196fdae81ee5f77f7f0420fd31b9bfecb32740b8878863ba75d342cb0c5326ca7031260aefc21f57d430866f7008515470d9ee0899
 AUX langkit-2019-gentoo.patch 3308 BLAKE2B 266bd5bd1d507a565c325e5668eebc3a2a96a448656a6c1f74644d222a4fbdb1cc77eb0c51a33d9453c19a958ed0867bdb59245f09c2b383c59cbd62f699c277 SHA512 d85677824a2da7a8b3c06b665a8e517d7151da4ff458fa595e7c5b71dcf4f78a5a0914e9fe8f8a700b0422071af4d6e4890bc8e70c539f59ae25f89c19d4a8d9
+AUX langkit-2019-pyyaml.patch 558 BLAKE2B 811deec6f63e8408f07df7b526a5f4e743c14d3757d92cfcd88400a5cc759374ba8c12f43b8551c565e570cd492025276b7c228610a0517c700e047b3f227677 SHA512 4281f14588fe92c19a2372d615f1ec792a69432dd8bfb5ee4ef8f7ee0cf831f57812be6aacaf5f766ab7d660a0a998898ae318b31688d5a75972cd18342efe4d
 DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b
 DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f
-EBUILD langkit-2018.ebuild 1031 BLAKE2B 70e31054892cb9d53288827932fbbc57d6584ec87168a3dc461c993618eb46198ea9045600fb2f76d595ba63b6faa0bd28c2a9effac09691818552049eaa3024 SHA512 819a47dec6c36f66ac1240f2dd7d7cfb469604f8c12d10d095ba4010d9aadc04ae6cf72cf4a08b37cacc87ebd9cdc0baef85c6945c48f32dc9c4200c37b11b84
-EBUILD langkit-2019.ebuild 1078 BLAKE2B abd78945ddafd9a7105afef643feed551132bf488b8e98710b4a3dc97415547b0b2e4cc62a61848578eede16b87930a88aa7bdde477df01afdd6f301e27c89b1 SHA512 5171e2f76e59d918ef4f4e338ddba1213393a69a7b52892400c96f63418c09dd13376f4fd4e60acce57a8b391f664598989e3f648fa32d32c8b8cf320db6fee9
+EBUILD langkit-2018.ebuild 1049 BLAKE2B 97dfaf5ffb20d46ff78315333a48d0984512bfdbd20eb0dab024df19494586cc94aed6e8c3030ec7998081ed05d2dd60a9a316af218c2e416a1e9a775d3a07e5 SHA512 cb5f04dd80f16dbb170f1d604ec96554670d85b3167a0e557201ff2aa06b5fb16e8a61e507fa6095208d399503cd531c07a137415804ab1c173f7d3731ea9695
+EBUILD langkit-2019.ebuild 1109 BLAKE2B 8f12cc6f7a8cacd2e04366b2a98a85e0fe89332afa44ae24d3862737fd649345725b9956e4056fd5fdf4c901b4482f035348dd61b9445c22c6bb06870d917e0e SHA512 fe581da40bcac53a3559caa0522ef1c7ad86156f6e58b29224e08996cc32a892b4a1a87bf13352f68e462dcf368aa5c47eb520971ee928ab77376768a1fc2784
 MISC metadata.xml 716 BLAKE2B e32738d2a347420bf4e01dcbcf953cfab18b1c6920a6b52b6278d9fcf26dd26fdb1fb8b490a2f050cbf33efb952768eea2bfeadeb40781783a69ebdad97001de SHA512 8c986d121e0afc68640dc9c5d1e6d3b9dc3bf79fd2ca783a9386c82319a10f8734170b330702cb82d4c790f22d67626606904072f8e57cee32dda5f5fa275714
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 000000000000..58a64992a7c9
--- /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 348ef449845a..743c42e819dd 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 229fdd526dcc..31a57f6edd44 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
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