sys-devel/gcc: sync 10.x with live

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

4 files changed, 50 insertions, 44 deletions

diff --git a/sys-devel/gcc/gcc-10.4.1_p20230426-r1.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230426-r1.ebuild
index 0219cb2d8b07..fd84792d2c9a 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20230426-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.4.1_p20230426-r1.ebuild
@@ -3,39 +3,40 @@
 
 EAPI=8
 
-TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
 PATCH_GCC_VER="10.5.0"
 PATCH_VER="6"
 MUSL_VER="2"
 MUSL_GCC_VER="10.5.0"
 
-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="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	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)
 
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+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
+	# Don't keyword live ebuilds
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230517.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230517.ebuild
index 6d1bc02f4dde..89db054045a1 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20230517.ebuild
+++ b/sys-devel/gcc/gcc-10.4.1_p20230517.ebuild
@@ -3,39 +3,40 @@
 
 EAPI=8
 
-TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
 PATCH_GCC_VER="10.5.0"
 PATCH_VER="6"
 MUSL_VER="2"
 MUSL_GCC_VER="10.5.0"
 
-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="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	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)
 
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+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
+	# Don't keyword live ebuilds
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild
index b3e373b6fb27..a3ff836547a0 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild
+++ b/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild
@@ -3,41 +3,43 @@
 
 EAPI=8
 
-TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
 PATCH_GCC_VER="10.5.0"
 PATCH_VER="6"
 MUSL_VER="2"
 MUSL_GCC_VER="10.5.0"
 
-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="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	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)
 
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
+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
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230607.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230607.ebuild
index b3e373b6fb27..a3ff836547a0 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20230607.ebuild
+++ b/sys-devel/gcc/gcc-10.4.1_p20230607.ebuild
@@ -3,41 +3,43 @@
 
 EAPI=8
 
-TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
 PATCH_GCC_VER="10.5.0"
 PATCH_VER="6"
 MUSL_VER="2"
 MUSL_GCC_VER="10.5.0"
 
-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="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	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)
 
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
+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
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"