gentoo resync : 05.02.2020

1 files changed, 13 insertions, 22 deletions

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
index 40b80c33c61e..35dc9364a3d4 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+PATCH_GCC_VER=7.3.0
 PATCH_VER="1.8"
 
-TOOLCHAIN_GCC_PV=7.3.0
-GCC_CONFIG_VER=7.3.1
-
-inherit toolchain-funcs toolchain
+TOOLCHAIN_GCC_PV=7.3.1
 
 REL=7
 MYP=gcc-${REL}-gpl-${PV}-src
 BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
 BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
 
-DESCRIPTION="GNAT Ada Compiler - GPL version"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI+="
+# we provide own tarball below
+GCC_TARBALL_SRC_URI="
 	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5
 		-> ${P}-src.tar.gz
 	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7
@@ -35,18 +32,23 @@ SRC_URI+="
 		)
 	)"
 
+inherit toolchain-funcs toolchain
+
+DESCRIPTION="GNAT Ada Compiler - GPL version"
+HOMEPAGE="http://libre.adacore.com/"
+
 LICENSE+=" GPL-2 GPL-3"
 KEYWORDS="amd64 x86"
 IUSE="+bootstrap"
+RESTRICT="!test? ( test )"
 
-RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"
+RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
 DEPEND="${RDEPEND}
 	elibc_glibc? ( >=sys-libs/glibc-2.13 )
 	>=sys-devel/binutils-2.20"
 
 S="${WORKDIR}"/${MYP}
 PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
 
 pkg_setup() {
 	toolchain_pkg_setup
@@ -80,14 +82,6 @@ src_unpack() {
 		die "ada compiler not available"
 	fi
 
-	GCC_A_FAKEIT="
-		${P}-src.tar.gz
-		${MYP}.tar.gz
-		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
-	if use bootstrap; then
-		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
-	fi
-
 	toolchain_src_unpack
 	if use bootstrap; then
 		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
@@ -133,10 +127,7 @@ src_prepare() {
 
 src_configure() {
 	export PATH=${PWD}/bin:${PATH}
-	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
-	GCC_BRANCH_VER=$(gcc-version)
-	downgrade_arch_flags
-	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
+	downgrade_arch_flags "$(gcc-version)"
 	toolchain_src_configure \
 		--enable-languages=ada \
 		--disable-libada