* [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, profiles/arch/powerpc/ppc32/, profiles/arch/x86/, ...
@ 2018-11-13 18:50 Hans de Graaff
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Graaff @ 2018-11-13 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 61f269a66ca07af54396e6e296949f53110eaac8
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 18:49:14 2018 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 18:49:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f269a6
profiles/arch/*/make.defaults: properly overwrite ruby24
The RUBY_TARGETS setting is cumulative so we need to actively turn off
ruby24 to overwrite the setting in base/make.defaults.
Fixes: https://bugs.gentoo.org/671064
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
profiles/arch/alpha/make.defaults | 2 +-
profiles/arch/amd64/make.defaults | 2 +-
profiles/arch/arm/make.defaults | 2 +-
profiles/arch/hppa/make.defaults | 2 +-
profiles/arch/ia64/make.defaults | 2 +-
profiles/arch/powerpc/ppc32/make.defaults | 2 +-
profiles/arch/powerpc/ppc64/make.defaults | 2 +-
profiles/arch/s390/make.defaults | 2 +-
profiles/arch/sparc/make.defaults | 2 +-
profiles/arch/x86/make.defaults | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index efb7262f104..3449562f048 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -30,7 +30,7 @@ ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 e
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
# Tobias Klausmann <klausman@gentoo.org> (25 Jun 2018)
# Enable USE=libtirpc by default, to ease dependency resolution during
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 8f795c3eaf2..77e20fb9cc3 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -70,4 +70,4 @@ USE="libtirpc"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index d09bb4da35e..f1655f9170e 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -25,4 +25,4 @@ USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 3f22ce8df61..f6b6600fec8 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -27,4 +27,4 @@ VIDEO_CARDS="fbdev"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index b91a3961859..1c7884a9e38 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -34,4 +34,4 @@ ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 3b8dbab2de7..f5b7331ada0 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -38,4 +38,4 @@ ABI_PPC="32"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index d2b49417d9f..ee493e24c30 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 <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index 476bb25aa01..ec35f09d114 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -34,4 +34,4 @@ USE="-multilib"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 8ae22a12a03..4af6d8cc78c 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -46,4 +46,4 @@ USE="libtirpc"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index d644e7ef3d7..d18827217a3 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -45,7 +45,7 @@ ABI_X86="32"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
# Thomas Deutschmann <whissi@gentoo.org> (6 Jun 2018)
# Enable USE=libtirpc by default, to ease dependency resolution during
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, profiles/arch/powerpc/ppc32/, profiles/arch/x86/, ...
@ 2024-06-10 0:19 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2024-06-10 0:19 UTC (permalink / raw
To: gentoo-commits
commit: 832d48ac60ae1be4702b33390d19a52f5eb0bf1e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 00:02:45 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 00:02:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=832d48ac
profiles/arch: drop qt6 use.stable.mask where possible
ppc32 still waiting on bug #932862
Bug: https://bugs.gentoo.org/932862
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
profiles/arch/arm/use.stable.mask | 4 ----
profiles/arch/powerpc/ppc32/use.stable.mask | 4 ++++
profiles/arch/powerpc/use.stable.mask | 6 +-----
profiles/arch/x86/use.stable.mask | 4 ----
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 496c16486c01..067c0d6c42db 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -8,10 +8,6 @@
# Allow ruby32 stabling: https://bugs.gentoo.org/932285
ruby_targets_ruby32
-# Ionen Wolkens <ionen@gentoo.org> (2024-01-27)
-# Qt6 is not stable here yet
-qt6
-
# Sam James <sam@gentoo.org> (2022-01-16)
# net-libs/gnome-online-accounts is not marked stable on arm yet
gnome-online-accounts
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index 848b8db5a597..ba9425aa2ac7 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,6 +1,10 @@
# Copyright 2014-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Ionen Wolkens <ionen@gentoo.org> (2024-06-09)
+# Qt6 is not stable here yet
+qt6
+
# Sam James <sam@gentoo.org> (2024-03-07)
# dev-lang/php:8.2 is not marked stable here yet (bug #920701)
php_targets_php8-2
diff --git a/profiles/arch/powerpc/use.stable.mask b/profiles/arch/powerpc/use.stable.mask
index 26c5e7756991..cf5a25e06e1d 100644
--- a/profiles/arch/powerpc/use.stable.mask
+++ b/profiles/arch/powerpc/use.stable.mask
@@ -1,13 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
-# Ionen Wolkens <ionen@gentoo.org> (2024-01-27)
-# Qt6 is not stable here yet
-qt6
-
# Matt Turner <mattst88@gentoo.org> (2018-04-25)
# Dropped stable keywords
octave
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 6f373ce425c2..90b1e4500f31 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -12,10 +12,6 @@ atlas
# media-libs/jasper is not stable
jasper
-# Ionen Wolkens <ionen@gentoo.org> (2024-01-27)
-# Qt6 is not stable here yet
-qt6
-
# Sam James <sam@gentoo.org> (2020-11-10)
# media-gfx/openvdb is not stable on x86
# ... and has failing tests right now anyway
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-10 0:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-10 0:19 [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, profiles/arch/powerpc/ppc32/, profiles/arch/x86/, Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2018-11-13 18:50 Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox