From 03cfd8a745701af0ae647d5f975bb0e0e4e6c3fc Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 8 Jul 2019 22:06:38 +0200 Subject: [PATCH] profiles: desktop: Add USE icu to make.defaults A lot of desktop packages depend on libraries built with USE icu to work; some, but not nearly enough are currently handled by individual package.use, leaving users to fix default conflicts. desktop profile should rather have it enabled globally. Signed-off-by: Andreas Sturmlechner --- profiles/targets/desktop/gnome/package.use | 5 +---- profiles/targets/desktop/make.defaults | 4 ++-- profiles/targets/desktop/package.use | 6 +----- profiles/targets/desktop/plasma/package.use | 5 +---- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use index 508542fbefed1..ab548250d8394 100644 --- a/profiles/targets/desktop/gnome/package.use +++ b/profiles/targets/desktop/gnome/package.use @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Needed by gnome-photos @@ -31,9 +31,6 @@ app-accessibility/speech-dispatcher python # Pulled in by grilo-plugins which is needed for gnome-music media-libs/grilo playlist -# Required for webkit-gtk-2 -media-libs/harfbuzz icu - # Pulled in by tracker and grilo-plugins, has REQUIRED_USE="?? ( gtk qt5 )" media-libs/libmediaart gtk -qt5 diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults index 0c404bec2b232..5724093fcefda 100644 --- a/profiles/targets/desktop/make.defaults +++ b/profiles/targets/desktop/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid" +USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam flac gif glamor gpm gtk icu jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid" diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use index 58f08ba87047c..8abcb26fc9a9d 100644 --- a/profiles/targets/desktop/package.use +++ b/profiles/targets/desktop/package.use @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Lars Wendler (2019-03-20) @@ -22,10 +22,6 @@ app-arch/unzip natspec dev-libs/libpcre pcre16 dev-libs/libpcre2 pcre16 -# Andreas Sturmlechner (2017-11-30) -# Required by kde-frameworks/kcoreaddons -dev-qt/qtcore:5 icu - # Andreas Sturmlechner (2017-11-30) # Required by kde-frameworks/kwayland dev-qt/qtgui:5 egl libinput diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index 021d9c78a1c01..4bf4773648285 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -1,9 +1,6 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Required by >=dev-qt/qtwebengine-5.9 -dev-libs/libxml2 icu - # Required by app-editors/okteta dev-qt/qtscript:5 scripttools