Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-09-01 23:19:07 +00:00
7 changed files with 14 additions and 28 deletions
@@ -17,6 +17,10 @@
#--- END OF EXAMPLES ---
# Andreas Sturmlechner <asturm@gentoo.org> (2024-06-13)
# Waiting for KF6 stabilisation in bug #934478
app-crypt/pinentry qt6
# Sam James <sam@gentoo.org> (2024-04-30)
# sys-block/nbdkit is not yet marked stable here
app-emulation/libvirt nbd
@@ -17,6 +17,10 @@
#--- END OF EXAMPLES ---
# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-30)
# KF6 is not stable here.
>=app-crypt/pinentry-1.3.0 wayland
# Matt Turner <mattst88@gentoo.org> (2024-07-14)
# spirv-llvm-translator < 17 is not stable on x86.
<dev-libs/libclc-17 spirv
-7
View File
@@ -1,13 +1,6 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Andreas Sturmlechner <asturm@gentoo.org> (2024-05-30)
# Only up to python 3.11 supported, bug #929546
<dev-util/kdevelop-python-24.05.1:5 python_single_target_python3_11
~www-client/falkon-23.08.5 python_single_target_python3_11
dev-python/pyside2 python_targets_python3_11
dev-python/shiboken2 python_targets_python3_11
# Arthur Zamarin <arthurzam@gentoo.org> (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
-5
View File
@@ -16,11 +16,6 @@
<kde-misc/kio-gdrive-23.08.5-r2 kf6compat
<kde-plasma/libplasma-5.116.0-r1 kf6compat
# Andreas Sturmlechner <asturm@gentoo.org> (2024-06-13)
# Building with qt6 requires (masked) kde-frameworks:6
app-admin/calamares qt6
app-crypt/pinentry qt6
# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-04-14)
# Qt6 dependencies are not yet available in stable. Moreover,
# Qt6 support in freecad is not completely finished.
+1 -1
View File
@@ -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"
+5
View File
@@ -1,6 +1,11 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-30)
# Resolve conflicting REQUIRED_USE defaults (qt5 vs. qt6)
media-libs/simage -qt5
net-p2p/transmission -qt5
# Andreas Sturmlechner <asturm@gentoo.org> (2024-03-07)
# Required by kde-frameworks/kio:6
dev-qt/qtbase libproxy
@@ -4,21 +4,6 @@
# Resolve conflict between Plasma 6 and KDevelop 24.05
>=dev-util/kdevelop-24.05.1:5 -plasma
# Sam James <sam@gentoo.org> (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 <parona@protonmail.com> (2023-12-25)
# Prefer wayland over X with REQUIRED_USE: ^^ ( gbm wayland X )
>=media-tv/kodi-20.2 wayland -X