commit: 656f679cbe64bb08ffbc6c9c9d0af69670866f85 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Mon May 20 10:21:26 2024 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Mon May 20 10:21:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=656f679c
profiles: explicitly disable ruby32 in temp RUBY_TARGETS These variables are compounding so we need to explicitly turn it off to overwrite the ruby32 value in the base profile. Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> profiles/arch/amd64/make.defaults | 2 +- profiles/arch/arm/make.defaults | 2 +- profiles/arch/arm64/make.defaults | 2 +- profiles/arch/hppa/make.defaults | 2 +- profiles/arch/powerpc/ppc32/make.defaults | 2 +- profiles/arch/powerpc/ppc64/make.defaults | 2 +- profiles/arch/sparc/make.defaults | 2 +- profiles/arch/x86/make.defaults | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults index 82639b53a6ce..4b211a4a39d5 100644 --- a/profiles/arch/amd64/make.defaults +++ b/profiles/arch/amd64/make.defaults @@ -66,4 +66,4 @@ USE="libtirpc" # Hans de Graaff <gra...@gentoo.org> (2024-05-20) # Allow ruby32 stabling: https://bugs.gentoo.org/932285 -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby31 -ruby32" diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults index 2df141b360bc..49365fcaee47 100644 --- a/profiles/arch/arm/make.defaults +++ b/profiles/arch/arm/make.defaults @@ -28,4 +28,4 @@ USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" # Hans de Graaff <gra...@gentoo.org> (2024-05-20) # Allow ruby32 stabling: https://bugs.gentoo.org/932285 -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby31 -ruby32" diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults index 1e0527d8a43d..31df7013cb70 100644 --- a/profiles/arch/arm64/make.defaults +++ b/profiles/arch/arm64/make.defaults @@ -31,4 +31,4 @@ USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" # Hans de Graaff <gra...@gentoo.org> (2024-05-20) # Allow ruby32 stabling: https://bugs.gentoo.org/932285 -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby31 -ruby32" diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults index 69e4b2f29363..a279a075b229 100644 --- a/profiles/arch/hppa/make.defaults +++ b/profiles/arch/hppa/make.defaults @@ -25,4 +25,4 @@ VIDEO_CARDS="fbdev" # Hans de Graaff <gra...@gentoo.org> (2024-05-20) # Allow ruby32 stabling: https://bugs.gentoo.org/932285 -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby31 -ruby32" diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults index 93e971ac2c84..fd8cbdaca6cc 100644 --- a/profiles/arch/powerpc/ppc32/make.defaults +++ b/profiles/arch/powerpc/ppc32/make.defaults @@ -34,4 +34,4 @@ ABI_PPC="32" # Hans de Graaff <gra...@gentoo.org> (2024-05-20) # Allow ruby32 stabling: https://bugs.gentoo.org/932285 -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby31 -ruby32" diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults index 754b275cc9f9..649dbb725d92 100644 --- a/profiles/arch/powerpc/ppc64/make.defaults +++ b/profiles/arch/powerpc/ppc64/make.defaults @@ -42,4 +42,4 @@ ABI_PPC="64" # Hans de Graaff <gra...@gentoo.org> (2024-05-20) # Allow ruby32 stabling: https://bugs.gentoo.org/932285 -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby31 -ruby32" diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults index 68b25b148d0c..cf143847e97a 100644 --- a/profiles/arch/sparc/make.defaults +++ b/profiles/arch/sparc/make.defaults @@ -45,4 +45,4 @@ USE="libtirpc" # Hans de Graaff <gra...@gentoo.org> (2024-05-20) # Allow ruby32 stabling: https://bugs.gentoo.org/932285 -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby31 -ruby32" diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults index 5e39eac6a523..6fc955113ada 100644 --- a/profiles/arch/x86/make.defaults +++ b/profiles/arch/x86/make.defaults @@ -46,4 +46,4 @@ USE="libtirpc" # Hans de Graaff <gra...@gentoo.org> (2024-05-20) # Allow ruby32 stabling: https://bugs.gentoo.org/932285 -RUBY_TARGETS="ruby31" +RUBY_TARGETS="ruby31 -ruby32"
