1 |
commit: 0b4985a8a1dbfa5c68ed5c18922d7b31c591e6d2 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 5 10:53:38 2019 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 5 10:53:38 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4985a8 |
7 |
|
8 |
dev-ada/gps: fix deps, remove gnat_2017 USE |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
12 |
|
13 |
dev-ada/gps/gps-2018-r1.ebuild | 21 +++++++-------------- |
14 |
1 file changed, 7 insertions(+), 14 deletions(-) |
15 |
|
16 |
diff --git a/dev-ada/gps/gps-2018-r1.ebuild b/dev-ada/gps/gps-2018-r1.ebuild |
17 |
index 26542379d09..3ec2826b24f 100644 |
18 |
--- a/dev-ada/gps/gps-2018-r1.ebuild |
19 |
+++ b/dev-ada/gps/gps-2018-r1.ebuild |
20 |
@@ -19,16 +19,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb |
21 |
LICENSE="GPL-3" |
22 |
SLOT="0" |
23 |
KEYWORDS="amd64 x86" |
24 |
-IUSE="gnat_2017 +gnat_2018" |
25 |
+IUSE="+gnat_2018" |
26 |
|
27 |
RDEPEND="${PYTHON_DEPS} |
28 |
- dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref] |
29 |
- dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python] |
30 |
- ~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=] |
31 |
- dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?] |
32 |
+ dev-ada/gnatcoll-db[gnat_2018=,gnatcoll_db2ada,gnatinspect,xref] |
33 |
+ dev-ada/gnatcoll-bindings[gnat_2018=,python] |
34 |
+ ~dev-ada/gtkada-2018[gnat_2018=] |
35 |
+ ~dev-ada/libadalang-2018[gnat_2018(-)?] |
36 |
dev-libs/gobject-introspection |
37 |
dev-libs/libffi |
38 |
- gnat_2017? ( sys-devel/llvm:5 ) |
39 |
gnat_2018? ( |
40 |
|| ( |
41 |
sys-devel/llvm:6 |
42 |
@@ -52,13 +51,8 @@ S="${WORKDIR}"/${MYP} |
43 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
44 |
|
45 |
pkg_setup() { |
46 |
- if use gnat_2017; then |
47 |
- GCC_PV=6.3.0 |
48 |
- LLVM_MAX_SLOT=5 |
49 |
- else |
50 |
- GCC_PV=7.3.1 |
51 |
- LLVM_MAX_SLOT=7 |
52 |
- fi |
53 |
+ GCC_PV=7.3.1 |
54 |
+ LLVM_MAX_SLOT=7 |
55 |
GNATMAKE=gnatmake-${GCC_PV} |
56 |
GNATDRV=gnat-${GCC_PV} |
57 |
GNATLS=gnatls-${GCC_PV} |
58 |
@@ -67,7 +61,6 @@ pkg_setup() { |
59 |
} |
60 |
|
61 |
src_prepare() { |
62 |
- GCC_PV=7.3.1 |
63 |
default |
64 |
sed -i \ |
65 |
-e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \ |