From 682aae9d3c61ea84589a54b8dc02b935cf8fc3d5 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 30 Aug 2024 01:21:14 +0200 Subject: [PATCH 1/7] profiles: targets/desktop: Enable qt6 in make.defaults Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- profiles/targets/desktop/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults index 3cba94431b414..72e77543df126 100644 --- a/profiles/targets/desktop/make.defaults +++ b/profiles/targets/desktop/make.defaults @@ -1,4 +1,4 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg kf6compat lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb vulkan wxwidgets X xcb xft x264 xml xv xvid" +USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg kf6compat lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt6 qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb vulkan wxwidgets X xcb xft x264 xml xv xvid" From 54b24fe3ebd7079b455ee99545eb3a57633d3f1a Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 30 Aug 2024 01:32:09 +0200 Subject: [PATCH 2/7] profiles: targets/desktop: Disable qt5 where REQUIRED_USE conflicts Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- profiles/targets/desktop/package.use | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use index 0822e94248e9e..82330969f0980 100644 --- a/profiles/targets/desktop/package.use +++ b/profiles/targets/desktop/package.use @@ -1,6 +1,11 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas Sturmlechner (2024-08-30) +# Resolve conflicting REQUIRED_USE defaults (qt5 vs. qt6) +media-libs/simage -qt5 +net-p2p/transmission -qt5 + # Andreas Sturmlechner (2024-03-07) # Required by kde-frameworks/kio:6 dev-qt/qtbase libproxy From 115c97425a2f142f6d90dc5aed77e28523cc4bff Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 30 Aug 2024 01:27:39 +0200 Subject: [PATCH 3/7] profiles: targets/desktop: Drop obsolete qt6 package.use Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- profiles/targets/desktop/plasma/package.use | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index ae28b8b9cf94f..b52b0a547b08e 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -4,21 +4,6 @@ # Resolve conflict between Plasma 6 and KDevelop 24.05 >=dev-util/kdevelop-24.05.1:5 -plasma -# Sam James (2024-06-13) -# Needed by dependencies of KDE Plasma and KDE Gear -app-crypt/gpgme qt6 -app-crypt/pinentry qt6 -app-crypt/qca qt6 -app-text/poppler qt6 -dev-libs/qtkeychain qt6 -media-libs/phonon qt6 -media-libs/phonon-vlc qt6 -net-libs/accounts-qml qt6 -net-libs/accounts-qt qt6 -net-libs/signond qt6 -net-libs/signon-oauth2 qt6 -sys-auth/polkit-qt qt6 - # Alfred Wingate (2023-12-25) # Prefer wayland over X with REQUIRED_USE: ^^ ( gbm wayland X ) >=media-tv/kodi-20.2 wayland -X From 6c27f6b4e306b21f7e506b79fcf17fd9d83b88ea Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 30 Aug 2024 01:27:18 +0200 Subject: [PATCH 4/7] profiles: base: Drop obsolete qt6 package.use.stable.mask entries Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- profiles/base/package.use.stable.mask | 5 ----- 1 file changed, 5 deletions(-) diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 94b16c750f96a..9d9b546ecbd8b 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -16,11 +16,6 @@ (2024-06-13) -# Building with qt6 requires (masked) kde-frameworks:6 -app-admin/calamares qt6 -app-crypt/pinentry qt6 - # Andrew Ammerlaan (2024-04-14) # Qt6 dependencies are not yet available in stable. Moreover, # Qt6 support in freecad is not completely finished. From 53929ceb754e16e89f89b4fc41824c2cf722f327 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 1 Sep 2024 22:49:20 +0200 Subject: [PATCH 5/7] profiles: ppc64: Stable-mask app-crypt/pinentry[qt6] until KF6 stable Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- profiles/arch/powerpc/ppc64/package.use.stable.mask | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask index dbbd4dfe61782..299a152bee924 100644 --- a/profiles/arch/powerpc/ppc64/package.use.stable.mask +++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2024-06-13) +# Waiting for KF6 stabilisation in bug #934478 +app-crypt/pinentry qt6 + # Sam James (2024-04-30) # sys-block/nbdkit is not yet marked stable here app-emulation/libvirt nbd From 6c919318f3acf20426bd4be53d8dfea73b990882 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 30 Aug 2024 02:53:57 +0200 Subject: [PATCH 6/7] profiles: x86: Stable-mask >=app-crypt/pinentry-1.3.0[wayland] Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- profiles/arch/x86/package.use.stable.mask | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask index e3117529b9f21..21fa3f4fea5cb 100644 --- a/profiles/arch/x86/package.use.stable.mask +++ b/profiles/arch/x86/package.use.stable.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2024-08-30) +# KF6 is not stable here. +>=app-crypt/pinentry-1.3.0 wayland + # Matt Turner (2024-07-14) # spirv-llvm-translator < 17 is not stable on x86. Date: Fri, 30 Aug 2024 01:33:00 +0200 Subject: [PATCH 7/7] profiles: base: Drop obsolete python3_11 package.use settings ... after(!) www-client/falkon cleanup. Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- profiles/base/package.use | 7 ------- 1 file changed, 7 deletions(-) diff --git a/profiles/base/package.use b/profiles/base/package.use index b4cc281eb2aad..cf646b56fb24b 100644 --- a/profiles/base/package.use +++ b/profiles/base/package.use @@ -1,13 +1,6 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Andreas Sturmlechner (2024-05-30) -# Only up to python 3.11 supported, bug #929546 - (2024-03-23) # Used by pkgcheck, so let's make it easier for all developers to install it >=dev-libs/tree-sitter-bash-0.21.0 python