gentoo resync : 30.06.2019

7 files changed, 15 insertions, 12 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 5a72f4a6725f..1b0da9d29deb 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
index b9c8a16abe7e..1c6b6cb1cfbd 100644
--- a/dev-ada/libadalang-tools/Manifest
+++ b/dev-ada/libadalang-tools/Manifest
@@ -1,5 +1,5 @@
 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 libadalang-tools-2018.ebuild 679 BLAKE2B b2869094c925f06b6e8bb44e0aef8d6c4abc258f2f02d1a6b9b8f7633c1c716db9868dcb90bf63d6c5e1dcc6cb7a6bc7168772daf0a940c2796ff02292f0a31d SHA512 97b31e48174392f26a6fe67a9dfb5f8a4c509e99fff2823b3eced0988dc88f2fd06c1f8d595b5ddd6fa8a978864419dd4f5b390823c8030e86f41003fdcbcccc
-EBUILD libadalang-tools-2019.ebuild 975 BLAKE2B 46a71a146afbb36fa369ea064ceb3e0bc0b2dc61ce7a7dc824eeaf39136b4bf6663716c281d75ab657bcae3d89b2bcd955f832308776c2e8dfdc695509a46a8e SHA512 b08bbdcd0c740e559a03a0cc00b0485a2be6b3dd7865d0228adc18056d97b67277da76202f6b4bb2b990c05cf34521e047ccb5d57de48c87e22e1c13b7a3f07b
+EBUILD libadalang-tools-2019.ebuild 996 BLAKE2B 1f0df32ffc3ab067b1b16800e8d74a10100eda102923c42d300ecfc5793d793df25bc0e1ce3190ec07ed60a1519134d564e6589542ad032f38e7fdcb85fb6945 SHA512 dd1b7275fe9fe232d505563100ff8be90d7c56cd994d077d0707e2d07a8a79919bc029549453a6fa8e92dcf3c3ea0d52f89ab8c9f2817410601b2cf587a07195
 MISC metadata.xml 609 BLAKE2B f462c2a06ef2101b1c03ea448ea0770e108f38530cbeedb332974d686c79ead78cad8c15e1e200c7e9e5005364c3bbfe538bf0820d8bfd701d196bae55c3214d SHA512 6d9183c3467e597593bee1926ce664cde3c3cd764aed941387e979721fee4d3a747ef82143222e78344986c8bf051ac97f698c3410fa97755869470365cec8f0
diff --git a/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild b/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild
index f73772562dc8..283494661fa1 100644
--- a/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild
+++ b/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild
@@ -18,7 +18,8 @@ IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-ada/libadalang[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?,static-libs]
+	dev-ada/libadalang[gnat_2016(-)?]
+	dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?,static-libs]
 	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
 
 S="${WORKDIR}"/${MYP}-src
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index b35189fe5d46..72ddfaa1855f 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -5,7 +5,7 @@ DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf98
 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-2017-r1.ebuild 1089 BLAKE2B ff0e7e37c2f2cf5f7ce0d38b5d0efc073edaf16aa77d65bcf5edad54d234549c33a105164e417a7dc838300415568d34bd2a1dbf3d5d07df99a5e00b2940c331 SHA512 1673bb70bc3a2f323b8ca3cc00d2213e5b6ee81eb90319776845b2ec797ebfca1709ce264cfbe995a76f5ca5d0dd9d91bc80b812d94fef650cc3f6e98b8c5510
-EBUILD libadalang-2018-r1.ebuild 1461 BLAKE2B 5db54ab2e1ee7e876453a85d97fde80e56a935fd5353b37fa07e3e2612cec949295b91f58ee7ad6f2b528890bdbd23ed5f937cac598625bb8b7cf4e3c302010d SHA512 af8bbd96e3f40fd1b24a5dd5fa8397ef40a9717b5ed03f23a9785df0eb80b200acd6453957fa6c616fcf456324f1f475df112b0b481f4b87b1b19a9d44d27f8d
-EBUILD libadalang-2018.ebuild 1328 BLAKE2B 2383fa22a63f725534503d4b70887f68ad807f64290737075b5dc010410006e8c7a2e0ad337f051a887e2982de9096a79a89d2e29252a4f947c5f01fd2fd262b SHA512 2cbb2b9c76b319326a2717be045993d1f465dcfcb4b80b06438a2918d6a3c0dc22c864ffc5a125453ea7fa8159318b36cd63a058f28bc02c17359a83a7c1fe56
-EBUILD libadalang-2019.ebuild 1491 BLAKE2B 8743f6970153af482c07b72e19626260c41ff3e72616f051ebb811d789d7a3fa3c55a3eb3b4adb98a0319b682f54516ed887ee020cbeda34478ebdee4f1ed4a1 SHA512 2690f0a31245e05215fb39d68e6d30f07c1d3b32273e9837d1c9af3479bf1192fd6a065e99093a52b27c6e1bfd4ba602077fafa820f26e3488095531f45e885d
+EBUILD libadalang-2018-r1.ebuild 1461 BLAKE2B 3a5f20ddf7868e8253e761d9aaa3b43064c18f7e45dbb99ecd20b22fe8f7d43530010c3d195693ab75dbd54baae21ad73d6d5b6155f361d115ae45b5cfd76f79 SHA512 489d19ec76fe9e6e7bec478b840a1bee0140827251e165b2941da377dacaef98c0f81d2068b28058d251c88a3c8024bbf6a92436da9ed910abf211bc74960e07
+EBUILD libadalang-2018.ebuild 1327 BLAKE2B 802fdf2de0d0f4659807458581887278febe957924f30e021557566c271fd4301cf3ee1587056d7d29c3a0f964c3f8074bcd0e613105e5030736f7feef1cd10a SHA512 0a08c3661094e31ca8c6bf132fa029da706b10321cf97d14e43cf856da3fba6a890de09353af2a29478a52c538f4d2d06ce4452089e9331164ced4e77d85a696
+EBUILD libadalang-2019.ebuild 1519 BLAKE2B f4b1e6cb07001949b225a57bde98f530e4f93b89ca379f33aa96e14d2f942d9c3fbf223cdeda7c6b3291a97804e9822518ad30bda62ed34ac1e2fb4547a3487b SHA512 a8226f42d074efa3ff295c75ddf1483a539fcfdd425f0008653cee6e2c25e53557cb88b3ea6b9bf7b90c30f71a9417cf430205989bec4ee95f01d22a3923e4ac
 MISC metadata.xml 878 BLAKE2B b8b5f581aa552350fdb737fd9d89fc33a02ccccad106424333f87992a8f9c6ba60d5e70f3aaba1dae13bc117e2ac97f81a66ae6cc34a1aa13a8c86cab08c2a65 SHA512 02ea95c2cf1d7c131edb2634a6daf3fe77d50d2368c1d2afa5ab18c802de0a8b596bd3bf176fbfa67f7cada1d4a8bddc8c51cb444e23ebf0d437c19922c511f9
diff --git a/dev-ada/libadalang/libadalang-2018-r1.ebuild b/dev-ada/libadalang/libadalang-2018-r1.ebuild
index 635ac1d49b1c..1fff1c6e5bfc 100644
--- a/dev-ada/libadalang/libadalang-2018-r1.ebuild
+++ b/dev-ada/libadalang/libadalang-2018-r1.ebuild
@@ -16,16 +16,17 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs"
+IUSE="gnat_2017 +gnat_2018 gnat_2019 +shared static-libs"
 
 RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll-bindings[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+	dev-ada/gnatcoll-bindings[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	~dev-ada/langkit-2018
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+	dev-ada/gprbuild[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( gnat_2017 gnat_2018 gnat_2019 )"
 
 S="${WORKDIR}"/${MYP}
 
diff --git a/dev-ada/libadalang/libadalang-2018.ebuild b/dev-ada/libadalang/libadalang-2018.ebuild
index 6ac7ffb8994b..2f0bf1aa8eee 100644
--- a/dev-ada/libadalang/libadalang-2018.ebuild
+++ b/dev-ada/libadalang/libadalang-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="dev-python/pyyaml
 	dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
-	>=dev-ada/langkit-2018"
+	~dev-ada/langkit-2018"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}
diff --git a/dev-ada/libadalang/libadalang-2019.ebuild b/dev-ada/libadalang/libadalang-2019.ebuild
index 823b7b6d2d1c..b9b7080104d1 100644
--- a/dev-ada/libadalang/libadalang-2019.ebuild
+++ b/dev-ada/libadalang/libadalang-2019.ebuild
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2018(-)?,gnat_2019(-)?]
 	>=dev-ada/langkit-2019"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( gnat_2018 gnat_2019 )"
 
 S="${WORKDIR}"/${MYP}