[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/

[Sam James]

commit:     970b5e36b2f2f92cee2f4f1bda965230b9d6ba18
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 21:10:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 21:11:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970b5e36

sys-devel/gcc: sync 9.x boilerplate w/ newer versions

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/gcc/gcc-9.5.0.ebuild | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/sys-devel/gcc/gcc-9.5.0.ebuild b/sys-devel/gcc/gcc-9.5.0.ebuild
index 868742a9b878..530a5a440515 100644
--- a/sys-devel/gcc/gcc-9.5.0.ebuild
+++ b/sys-devel/gcc/gcc-9.5.0.ebuild
@@ -7,23 +7,35 @@ TOOLCHAIN_PATCH_DEV="sam"
 PATCH_GCC_VER="9.5.0"
 PATCH_VER="2"
 
-if [[ $(ver_cut 3) == 9999 ]] ; then
+if [[ ${PV} == *.9999 ]] ; then
        MY_PV_2=$(ver_cut 2)
+       MY_PV_3=1
        if [[ ${MY_PV_2} == 0 ]] ; then
                MY_PV_2=0
+               MY_PV_3=0
        else
-               MY_PV_2=$(($(ver_cut 2) - 1))
+               MY_PV_2=$((${MY_PV_2} - 1))
        fi
 
        # e.g. 12.2.9999 -> 12.1.1
-       TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+       TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+       # Cheesy hack for RCs
+       MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 
1)))-RC-$(ver_cut 5)
+       MY_P=${PN}-${MY_PV}
+       GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+       TOOLCHAIN_SET_S=no
+       S="${WORKDIR}"/${MY_P}
 fi
 
 inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+if tc_is_live ; then
+       # Needs to be after inherit (for now?), bug #830908
+       EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+       KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+fi
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"