gentoo resync : 02.08.2019

8 files changed, 13 insertions, 9 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 4aa5acfaec55..c96f4a2ab0bf 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 7d1749be3b49..8c3ad6a4a7b4 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,5 +1,5 @@
 AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
 DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
-EBUILD gnatcoll-db-2018-r1.ebuild 2762 BLAKE2B 8a6825d2ac13b1b1692474a0e9d41369ee4720986ae142287700ca8c97ab242e3ac24f555a6e7245a9413552005006a7952a25e3473e1bd5431d0de77191cd35 SHA512 a1d100ffe86b45185ed4e7f2ebcdd630a67f00ec23dd43ef73a598083d92a68aa2fcb41a6cb12fbb5a9db4d87b4354f3a28ac4101a5a8b5e08e02db7b65f8611
+EBUILD gnatcoll-db-2018-r1.ebuild 2802 BLAKE2B 4804c796c704d417276f345f97b02089edbe911e43c05ca5209c8f824131b5de4fd9cae0404dbdce90835a84ba20e0d16f6bf2d3692f869d26d98e55cfbf33ce SHA512 47ef7f0a0aab10023565291e049b7290c1a6af1c22158a41cd4ffcde4be503bdc18ed7f17a8f657df79e11c6bc1ebc550d54ec13cae14be5364a8963946cef20
 EBUILD gnatcoll-db-2018.ebuild 2633 BLAKE2B 87dd5f392ab6986ba13268ca70c7c873486471c9dd4e62f8160666a149a386249693506c244b02b455f47f033c28325da27c7ca893ca93a7cae4a39a1fa9e8d8 SHA512 5e0885514dc75800d83b444f53d5487b1c0ea3faf04581335f876cd64b2631ba541f76fc5bb1b704190f20c13ba9421e0bd7ac7d0e336654de3e3f16f7de2280
 MISC metadata.xml 1555 BLAKE2B 18ba00a762c3ec120d127c9c47f8e7b086fa6126bf6a9196e7ffd7d29f88725d591df937d809c1348e20785d03a6371455fd9ae6ee8b40f68533392ded420279 SHA512 4c515e6411f950d2847076bcd2aca4b49ba9639f439e865c186616e7e7529bbc89f31f8f956e9246d56f68f4f4447849067df71a6fed141a3b2eefe056134186
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
index 8e99e1edcd4c..edb42ca118a3 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_20
 	xref? (
 		dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?]
 		dev-ada/gnatcoll-bindings[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	)"
+	)
+	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
 
@@ -33,7 +34,8 @@ REQUIRED_USE="gnatinspect? ( xref )
 	xref? ( sqlite )
 	sqlite? ( sql )
 	gnatcoll_db2ada? ( sql )
