summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTupone Alfredo <tupone@gentoo.org>2019-11-05 11:53:38 +0100
committerTupone Alfredo <tupone@gentoo.org>2019-11-05 11:53:38 +0100
commit0b4985a8a1dbfa5c68ed5c18922d7b31c591e6d2 (patch)
tree91777722a807f7dae39e87c78739164ccc742428
parentsys-apps/fwupd: avoid gold linker for now (diff)
downloadgentoo-0b4985a8a1dbfa5c68ed5c18922d7b31c591e6d2.tar.gz
gentoo-0b4985a8a1dbfa5c68ed5c18922d7b31c591e6d2.tar.bz2
gentoo-0b4985a8a1dbfa5c68ed5c18922d7b31c591e6d2.zip
dev-ada/gps: fix deps, remove gnat_2017 USE
Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
-rw-r--r--dev-ada/gps/gps-2018-r1.ebuild21
1 files changed, 7 insertions, 14 deletions
diff --git a/dev-ada/gps/gps-2018-r1.ebuild b/dev-ada/gps/gps-2018-r1.ebuild
index 26542379d09..3ec2826b24f 100644
--- a/dev-ada/gps/gps-2018-r1.ebuild
+++ b/dev-ada/gps/gps-2018-r1.ebuild
@@ -19,16 +19,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="gnat_2017 +gnat_2018"
+IUSE="+gnat_2018"
RDEPEND="${PYTHON_DEPS}
- dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref]
- dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python]
- ~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=]
- dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?]
+ dev-ada/gnatcoll-db[gnat_2018=,gnatcoll_db2ada,gnatinspect,xref]
+ dev-ada/gnatcoll-bindings[gnat_2018=,python]
+ ~dev-ada/gtkada-2018[gnat_2018=]
+ ~dev-ada/libadalang-2018[gnat_2018(-)?]
dev-libs/gobject-introspection
dev-libs/libffi
- gnat_2017? ( sys-devel/llvm:5 )
gnat_2018? (
|| (
sys-devel/llvm:6
@@ -52,13 +51,8 @@ S="${WORKDIR}"/${MYP}
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
pkg_setup() {
- if use gnat_2017; then
- GCC_PV=6.3.0
- LLVM_MAX_SLOT=5
- else
- GCC_PV=7.3.1
- LLVM_MAX_SLOT=7
- fi
+ GCC_PV=7.3.1
+ LLVM_MAX_SLOT=7
GNATMAKE=gnatmake-${GCC_PV}
GNATDRV=gnat-${GCC_PV}
GNATLS=gnatls-${GCC_PV}
@@ -67,7 +61,6 @@ pkg_setup() {
}
src_prepare() {
- GCC_PV=7.3.1
default
sed -i \
-e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \