diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-09-02 12:28:17 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-02 12:28:17 +0100 |
| commit | 20b6ab983b55b022c6e4af317154089e18ad41cb (patch) | |
| tree | 07060dcd7f71fd5f02ecf6463cb8bf3665b65bcc /profiles/targets | |
| parent | 12a4866975c254ac127821e7562eda5ac119fba3 (diff) | |
gentoo auto-resync : 02:09:2024 - 12:28:17
Diffstat (limited to 'profiles/targets')
| -rw-r--r-- | profiles/targets/desktop/make.defaults | 2 | ||||
| -rw-r--r-- | profiles/targets/desktop/package.use | 5 | ||||
| -rw-r--r-- | profiles/targets/desktop/plasma/package.use | 15 |
3 files changed, 6 insertions, 16 deletions
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults index 3cba94431b41..72e77543df12 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" diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use index 0822e94248e9..82330969f098 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 <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 diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index ae28b8b9cf94..b52b0a547b08 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 <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 |