commit: 5b8f72a0333f89ac5d03dfdeaf5718aed9b0cb5a Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Jan 27 05:26:37 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Jan 27 06:46:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8f72a0
profiles: re-arrange USE=qt6 masks, unmask where possible Follow-up to bug #918896 which keyworded requirements for unmasking on most arches (sparc is still pending, so remains masked for now). Note that still use.stable.masked where needed, stabilizations will wait a bit to see if any trouble arises in ~arch from unmasking. If add new IUSE=qt6 and missing a dependency, ideally please file (re)keywordreqs as needed rather than mask (unless need qtwebengine). Bug: https://bugs.gentoo.org/918896 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> profiles/arch/alpha/use.mask | 1 + profiles/arch/amd64/package.use.mask | 4 ++++ profiles/arch/amd64/package.use.stable.mask | 4 ++++ profiles/arch/amd64/use.mask | 6 ------ profiles/arch/arm/use.stable.mask | 4 ++++ profiles/arch/arm64/package.use.mask | 4 ++++ profiles/arch/arm64/package.use.stable.mask | 4 ++++ profiles/arch/arm64/use.stable.mask | 4 ++++ profiles/arch/base/package.use.mask | 3 +++ profiles/arch/hppa/use.stable.mask | 4 ++++ profiles/arch/ia64/use.mask | 1 + profiles/arch/m68k/use.mask | 1 + profiles/arch/mips/use.mask | 1 + profiles/arch/powerpc/ppc64/64le/package.use.mask | 6 ++++++ profiles/arch/powerpc/ppc64/64le/package.use.stable.mask | 4 ---- profiles/arch/powerpc/use.stable.mask | 4 ++++ profiles/arch/s390/use.mask | 1 + profiles/arch/sparc/use.mask | 6 +++++- profiles/arch/x86/use.stable.mask | 4 ++++ profiles/base/use.mask | 7 ------- 20 files changed, 55 insertions(+), 18 deletions(-) diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask index 3663ca5845ec..53ce21c2ffb6 100644 --- a/profiles/arch/alpha/use.mask +++ b/profiles/arch/alpha/use.mask @@ -11,6 +11,7 @@ flatpak # matoro <[email protected]> (2023-11-14) # Qt is not keyworded here qt5 +qt6 # matoro <[email protected]> (2023-06-17) # media-libs/libheif is not keyworded here diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 493581018443..1d7742865b38 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Ionen Wolkens <[email protected]> (2024-01-27) +# dev-python/PyQt6 and dev-python/pyside6 are keyworded here +dev-python/QtPy -pyqt6 -pyside6 + # Michal Privoznik <[email protected]> (2024-01-21) # virtiofsd is available here app-emulation/libvirt -virtiofsd diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index 420f3a193b95..55ec28d2d0de 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Ionen Wolkens <[email protected]> (2024-01-27) +# dev-python/pyside6 is not stable here yet +dev-python/QtPy pyside6 + # Ionen Wolkens <[email protected]> (2024-01-16) # cuda (and thus cudnn) are not available in stable media-libs/opencv cudnn diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask index a2dda70023b4..903b1e2d2f32 100644 --- a/profiles/arch/amd64/use.mask +++ b/profiles/arch/amd64/use.mask @@ -16,12 +16,6 @@ # Unmask secureboot flag on arches where sbsigntools is keyworded -secureboot -# Jimi Huotari <[email protected]> (2023-03-03) -# Unmask on amd64 only for now. --qt6 --pyqt6 --pyside6 - # matoro <[email protected]> (2022-09-29) # dev-util/google-perftools is supported here -tcmalloc diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask index 0022a3aafc7e..2e2b478ee999 100644 --- a/profiles/arch/arm/use.stable.mask +++ b/profiles/arch/arm/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens <[email protected]> (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Sam James <[email protected]> (2022-01-16) # net-libs/gnome-online-accounts is not marked stable on arm yet gnome-online-accounts diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index e76f5b50835d..c7a747a831bb 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens <[email protected]> (2024-01-27) +# dev-python/PyQt6 is keyworded here +dev-python/QtPy -pyqt6 + # Michal Privoznik <[email protected]> (2024-01-18) # No sys-block/nbdkit on arm, yet app-emulation/libvirt nbd diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask index 615da88ec98f..65ce835fb0fd 100644 --- a/profiles/arch/arm64/package.use.stable.mask +++ b/profiles/arch/arm64/package.use.stable.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens <[email protected]> (2024-01-27) +# dev-python/PyQt6 and dev-python/pyside6 are not stable here yet +dev-python/QtPy pyqt6 pyside6 + # Andrew Ammerlaan <[email protected]> (2023-12-18) # This is still experimental, prebuilt images may not boot on all systems. sys-kernel/gentoo-kernel generic-uki diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask index dd47f125ea2d..4e253e67a8a6 100644 --- a/profiles/arch/arm64/use.stable.mask +++ b/profiles/arch/arm64/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens <[email protected]> (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Mart Raudsepp <[email protected]> (2023-10-03) # dev-util/sysprof-capture and dev-util/sysprof are not stable yet sysprof diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index b1bd7043ea67..39b5b770b7eb 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,9 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens <[email protected]> (2024-01-27) +# dev-python/PyQt6 and dev-python/pyside6 have very few keywords +dev-python/QtPy pyqt6 pyside6 # Michal Privoznik <[email protected]> (2024-01-21) # virtiofsd is only available on some arches diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask index a2a9aae1ddb8..d9780b80ad69 100644 --- a/profiles/arch/hppa/use.stable.mask +++ b/profiles/arch/hppa/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens <[email protected]> (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Sam James <[email protected]> (2023-07-02) # Unlikely that anybody wants to use net-nds/openldap on hppa & often has # platform-specific bugs. diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask index 8e5089b10a2a..4b316c080a76 100644 --- a/profiles/arch/ia64/use.mask +++ b/profiles/arch/ia64/use.mask @@ -206,3 +206,4 @@ rbd # Ben de Groot <[email protected]> (2015-02-01) # please remove when keyworded qt5 +qt6 diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask index 19ddb6d19501..25d4d1977e96 100644 --- a/profiles/arch/m68k/use.mask +++ b/profiles/arch/m68k/use.mask @@ -82,6 +82,7 @@ ruby # James Le Cuirot <[email protected]> (2021-08-20) # Qt is not keyworded or tested. qt5 +qt6 # Sergei Trofimovich <[email protected]> (2020-04-23) # valgrind has no m68k port. diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask index 751e44f5b836..e25369857194 100644 --- a/profiles/arch/mips/use.mask +++ b/profiles/arch/mips/use.mask @@ -271,3 +271,4 @@ opencl # Ben de Groot <[email protected]> (2015-02-01) # please remove when keyworded qt5 +qt6 diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask index e394f7c3712f..e7f5bc98d0ee 100644 --- a/profiles/arch/powerpc/ppc64/64le/package.use.mask +++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask @@ -1,6 +1,12 @@ # Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens <[email protected]> (2024-01-27) +# dev-qt/qtwebengine:6 is not available here, technically does +# not need to be masked for Qt5 (is keyworded) but would require +# USE=qt5-webengine or so to make the distinction with Qt6. +sci-astronomy/stellarium webengine + # Marek Szuba <[email protected]> (2023-12-05) # Needs USE=video_cards_amdgpu, which IS available on ppc64le. >=sys-apps/fwupd-1.9.10 -amdgpu diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask index 77289a944ed2..8c1c77451267 100644 --- a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask +++ b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask @@ -1,10 +1,6 @@ # Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Alexey Sokolov <[email protected]> (2022-02-05) -# dev-qt/qtwebengine not stable on ppc64 yet -sci-astronomy/stellarium webengine - # Georgy Yakovlev <[email protected]> (2021-05-07) # openjfx:8 will never be stabilized # openjfx:11 probably will neither diff --git a/profiles/arch/powerpc/use.stable.mask b/profiles/arch/powerpc/use.stable.mask index afcb4b4b88a7..26c5e7756991 100644 --- a/profiles/arch/powerpc/use.stable.mask +++ b/profiles/arch/powerpc/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens <[email protected]> (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Matt Turner <[email protected]> (2018-04-25) # Dropped stable keywords octave diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask index 88c2ad379966..838c3ee29f1d 100644 --- a/profiles/arch/s390/use.mask +++ b/profiles/arch/s390/use.mask @@ -85,6 +85,7 @@ java hardened vaapi qt5 +qt6 # Needs java pdfannotextractor diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask index 922ae7b28201..766fb7f8ce30 100644 --- a/profiles/arch/sparc/use.mask +++ b/profiles/arch/sparc/use.mask @@ -1,9 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. -sparc +# Ionen Wolkens <[email protected]> (2024-01-27) +# Needs bug #918896 for missing Qt6 keywords +qt6 + # matoro <[email protected]> (2023-06-17) # media-libs/libheif is not keyworded here heif diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask index 29e2b97d388e..70fda23fed3c 100644 --- a/profiles/arch/x86/use.stable.mask +++ b/profiles/arch/x86/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens <[email protected]> (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Sam James <[email protected]> (2020-11-10) # media-gfx/openvdb is not stable on x86 # ... and has failing tests right now anyway diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 368f5bb53c20..316658feebaf 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -17,13 +17,6 @@ ruby_targets_ruby30 # Ruby 2.7 is masked for removal. ruby_targets_ruby27 -# Sam James <[email protected]> (2022-08-02) -# Masked for testing. The split of some packages may still -# change. bug #838970. -qt6 -pyqt6 -pyside6 - # Matt Turner <[email protected]> (2022-04-16) # dev-util/sysprof not keyworded on most arches yet sysprof
