From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13C5B138334 for ; Tue, 5 Nov 2019 10:54:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AFEDE08B0; Tue, 5 Nov 2019 10:54:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22BD7E08B0 for ; Tue, 5 Nov 2019 10:54:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C85B34C59B for ; Tue, 5 Nov 2019 10:54:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3AD8621 for ; Tue, 5 Nov 2019 10:53:58 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1572951218.0b4985a8a1dbfa5c68ed5c18922d7b31c591e6d2.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gps/gps-2018-r1.ebuild X-VCS-Directories: dev-ada/gps/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 0b4985a8a1dbfa5c68ed5c18922d7b31c591e6d2 X-VCS-Branch: master Date: Tue, 5 Nov 2019 10:53:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ed1be538-caed-4f79-9601-8137cb81c95a X-Archives-Hash: 40bf2c63a2dee5a2226fbc8694aa8686 commit: 0b4985a8a1dbfa5c68ed5c18922d7b31c591e6d2 Author: Tupone Alfredo gentoo org> AuthorDate: Tue Nov 5 10:53:38 2019 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Tue Nov 5 10:53:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4985a8 dev-ada/gps: fix deps, remove gnat_2017 USE Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gps/gps-2018-r1.ebuild | 21 +++++++-------------- 1 file 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" \