[gentoo-commits] repo/gentoo:master commit in: dev-ada/gnat_util/

[Alfredo Tupone]

commit:     ba89dbb417ba1e5ca8f8233858f051ef5a46ef8e
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 14:42:07 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 14:42:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba89dbb4

dev-ada/gnat_util: Add use flag gnat_* to 2017 version

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 dev-ada/gnat_util/gnat_util-2016.ebuild |  3 ++-
 dev-ada/gnat_util/gnat_util-2017.ebuild | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
index f3a43667276..81f44021d41 100644
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2016.ebuild
@@ -9,7 +9,8 @@ MYP=${PN}-gpl-${PV}
 
 DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
 HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6 -> ${MYP}-src.tar.gz"
+SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6
+	-> ${MYP}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"

diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
index cd40316597f..afceac74106 100644
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017.ebuild
@@ -15,18 +15,24 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+shared static static-pic"
+IUSE="gnat_2016 gnat_2017 +shared static static-pic"
 
-RDEPEND="dev-lang/gnat-gpl:6.3.0"
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2017]"
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+REQUIRED_USE="!gnat_2016 gnat_2017"
 
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-	GCC_PV=6.3.0
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	else
+		GCC_PV=6.3.0
+	fi
 	GCC=${CHOST}-gcc-${GCC_PV}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \