[gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/

["Alfredo Tupone" <tupone@gentoo.org>]

commit:     0a8f60efdf18f7b64aefc5cba8e0132acd85c277
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 18:10:33 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 18:10:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8f60ef

dev-ada/gps: use only (gnat)gcc-6.3.0 compiler

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-ada/gps/gps-2017.ebuild | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
index a07971aa8bb..8741b915152 100644
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -36,26 +36,13 @@ S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
-pkg_setup() {
-	GCC=${ADA:-$(tc-getCC)}
-	GNATLS="${GCC/gcc/gnatls}"
-	GNAT="${GCC/gcc/gnat}"
-	GNATMAKE="${GCC/gcc/gnatmake}"
-	if [[ -z "$(type ${GNATLS} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set ADA=gcc-6.3.0 in make.conf"
-		die "ada compiler not available"
-	fi
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	default
+	GCC_PV=6.3.0
 	mv configure.{in,ac} || die
 	sed -i \
-		-e "s:@GNATMAKE@:${GNATMAKE}:g" \
-		-e "s:@GNAT@:${GNAT}:g" \
+		-e "s:@GNATMAKE@:gnatmake-${GCC_PV}:g" \
+		-e "s:@GNAT@:gnat-${GCC_PV}:g" \
 		aclocal.m4 \
 		|| die
 	eautoreconf