From af335dfec195859e68a06fc9f62ef8d300cb032e Mon Sep 17 00:00:00 2001 From: Tupone Alfredo Date: Thu, 28 Jun 2018 15:12:38 +0200 Subject: [PATCH] dev-ada/gnatcoll-core: Good for gnat_2017 too Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild index df82b7c3f89f0..ab64589fde3ce 100644 --- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild +++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild @@ -16,21 +16,25 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic" -RDEPEND="dev-lang/gnat-gpl:7.3.1 - dev-ada/libgpr[gnat_2018,shared?,static-libs?,static-pic?] - dev-ada/xmlada[gnat_2018,shared?,static-libs?,static-pic?]" +RDEPEND=" + dev-ada/libgpr[gnat_2017=,gnat_2017=,gnat_2018=] + dev-ada/libgpr[shared?,static-libs?,static-pic?]" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2018] + dev-ada/gprbuild[gnat_2017=,gnat_2017=,gnat_2018=] !dev-ada/gnatcoll" -REQUIRED_USE="!gnat_2016 !gnat_2017 gnat_2018" +REQUIRED_USE="!gnat_2016 || ( gnat_2017 gnat_2018 )" S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { - GCC_PV=7.3.1 + if use gnat_2017; then + GCC_PV=6.3.0 + else + GCC_PV=7.3.1 + fi default sed -i \ -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \