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

[Sam James]

commit:     7cdf554554f5a61c6fb02018497a8b6ff40e6a97
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 07:45:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 07:45:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdf5545

sys-devel/gcc: add same guard to {10,11}.*.9999

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

 sys-devel/gcc/gcc-10.4.9999.ebuild | 4 +++-
 sys-devel/gcc/gcc-11.4.9999.ebuild | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys-devel/gcc/gcc-10.4.9999.ebuild 
b/sys-devel/gcc/gcc-10.4.9999.ebuild
index 7c518b832b9f..e1dfaacdf1da 100644
--- a/sys-devel/gcc/gcc-10.4.9999.ebuild
+++ b/sys-devel/gcc/gcc-10.4.9999.ebuild
@@ -24,7 +24,9 @@ inherit toolchain
 EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+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
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"

diff --git a/sys-devel/gcc/gcc-11.4.9999.ebuild 
b/sys-devel/gcc/gcc-11.4.9999.ebuild
index 507d5361316d..f03699a5434d 100644
--- a/sys-devel/gcc/gcc-11.4.9999.ebuild
+++ b/sys-devel/gcc/gcc-11.4.9999.ebuild
@@ -23,7 +23,10 @@ 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"
+# 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
 
 # Technically only if USE=hardened *too* right now, but no point in 
complicating it further.
 # If GCC is enabling CET by default, we need glibc to be built with support 
for it.