From: Tupone Alfredo <tupone@gentoo.org>
Date: Tue, 27 Nov 2018 19:08:54 +0000 (+0100)
Subject: dev-ada/asis: Stable
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4fa4e848b50f96fbf78eea3b36f81fe0820432c5;p=gentoo.git

dev-ada/asis: Stable

Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
---

diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild
index 88b9ba97d07e..adcb08b74177 100644
--- a/dev-ada/asis/asis-2018.ebuild
+++ b/dev-ada/asis/asis-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
@@ -13,10 +13,14 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018"
 
-RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,shared]"
+RDEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=,gnat_2018=]
+	|| (
+		dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,shared]
+		dev-ada/gnatcoll[gnat_2016=,gnat_2017=,gnat_2018=,projects,shared]
+	)"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
@@ -25,9 +29,11 @@ S="${WORKDIR}"/${MYP}
 PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
 
 src_compile() {
-	emake PROCESSORS=$(makeopts_jobs)
+	emake PROCESSORS=$(makeopts_jobs) \
+		GPRBUILD_FLAGS="-vl"
 	emake tools PROCESSORS=$(makeopts_jobs) \
 		GPRBUILD_FLAGS="-vl \
+		-XGPR_BUILD=relocatable \
 		-XLIBRARY_TYPE=relocatable \
 		-XXMLADA_BUILD=relocatable"
 }
@@ -36,6 +42,7 @@ src_install() {
 	emake prefix="${D}"/usr install
 	emake prefix="${D}"/usr install-tools \
 		GPRINSTALL="gprinstall \
+		-XGPR_BUILD=relocatable \
 		-XLIBRARY_TYPE=relocatable \
 		-XXMLADA_BUILD=relocatable"
 	rm -r "${D}"/usr/share/gpr/manifests || die