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/gnat_util/
Date: Sat, 01 Jul 2017 17:05:03
Message-Id: 1498928683.1c0405d3ca64543da1333880088b8315b0f1ccf3.tupone@gentoo
1 commit: 1c0405d3ca64543da1333880088b8315b0f1ccf3
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 1 17:04:43 2017 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 1 17:04:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0405d3
7
8 dev-ada/gnat_util: 2017 version is only compatible with gnat-gpl-2017
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 dev-ada/gnat_util/gnat_util-2017.ebuild | 14 ++++----------
13 1 file changed, 4 insertions(+), 10 deletions(-)
14
15 diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
16 index 90558f72e05..cd40316597f 100644
17 --- a/dev-ada/gnat_util/gnat_util-2017.ebuild
18 +++ b/dev-ada/gnat_util/gnat_util-2017.ebuild
19 @@ -15,24 +15,18 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
20 LICENSE="GPL-3"
21 SLOT="0"
22 KEYWORDS="~amd64"
23 -IUSE="gnat_2016 gnat_2017 +shared static static-pic"
24 +IUSE="+shared static static-pic"
25
26 -RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
27 - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
28 +RDEPEND="dev-lang/gnat-gpl:6.3.0"
29 DEPEND="${RDEPEND}
30 - dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
31 -REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
32 + dev-ada/gprbuild[gnat_2017]"
33
34 S="${WORKDIR}"/${MYP}-src
35
36 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
37
38 src_compile() {
39 - if use gnat_2016; then
40 - GCC_PV=4.9.4
41 - else
42 - GCC_PV=6.3.0
43 - fi
44 + GCC_PV=6.3.0
45 GCC=${CHOST}-gcc-${GCC_PV}
46 GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
47 emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \