gentoo resync : 24.12.2018

4 files changed, 47 insertions, 63 deletions

diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 5588fed25962..3c2481f75527 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,9 +1,9 @@
 AUX gps-2017-gentoo.patch 13283 BLAKE2B 91b546a0ad1f78fc087980b1366f2e3d22bcc9584df7b975d99122b51a6251ec87532c904411cf4cd95c6898e7a9217a8429cf0157db0f8ad6aef94fed778361 SHA512 82caf18d500d10f6841140f57528726e1dd6d115e5ad6538442af80abe0068b98f137fc35027ded1ef3603e3c7003de0f1ff4cc7eb93d6d8863909fa61fc635b
-AUX gps-2018-gentoo.patch 4357 BLAKE2B f0097fb364986857139c96c29bf9abe43b894629518e584b16e949a505252483efe94533d3185a838eaad87af487491bb4a2c1fb1a4a87d0633bd9b731d3b6cc SHA512 5b77e991bf0eb9a873a76e2eaccf0bfc6ce0536c093992292791892793f4483544c39fe473ab60b47479e38ef5ebebc4bd98f9335d906727e442652f3b2ded8d
+AUX gps-2018-gentoo.patch 2976 BLAKE2B dd72c2c4c8dc8f971b819eb76b4433dd78c587d79bd903e17be0fd879027638821edaa625a64f355b2355a37fa7472b9c1b1072e06fd24c9c5547369916f2bde SHA512 fbfb23f29de218ca1371e39aed70aa4ef22080a11aa8bcbd13ef3ea6b68f69db9a4c6f6f5c7c0cefa85ef6495685fb9811de2521b3085f2f25d9acce0ad14047
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
 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 2102 BLAKE2B 6cbd6490b0e1cc1399ae54921abe97a54f28582f40af3485e6cc90535e7be4513cc4bc79dc84e11c477deecf964b1f0553b374cb3fd44bce5c6bd288bb44fef6 SHA512 3237b0abd2ee89851eb2e5232833e7536e501d3e5942329fe0d5c538ca6dd070e865e04b8a16acf237573851acb23d710f2c48ddc4488064f922691c2ca38ce5
-EBUILD gps-2018.ebuild 1837 BLAKE2B 5794a97f5e88cf770bbe035450c9ed5cefdc3a40e183bbaf25ee4c17e9fe4eb758f5454ffa1b5c031ffb25feee1d724a12d1a01e0619d2066883ac8921d63e5a SHA512 b428f2b394f3b1a91884a8a27d6b786120c3b7805e6d9b377a2c8dcf61a02a5c82fb4a630087c6957975af6d57b3ce85badef159ab221b02fd63ef3443f18f7f
+EBUILD gps-2017.ebuild 2120 BLAKE2B a78b670ff9915bef812bb51b8a45e26feb1ec109b5cafcc1dbfbe3628aa33a02d32585829424e9660cb3759d464d7aca413c038aa5db2d24f0513ba86d2bfbf9 SHA512 f50681981837153b0df3080992c57c17315afbcc90848fe803b03d504284eb6f4f0a8c24cc2caa6aef2e4b5f29fb70af3b06b3c684e5b37844d350e1fa1150a0
+EBUILD gps-2018.ebuild 2289 BLAKE2B 8e8ad988d31b07636b8f3565198035a612dd4bec959ee8564b9d2f5f169ca3b701d4fad37a16b17eb63ef1ab8b6ea4a3a00ef1e2a9387a894f126bf32773f445 SHA512 ebbc185ea3bdffb2fd21bedd2233e6704a30cfc409f127e90b666160c3302f30b08e7238b01a8314320a1b1ca4ed5def3989c2b771f7b717c8aa6e618c3fba1e
 MISC metadata.xml 657 BLAKE2B c97ff9ab3140c87cb2066f25c639c3a5053c0775abfe23937b92f912ff71299bf136de797de6fd1010d576ba44f4e1b1f6e7dae4d1e076682382b33482240606 SHA512 498222549bd8c7e48575bdc0250cc810540928b19819759ba8a4f9b3aea39ad1b7b579b988a26b1bcf109774b356c7635e11e5e42a41dc76af8d9230a63f9d91
diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch
index 06a080b69d56..6e258bac36a0 100644
--- a/dev-ada/gps/files/gps-2018-gentoo.patch
+++ b/dev-ada/gps/files/gps-2018-gentoo.patch
@@ -75,43 +75,3 @@
         <string />
     </project_attribute>
  
