gentoo resync : 03.11.2018

8 files changed, 215 insertions, 16 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 2ba8aa90cfa3..294dce84c352 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 6073d83c9410..b52ff447e90e 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,4 +1,4 @@
 AUX gnatcoll-db-2018-gentoo.patch 785 BLAKE2B 9136909b36568f624271e3244847702df3b53a86675e819989f32da258ace77d6b96e4a11cd8881a04f4348c44ec287274256909af8e94be3a0d9d95bffa4b9f SHA512 036434974dd482f6945beb23ab857961d6a92feb37b91bbe6f0cad74a1ebec81332cd7df872050720c52c784d6d0cbf9f0d856b832d940e156327093bdacba4d
 DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
-EBUILD gnatcoll-db-2018.ebuild 2696 BLAKE2B f815be52b5a6a5d336789da2355b8037568ef9ce7f1ace2f581289d0b752948e836b1ba45a33c160a7af7fdefacdd15da671ce47918469bdfecbb2b846ddfde5 SHA512 f4e531f53ea0fe85799f8855f019dae96fe490d841a44358eb738607c8d48fed830f43523fd14e6636ddc0f790becdffb20f5448b206272204b141fc3ad7771e
+EBUILD gnatcoll-db-2018.ebuild 2693 BLAKE2B fef5d254fa6c2a9825c4bc80e0de292b6129b2b9bca38ec80860236f2d4976df8ebf39210606b3b694cd74facbf0c1768667fe535983a1bed917c2c708ee8d74 SHA512 bfa5011db3a17d292fe4c0f5867c8066c52762d8d89fdcad1c35429d848271a1348308c0bbdb1399b4a7bf64c605d00ded547cca72b2f20e55ff213d5bda4f2d
 MISC metadata.xml 1519 BLAKE2B 93aa938ca272fb984d08a0471ff339204d0afc854f9fddc4c1f0e060650263c36166e1de91453bdfd52bc0d53844c7042c6f5b14d955b72ab042e6dffadaf4f4 SHA512 27cf0aa52080186fd7970dc02f31eb861ee20edc08366926ea29ec0a826d10c92d80eea840a403fe9be1ccf0be33aaf866f94fe66d351926ffb30104ce143e88
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
index 912baaa00955..48085f332679 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,9 +30,9 @@ DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
 REQUIRED_USE="!gnat_2016
-	sqlite? ( sql )
-	xref? ( sqlite )
 	gnatinspect? ( xref )
+	xref? ( sqlite )
+	sqlite? ( sql )
 	gnatcoll_db2ada? ( sql )"
 
 S="${WORKDIR}"/${MYP}-src
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index ebd193c98080..625f0068f1bc 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,3 +1,4 @@
+AUX gprbuild-2017-config.patch 5387 BLAKE2B 0c4e970a384dfa569b44dfa0596fd8e7302f9259eede555c7c760e9291bcb6e68b65d1c405840ac1f917bced6c768d2fd189514e871071f0ad6d19ee7289a0ee SHA512 71e95e20e8624f3a05f04e4ad0a80c92c0069c854c82a48aab90f1c8e1cbb4cb4f83a0500d04fd77969b41caeac6c67b3f38a7aa16e520b19bb91a0f8ad8c912
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
 AUX gprbuild-2017.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
 AUX gprbuild-2018-gentoo.patch 10903 BLAKE2B ac85c698dd4f0fac0eb2e309cffac073608470408268763a4bea1be4716876fb57271e17b25d98e362dfe8f0b32b7f86f0079352f9a7336e3819fa40c5e05534 SHA512 b2c0a2d0df73d60ab1414675a9cc1cd77adf85076f8904ee7163fb1b2edaa70ebfea6addc6c5bf811d40a55e25d0369c5a25bddf8e6dcbd856fb4ef918d724f2
