dev-ada/aws: Add gnat_2016 & gnat_2017 use flags

Package-Manager: Portage-2.3.6, Repoman-2.3.1

3 files changed, 40 insertions, 23 deletions

diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild
index 05c513a863d2..a4ef8853e307 100644
--- a/dev-ada/aws/aws-2016.ebuild
+++ b/dev-ada/aws/aws-2016.ebuild
@@ -14,13 +14,14 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> ${MY_P}.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="gnat_2016 gnat_2017"
 
-RDEPEND="dev-ada/xmlada[static]"
+RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
 DEPEND="${RDEPEND}
-	dev-ada/gnat_util[static]
-	dev-ada/asis
-	dev-ada/gprbuild"
+	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
+	dev-ada/asis[gnat_2016=,gnat_2017=]
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MY_P}
 
@@ -31,10 +32,13 @@ src_configure() {
 }
 
 src_compile() {
-	emake GCC=${ADA} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	else
+		GCC_PV=6.3.0
+	fi
+	emake GCC=${CHOST}-gcc-${GCC_PV} \
+		PROCESSORS=$(makeopts_jobs) \
+		DEBUG=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
 }
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index 0c02b4593056..4bed4c10f179 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.ebuild
@@ -15,13 +15,14 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="gnat_2016 gnat_2017"
 
-RDEPEND="dev-ada/xmlada[static]"
+RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
 DEPEND="${RDEPEND}
-	dev-ada/gnat_util[static]
-	dev-ada/asis
-	dev-ada/gprbuild"
+	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
+	dev-ada/asis[gnat_2016=,gnat_2017=]
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MY_P}
 
@@ -32,10 +33,13 @@ src_configure() {
 }
 
 src_compile() {
-	emake GCC=${ADA} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	else
+		GCC_PV=6.3.0
+	fi
+	emake GCC=${CHOST}-gcc-${GCC_PV} \
+		PROCESSORS=$(makeopts_jobs) \
+		DEBUG=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
 }
diff --git a/dev-ada/aws/metadata.xml b/dev-ada/aws/metadata.xml
index 043b40ed02a5..7662c41c5d1c 100644
--- a/dev-ada/aws/metadata.xml
+++ b/dev-ada/aws/metadata.xml
@@ -5,7 +5,16 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<use>
+		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
+		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
+	</use>
 	<longdescription lang="en">
-		 AWS is a complete framework to develop Web based applications. The main part of the framework is the embedded Web server. This small yet powerful Web server can be embedded into your application so your application will be able to talk with a standard Web browser like Microsoft Internet Explorer or Firefox for example. Around this Web server a lot of services have been developed.
+		AWS is a complete framework to develop Web based applications. The main part
+		of the framework is the embedded Web server. This small yet powerful Web
+		server can be embedded into your application so your application will be
+		able to talk with a standard Web browser like Microsoft Internet Explorer or
+		Firefox for example. Around this Web server a lot of services have been
+		developed.
 	</longdescription>
 </pkgmetadata>