---- a/gnatcoll_extras/gnatcoll_extras.gpr	2018-07-22 14:42:17.618161040 +0200
-+++ b/gnatcoll_extras/gnatcoll_extras.gpr	2018-07-22 14:43:33.973070921 +0200
-@@ -14,6 +14,7 @@
-       for Switches ("C") use
-         ("-g", "-O2")
-         & Shared.Gtk_Cflags & Shared.Pygobject_Include & Shared.Python_Cflags;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end GNATCOLL_Extras;
---- a/widgets/widgets.gpr	2018-07-22 21:46:23.907355738 +0200
-+++ b/widgets/widgets.gpr	2018-07-22 21:47:02.673825994 +0200
-@@ -14,6 +14,7 @@
-       for Switches ("C") use
-         ("-g", "-O2")
-         & Shared.Gtk_Cflags;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end Widgets;
---- a/common/common.gpr.in	2018-07-25 08:05:45.227060250 +0200
-+++ b/common/common.gpr.in	2018-07-25 08:06:55.067009811 +0200
-@@ -23,6 +23,7 @@
-              for Switches ("dynamic_arrays.adb") use No_Checks;
-           when "Debug" =>
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Binder is
---- a/shared.gpr.in	2018-07-25 08:11:47.317597391 +0200
-+++ b/shared.gpr.in	2018-07-25 08:10:56.774362671 +0200
-@@ -60,6 +60,7 @@
-                );
-             for Switches ("C") use Optimize & ("-g", "-O2");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Binder is
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
index ebfb812fbce5..0cc43ab49084 100644
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -16,12 +16,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed03b
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gnat_2016 +gnat_2017 gnat_2018"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,static-libs,tools]
-	>=dev-ada/gtkada-2017
+	dev-ada/gnatcoll[gtk,iconv,pygobject,sqlite,static-libs,tools]
+	~dev-ada/gtkada-2017
 	dev-ada/libadalang
 	dev-libs/gobject-introspection
 	dev-libs/libffi
@@ -73,6 +73,7 @@ src_compile() {
 	ADAFLAGS+=" -fno-strict-aliasing"
 	emake GPRBUILD_FLAGS="-v ${MAKEOPTS} \
 		-XLIBRARY_TYPE=relocatable \
+		-XGPR_BUILD=relocatable \
 		-XXMLADA_BUILD=relocatable"
 }
 
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild
index 85c357baef7e..15d8e2fb9fa8 100644
--- a/dev-ada/gps/gps-2018.ebuild
+++ b/dev-ada/gps/gps-2018.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 autotools desktop
+inherit python-single-r1 autotools desktop llvm
 
 MYP=${PN}-gpl-${PV}-src
 
@@ -16,16 +16,23 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
+IUSE="gnat_2017 +gnat_2018"
 
 RDEPEND="${PYTHON_DEPS}
-	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-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-libs/gobject-introspection
 	dev-libs/libffi
+	gnat_2017? ( sys-devel/llvm:5 )
+	gnat_2018? (
+		|| (
+			sys-devel/llvm:6
+			sys-devel/llvm:7
+		)
+	)
 	sys-devel/clang:=
 	x11-themes/adwaita-icon-theme
 	x11-themes/hicolor-icon-theme
@@ -40,31 +47,47 @@ S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
+pkg_setup() {
+	if use gnat_2017; then
+		GCC_PV=6.3.0
+		LLVM_MAX_SLOT=5
+	else
+		GCC_PV=7.3.1
+		LLVM_MAX_SLOT=7
+	fi
+	GNATMAKE=gnatmake-${GCC_PV}
+	GNATDRV=gnat-${GCC_PV}
+	GNATLS=gnatls-${GCC_PV}
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	GCC_PV=7.3.1
 	default
 	sed -i \
-	-e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \
-	-e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \
-	-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
-	share/support/core/toolchains.py \
-	share/support/core/projects.py \
-	|| die
+		-e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \
+		-e "s:@GNAT@:${CHOST}-${GNATDRV}:g" \
+		-e "s:@GNATLS@:${CHOST}-${GNATLS}:g" \
+		share/support/core/toolchains.py \
+		share/support/core/projects.py \
+		|| die
 	mv "${WORKDIR}"/libadalang-tools-src laltools
 }
 
 src_configure() {
 	econf \
-		GNATMAKE=/usr/bin/gnatmake-7.3.1 \
-		GNATDRV=/usr/bin/gnat-7.3.1 \
+		GNATMAKE=/usr/bin/${GNATMAKE} \
+		GNATDRV=/usr/bin/${GNATDRV} \
 		--with-clang=$(llvm-config --libdir)
 }
 
 src_compile() {
-	CC=/usr/bin/gcc-7.3.1 emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \
+	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
+		-XGPR_BUILD=relocatable" \
 		Build=Production
 	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
-		-cargs:Ada ${ADAFLAGS}
+		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
 }
 
 src_install() {