@@ -5,6 +6,7 @@ DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
+EBUILD gprbuild-2017-r1.ebuild 2101 BLAKE2B 0fb50050923296b7e504b3c1926795e50826a05278c140f43285f38ac0e4b00baec80fa5f9f1c002e1789ae98362c66cab3dc60642bc38069881245eedbd415e SHA512 b47f67bad885d74ae5af029de3f5aa1b22aac7fc82dda86883cd036a42d87bc1b1b9775418e1047f4f610b0168ada84a5905a657c0b750759439d3587f633454
 EBUILD gprbuild-2017.ebuild 2019 BLAKE2B f90f05d9e8272399cf3b231631f58df984cdb4d2d3cec2591cb14e1736d218befe14b2b3d1f02ee287f0e6b588b70f3a2ab0d05d0d5404c78645b233b3bcc46b SHA512 6735d6e22ee72d60e7300fc3cd99e7065d3203feddc3a296352bedbecd3f780eba8f776c07bf859404acf24b731387caf44208641b6ec5e8a35ce4b42dc2ce60
 EBUILD gprbuild-2018-r3.ebuild 2273 BLAKE2B 2b7b6eb22413a09dd3715f1ede55728d5f7b25121607f09de49522012ad8e967208b349d8be11f7cdd6d7e07dff492d477dcd4229cc61b50b60c53c5484899c2 SHA512 712601d90df99e241c6304f7b7faac8c11b11905d054d7ae806498ef9d8d8bcd3bdc2544d9ffe0ec3a65ca7875ab1d0741d060441386adbaadf63683a6e45d25
 MISC metadata.xml 1057 BLAKE2B 5f0e5e778d450e3f0d37ad489e0be03f69bdcd35e60d1555468ba69608268d7ff0bbffece8b36cac58a84a5739f381a449fe9684f7d5540ff8817ea5ac2b8562 SHA512 753f7ba070723fb9ae26bdb8580d72656d115c7f5515fc11fe4933a216bd0e0734a0a410bd14011a2cff0cc791a93b132d2bddfe889aea372d955c38dd91e650
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
new file mode 100644
index 000000000000..72f1fd829c1c
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
@@ -0,0 +1,113 @@
+--- a/share/gprconfig/compilers.xml	2018-10-27 09:04:53.830077299 +0200
++++ b/share/gprconfig/compilers.xml	2018-10-27 09:05:14.883724079 +0200
+@@ -20,15 +20,15 @@
+   <!--    GCC 3.x & 4.x (not for GNAT Pro)-->
+   <compiler_description>
+     <name>GCC</name>
+-    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
++    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
+     <version>
+-      <external>${PREFIX}gcc -v</external>
++      <external>${PREFIX}gcc-@VER@ -v</external>
+       <nogrep regexp="for GNAT Pro"></nogrep>
+       <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
+     </version>
+     <languages>C</languages>
+     <target>
+-      <external>${PREFIX}gcc -dumpmachine</external>
++      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
+       <grep regexp="[^\r\n]+"></grep>
+     </target>
+   </compiler_description>
+@@ -325,14 +325,14 @@
+    -->
+   <compiler_description>
+     <name>GNAT</name>
+-    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gnatls</executable>
++    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gnatls-@VER@</executable>
+     <version>
+-      <external>${PREFIX}gnatls -v --version</external>
++      <external>${PREFIX}gnatls-@VER@ -v --version</external>
+       <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+     </version>
+     <languages>Ada</languages>
+     <variable name="gcc_version">
+-      <external>${PREFIX}gcc -v</external>
++      <external>${PREFIX}gcc-@VER@ -v</external>
+       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+     </variable>
+     <runtimes default="default,kernel,native">
+@@ -342,7 +342,7 @@
+        <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
+     </runtimes>
+     <target>
+-      <external>${PREFIX}gcc -dumpmachine</external>
++      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
+       <grep regexp="[^\r\n]+"></grep>
+     </target>
+   </compiler_description>
+@@ -509,21 +509,6 @@
+     </target>
+   </compiler_description>
+ 
+-  <!-- LLVM Compiler -->
+-  <compiler_description>
+-    <name>LLVM</name>
+-    <executable>clang</executable>
+-    <version>
+-      <external>clang -v</external>
+-      <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
+-    </version>
+-    <languages>C</languages>
+-    <target>
+-      <external>clang -dumpmachine</external>
+-      <grep regexp="[^\r\n]+"></grep>
+-    </target>
+-  </compiler_description>
+-
+   <!--  Windres compiler -->
+   <compiler_description>
+     <name>WINDRES</name>
+--- a/share/gprconfig/gnat.xml	2018-10-27 09:38:31.615357671 +0200
++++ b/share/gprconfig/gnat.xml	2018-10-27 09:40:54.603044560 +0200
+@@ -60,7 +60,7 @@
+    &filter_gnat;
+    <config>
+    package Compiler is
+-      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
++      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
+       for Language_Kind            ("Ada") use "unit_based";
+       for Dependency_Kind          ("Ada") use "ALI_File";
+       for Leading_Required_Switches        ("Ada") use
+@@ -77,6 +77,9 @@
+       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
+       for Driver         ("Ada") use
+           "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
++      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
++      for Required_Switches ("Ada") use
++          Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
+    end Binder;
+ 
+    for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
+--- a/share/gprconfig/c.xml	2018-10-27 09:42:01.327035277 +0200
++++ b/share/gprconfig/c.xml	2018-10-27 09:42:16.529803718 +0200
+@@ -14,7 +14,7 @@
+      </compilers>
+      <config>
+    package Compiler is
+-      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc";
++      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
+    end Compiler;
+      </config>
+    </configuration>
+--- a/share/gprconfig/linker.xml	2018-10-27 09:43:17.934862859 +0200
++++ b/share/gprconfig/linker.xml	2018-10-27 09:43:54.127304471 +0200
+@@ -742,7 +742,7 @@
+    for Shared_Library_Suffix use ".sl";
+    for Library_Auto_Init_Supported use "true";
+    for Run_Path_Option  use ("-Wl,+b,");
+-   for Library_Partial_Linker use ("gcc", "-nostdlib", "-Wl,-r", "-o");
++   for Library_Partial_Linker use ("gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
+ 
+    package Linker is
+       for Max_Command_Line_Length use "5000";
diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
new file mode 100644
index 000000000000..1f443284e879
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
+		-> ${MYP}-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
+		-> xmlada-gpl-${PV}-src.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 +gnat_2017 gnat_2018"
+
+DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}-src
+
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-config.patch
+)
+
+src_prepare() {
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	else
+		GCC_PV=6.3.0
+	fi
+	default
+	sed -i \
+		-e "s:@VER@:${GCC_PV}:g" \
+		share/gprconfig/compilers.xml \
+		share/gprconfig/gnat.xml \
+		share/gprconfig/c.xml \
+		share/gprconfig/linker.xml \
+		|| die
+	sed -i \
+		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
+		src/gprlib.adb \
+		|| die
+}
+
+src_configure() {
+	emake prefix="${D}"usr setup
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	GCC=${CHOST}-gcc-${GCC_PV}
+	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+	local xmlada_src="../xmlada-gpl-${PV}-src"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs gpr_imports.o || die
+	done
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	einstalldocs
+}
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index e45c583b352e..80a7887e72e4 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -5,5 +5,5 @@ DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad
 DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
 EBUILD gps-2017.ebuild 1946 BLAKE2B 8f1619962738e8d1fe5a60baa3b63bc0318441b95234c0a667d12ad88040a62635b8b46ec94f3598e583dd33a3d88b2bb1f3dcbb191a1c3007eb9efc007144b8 SHA512 67c410fb567b5b82fce282803f5b6292b0b8b221a4f554eab11dd097229e88d614716ee212bf83695721e254892666b1231073d8616da3f2584f3e187fecfc5d
