Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/asis/
Date: Tue, 27 Nov 2018 19:09:06
Message-Id: 1543345734.4fa4e848b50f96fbf78eea3b36f81fe0820432c5.tupone@gentoo
1 commit: 4fa4e848b50f96fbf78eea3b36f81fe0820432c5
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 27 19:08:54 2018 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 27 19:08:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa4e848
7
8 dev-ada/asis: Stable
9
10 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 dev-ada/asis/asis-2018.ebuild | 15 +++++++++++----
14 1 file changed, 11 insertions(+), 4 deletions(-)
15
16 diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild
17 index 88b9ba97d07..adcb08b7417 100644
18 --- a/dev-ada/asis/asis-2018.ebuild
19 +++ b/dev-ada/asis/asis-2018.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2018 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=6
26 @@ -13,10 +13,14 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8
27
28 LICENSE="GPL-3"
29 SLOT="0"
30 -KEYWORDS="~amd64 ~x86"
31 +KEYWORDS="amd64 x86"
32 IUSE="gnat_2016 gnat_2017 +gnat_2018"
33
34 -RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,shared]"
35 +RDEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=,gnat_2018=]
36 + || (
37 + dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,shared]
38 + dev-ada/gnatcoll[gnat_2016=,gnat_2017=,gnat_2018=,projects,shared]
39 + )"
40 DEPEND="${RDEPEND}
41 dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
42
43 @@ -25,9 +29,11 @@ S="${WORKDIR}"/${MYP}
44 PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
45
46 src_compile() {
47 - emake PROCESSORS=$(makeopts_jobs)
48 + emake PROCESSORS=$(makeopts_jobs) \
49 + GPRBUILD_FLAGS="-vl"
50 emake tools PROCESSORS=$(makeopts_jobs) \
51 GPRBUILD_FLAGS="-vl \
52 + -XGPR_BUILD=relocatable \
53 -XLIBRARY_TYPE=relocatable \
54 -XXMLADA_BUILD=relocatable"
55 }
56 @@ -36,6 +42,7 @@ src_install() {
57 emake prefix="${D}"/usr install
58 emake prefix="${D}"/usr install-tools \
59 GPRINSTALL="gprinstall \
60 + -XGPR_BUILD=relocatable \
61 -XLIBRARY_TYPE=relocatable \
62 -XXMLADA_BUILD=relocatable"
63 rm -r "${D}"/usr/share/gpr/manifests || die