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 A439D1382C5 for ; Wed, 19 May 2021 17:34:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BB55E087C; Wed, 19 May 2021 17:34:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DB19FE087C for ; Wed, 19 May 2021 17:34:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D8EDE340DE9 for ; Wed, 19 May 2021 17:34:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73E835D2 for ; Wed, 19 May 2021 17:34:18 +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: <1621445633.b29590c5ab5e2eabbf8c27a5f4c137979fa0dae7.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild dev-lang/gnat-gpl/gnat-gpl-2020.ebuild X-VCS-Directories: dev-lang/gnat-gpl/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: b29590c5ab5e2eabbf8c27a5f4c137979fa0dae7 X-VCS-Branch: master Date: Wed, 19 May 2021 17:34:18 +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: 1ee542d0-477f-4fe4-afe7-489a082284d2 X-Archives-Hash: 41e9618cd2ffe15de6944e1a4faa4a8a commit: b29590c5ab5e2eabbf8c27a5f4c137979fa0dae7 Author: Alfredo Tupone gentoo org> AuthorDate: Wed May 19 17:33:53 2021 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Wed May 19 17:33:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b29590c5 dev-lang/gnat-gpl: fix VariableScope Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild | 30 +++++++++++++----------------- dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild | 29 +++++++++++++---------------- dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild | 30 +++++++++++++----------------- dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild | 30 +++++++++++++----------------- dev-lang/gnat-gpl/gnat-gpl-2020.ebuild | 28 ++++++++++++---------------- 5 files changed, 64 insertions(+), 83 deletions(-) diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild index eeeeaf2c038..d9b01134a7c 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -67,9 +67,18 @@ S="${WORKDIR}"/${MYP} FSFGCC=gcc-${TOOLCHAIN_GCC_PV} -pkg_setup() { - toolchain_pkg_setup +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 + + toolchain_src_unpack +} +src_prepare() { if use amd64; then BTSTRP=${BTSTRP_AMD64} else @@ -91,23 +100,10 @@ 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 - - toolchain_src_unpack if use bootstrap; then - rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die + rm ../${BTSTRP}/libexec/gcc/*/4.7.4/ld || die fi -} -src_prepare() { cd .. sed -i \ diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild index bff11256c1f..bdbf1fafb6e 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -51,9 +51,18 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MYP} PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" -pkg_setup() { - toolchain_pkg_setup +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 + + toolchain_src_unpack +} +src_prepare() { if use amd64; then BTSTRP=${BTSTRP_AMD64} else @@ -73,23 +82,11 @@ 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 - - toolchain_src_unpack if use bootstrap; then - rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die + rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die fi -} -src_prepare() { CC=${GCC} CXX="${gnatbase/gcc/g++}" GNATBIND="${gnatbase/gcc/gnatbind}" diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild index bb4782b8d4b..87b416731cd 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -50,9 +50,18 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MYP} PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" -pkg_setup() { - toolchain_pkg_setup +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 + + toolchain_src_unpack +} +src_prepare() { if use amd64; then BTSTRP=${BTSTRP_AMD64} else @@ -72,23 +81,10 @@ 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 - - toolchain_src_unpack if use bootstrap; then - rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die + rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die fi -} -src_prepare() { CC=${GCC} CXX="${gnatbase/gcc/g++}" GNATBIND="${gnatbase/gcc/gnatbind}" diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild index 397ec960074..173c640d4b9 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,9 +52,18 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MYP} PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" -pkg_setup() { - toolchain_pkg_setup +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 + + toolchain_src_unpack +} +src_prepare() { if use amd64; then BTSTRP=${BTSTRP_AMD64} else @@ -74,23 +83,10 @@ 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 - - toolchain_src_unpack if use bootstrap; then - rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die + rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die fi -} -src_prepare() { CC=${GCC} CXX="${gnatbase/gcc/g++}" GNATBIND="${gnatbase/gcc/gnatbind}" diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild index 1e59a7091c9..10317ef96f8 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild @@ -52,9 +52,18 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MYP} PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" -pkg_setup() { - toolchain_pkg_setup +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 + + toolchain_src_unpack +} +src_prepare() { if use amd64; then BTSTRP=${BTSTRP_AMD64} else @@ -74,23 +83,10 @@ 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 - - toolchain_src_unpack if use bootstrap; then - rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die + rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/*/4.7.4/ld || die fi -} -src_prepare() { CC=${GCC} CXX="${gnatbase/gcc/g++}" GNATBIND="${gnatbase/gcc/gnatbind}"