-EBUILD gps-2018.ebuild 1914 BLAKE2B b500fbeba0325dc14a747324fbfe1503a5a92f0305a1caadbe26818422a269f601086d9147a5cfc94ff032e2d27d6d653b32a4f8afe0aa953c60455093b16363 SHA512 16452727dfc6732882ea6b7fddd50c3cf723bde51f51cbd5569c06146bbcac71ea7c9ec2fe2fe8b6a523804bcc6c9715e1143fc2ec181cc9bb206d8e4bb1f18c
+EBUILD gps-2018.ebuild 1837 BLAKE2B 5794a97f5e88cf770bbe035450c9ed5cefdc3a40e183bbaf25ee4c17e9fe4eb758f5454ffa1b5c031ffb25feee1d724a12d1a01e0619d2066883ac8921d63e5a SHA512 b428f2b394f3b1a91884a8a27d6b786120c3b7805e6d9b377a2c8dcf61a02a5c82fb4a630087c6957975af6d57b3ce85badef159ab221b02fd63ef3443f18f7f
 MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild
index 5a97ccc8bd2e..85c357baef7e 100644
--- a/dev-ada/gps/gps-2018.ebuild
+++ b/dev-ada/gps/gps-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://libre.adacore.com/tools/gps/"
 SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
 	-> ${MYP}.tar.gz
 	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
-	    libadalang-tools-gpl-2018-src.tar.gz"
+		libadalang-tools-gpl-2018-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -20,15 +20,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
-	|| (
-		>=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,static-libs,tools]
-		(
-			dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref]
-			dev-ada/gnatcoll-bindings[python]
-		)
-	)
-	>=dev-ada/gtkada-2017
-	dev-ada/libadalang
+	dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref]
+	dev-ada/gnatcoll-bindings[python]
+	>=dev-ada/gtkada-2017[gnat_2018]
+	dev-ada/libadalang[gnat_2018]
 	dev-libs/gobject-introspection
 	dev-libs/libffi
 	sys-devel/clang:=