diff options
| -rw-r--r-- | dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild | 30 | ||||
| -rw-r--r-- | dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild | 29 | ||||
| -rw-r--r-- | dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild | 30 | ||||
| -rw-r--r-- | dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild | 30 | ||||
| -rw-r--r-- | 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 eeeeaf2c0388..d9b01134a7c3 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 bff11256c1f6..bdbf1fafb6e7 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 bb4782b8d4be..87b416731cdb 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 397ec960074f..173c640d4b94 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 1e59a7091c9f..10317ef96f88 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}" |