-	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
+	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
+	${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 093ee1e506b1..aba34c05d97f 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -10,6 +10,6 @@ DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
 EBUILD gprbuild-2017-r1.ebuild 2207 BLAKE2B 50a99fa4729a7cb8a9689fa23b6f764be7077094101aa7dbe7452002b7b0c5602dbd82924ef1a6252ce6c973ec5f1ed687ef1d773b43ada1d0a5c707c97d564c SHA512 0c0d40bcd506f86da9e9b1e2d1d57163de5e3dc12095e6566251a673ddc236e099460a83be1a47e2b103d30474c168240257a442ebc5f727633fa6608e105b7b
 EBUILD gprbuild-2018-r3.ebuild 2115 BLAKE2B 6a30d38af19eb3c18bcacae6aa3bdd6e4315102c5f0c3591df90f31e51fa954c654c975c527b8b93d5190851fda8d50cd894050f36cacd351fc707d06dfbf20c SHA512 91dab25795db0e5acfa4d3a1ce9d3653d94726ad9a8f733437b2ea23cda9db17af81c998fa8b70e5ad8d5abb14f15f59aaf9aaf6f4640b11a471b14a5e0b2099
-EBUILD gprbuild-2018-r4.ebuild 2218 BLAKE2B d5fa3a5a331aa64863907e3f20b581f7849dfb9b39e437bb4b37623c987c1ba89326f2b2bad000e7cca887c8f25ee39a1bd0024988d9eec8d4ca9975b5443129 SHA512 e6bbbd20754a90acce55c8f8145e8867491cd0208a0fe19d22e6fdd357a2e17dad9e4cc912d82aa263791cd6cc12c608531f8f72b2d386d35c22fe52dace903a
-EBUILD gprbuild-2019.ebuild 2174 BLAKE2B be188b72986f626ba9c7d70ee89ee631d7631be59d54f583b2100470a54ce1bcf0b282b6b05a9621ff9f29fd8884387e8e499222f4c8b7ff2bddb326f5fa35a0 SHA512 d66953cd304bbc3192121232d3af21f21d34cdb763b3df7cd7b216bb9b868a7fc1909679c6112ed78be8557b72ad06a25ab5b81e8e6e27cfead289626ba2f681
+EBUILD gprbuild-2018-r4.ebuild 2216 BLAKE2B 6f3d2ed1ba98f78f6de056a417b105f4b7fea7913e4f24c96ea0db53efaaa8d5d64e8e8d9b7282c2c2830f20c50a4d490303eba376f50f9cb711104d54ce9dc1 SHA512 30ffb50005d27bb1b16e6b6e55e0ef8d1919e5dd4232fc269931e4b140cb9ca9cdd760142a5e8857b14c2666755ac7ff3dcff600760b6892846cd80a5bef6433
+EBUILD gprbuild-2019.ebuild 2172 BLAKE2B 2bcc8ba9092276d52385120357f1bd6af33368991443e22aa6fd06300d760801f39731e971d8eb9e99c365e15036bdef6d5b969d3255483bae2e4e0e2e8d5554 SHA512 10a95c3cb3c2b23834392e41f234912290f788b0601eb7333276e19dafe50d44499f02931802c29c89d7cc31d32eff62a05465744f74cf779d5d93650a3c113d
 MISC metadata.xml 1093 BLAKE2B 825a9a6458e11fddc7e9e644ba3a6ea24d9ae110384f6db18d348e3a1e87cc9889f103af7f6ef2008284ce3fe87aab1a3b96675a23f686ee1b2e7aa8b275113b SHA512 b4bdcbc66e7cacd1d02b53ea1220cde0b6a40a2edf5b8eda269b6183f6459ce79228515cac6e6a59395288bc067c37285fa6f2bf11456f5b166ceebbc41d7c28
diff --git a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild
index 2b14a7c3d2a9..de11e09704d2 100644
--- a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 		-> xmlada-gpl-${PV}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019"
 
 DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gprbuild/gprbuild-2019.ebuild b/dev-ada/gprbuild/gprbuild-2019.ebuild
index 48221ce5813b..6154806b0698 100644
--- a/dev-ada/gprbuild/gprbuild-2019.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2019.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${XMLADA}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2017 gnat_2018 +gnat_2019"
 
 DEPEND="gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 8c265092ca37..dd0f05d80409 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -6,5 +6,5 @@ DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12
 DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
 EBUILD gps-2017.ebuild 2120 BLAKE2B a78b670ff9915bef812bb51b8a45e26feb1ec109b5cafcc1dbfbe3628aa33a02d32585829424e9660cb3759d464d7aca413c038aa5db2d24f0513ba86d2bfbf9 SHA512 f50681981837153b0df3080992c57c17315afbcc90848fe803b03d504284eb6f4f0a8c24cc2caa6aef2e4b5f29fb70af3b06b3c684e5b37844d350e1fa1150a0
-EBUILD gps-2018-r1.ebuild 3118 BLAKE2B 24faa9b9cdc133350048cf32b41bf5b6a81d3b4cc11080d1cc8653fbd813d25c7303c61349018f9b63e5c07d574c7fa372d26011b5bec10ac8988bf06215bc83 SHA512 42bff264dbc3b35818b556247e4c7f16ece78023fe7e338db3b73f6a44342cd988330f44c7f6c10337117aa3f576b701e6476dade4d89c5004f1dfe7866cc0f2
+EBUILD gps-2018-r1.ebuild 3163 BLAKE2B b97918cfad05d883c0ea9365b73768351c15878a784e3381eefa0b1f24ff319bfdc508c2f615c245fe30e5e3a0a87fb388084fb8dc7224ecf5b8a3a3d1ea24b7 SHA512 b2da7c1b5ebd5726ee1abd24bfb512dfb94ba680a0270bee413f4003eabbc08a16f98bd491e3e7b4385faeb3c431557b5b15063104e5ca84b220a596fefb517c
 MISC metadata.xml 657 BLAKE2B c97ff9ab3140c87cb2066f25c639c3a5053c0775abfe23937b92f912ff71299bf136de797de6fd1010d576ba44f4e1b1f6e7dae4d1e076682382b33482240606 SHA512 498222549bd8c7e48575bdc0250cc810540928b19819759ba8a4f9b3aea39ad1b7b579b988a26b1bcf109774b356c7635e11e5e42a41dc76af8d9230a63f9d91
diff --git a/dev-ada/gps/gps-2018-r1.ebuild b/dev-ada/gps/gps-2018-r1.ebuild
index b8cd9b2a7584..26542379d09d 100644
--- a/dev-ada/gps/gps-2018-r1.ebuild
+++ b/dev-ada/gps/gps-2018-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref]
 	dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python]
 	~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=]
-	dev-ada/libadalang[gnat_2017=,gnat_2018=]
+	dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?]
 	dev-libs/gobject-introspection
 	dev-libs/libffi
 	gnat_2017? ( sys-devel/llvm:5 )
@@ -43,6 +43,8 @@ RDEPEND="${PYTHON_DEPS}
 
 DEPEND="${RDEPEND}"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RESTRICT="test"
 
 S="${WORKDIR}"/${MYP}