From: Tupone Alfredo <tupone@gentoo.org>
Date: Fri, 20 Apr 2018 06:24:13 +0000 (+0200)
Subject: dev-lang/gnat-gpl: Fix binary install
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4dc25e3544841945836b4ce84bb9858df831ceab;p=gentoo.git

dev-lang/gnat-gpl: Fix binary install

Closes: https://bugs.gentoo.org/653532
Package-Manager: Portage-2.3.24, Repoman-2.3.6
---

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
index 7015061fac26..46b9e7bbbfd8 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
@@ -88,15 +88,16 @@ pkg_setup() {
 		GNATBIND="${path}/${GNATBIND}"
 		CXX="${path}/${CXX}"
 	fi
+}
+
+src_unpack() {
 	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 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 the bootstrap use flag"
 		die "ada compiler not available"
 	fi
-}
 
-src_unpack() {
 	GCC_A_FAKEIT="${P}-src.tar.gz
 		${MYP}.tar.gz
 		${FSFGCC}.tar.bz2
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
index dde7fbf04a93..eeaf6193796f 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
@@ -70,16 +70,16 @@ pkg_setup() {
 	if [[ ${gnatpath} != "." ]] ; then
 		GNATMAKE="${gnatpath}/${GNATMAKE}"
 	fi
+}
 
+src_unpack() {
 	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 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 the bootstrap use flag"
 		die "ada compiler not available"
 	fi
-}
 
-src_unpack() {
 	GCC_A_FAKEIT="
 		${P}-src.tar.gz
 		${MYP}.tar.gz