gentoo resync : 01.12.2017

5 files changed, 26 insertions, 32 deletions

diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 30230a999a84..f082bb9b8a5a 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2014 Gentoo Foundation
 # 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 firefox flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 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 firefox flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 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 b49edf6569bc..6deb7a1f0a44 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,30 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
+# Not required, but makes life easier with Qt; bug #457934
+app-arch/unzip natspec
+
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
+# Required by dev-qt/qtcore
+dev-libs/libpcre pcre16
+dev-libs/libpcre2 pcre16
+
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
+# Required by kde-frameworks/kcoreaddons
+dev-qt/qtcore:5 icu
+
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
+# Required by kde-frameworks/kwayland
+dev-qt/qtgui:5 egl libinput
+
+# Required by dev-qt/qtwebengine
+media-libs/libvpx svc
+
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
+# Avoid circular dependency when installing from scratch
+dev-util/cmake -qt5
+
 # Andreas Sturmlechner <asturm@gentoo.org> (19 Nov 2017)
 # Required by opengl, theora, v4l and X
 media-libs/mediastreamer video
diff --git a/profiles/targets/desktop/plasma/package.use.mask b/profiles/targets/desktop/package.use.mask
index 26f3c6d94580..26f3c6d94580 100644
--- a/profiles/targets/desktop/plasma/package.use.mask
+++ b/profiles/targets/desktop/package.use.mask
diff --git a/profiles/targets/desktop/plasma/make.defaults b/profiles/targets/desktop/plasma/make.defaults
index 47fe9ae2f944..11d2a79da9e8 100644
--- a/profiles/targets/desktop/plasma/make.defaults
+++ b/profiles/targets/desktop/plasma/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE="activities consolekit declarative dri kde kipi kwallet phonon plasma policykit qml qt5 semantic-desktop widgets xcomposite xinerama xscreensaver"
+USE="activities consolekit declarative dri kde kipi kwallet phonon plasma policykit qml semantic-desktop widgets xcomposite xinerama"
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 749d8eb0b93c..3c79e5bbb7e0 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -1,31 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Avoid circular dependency when installing from scratch
-dev-util/cmake -qt5
-
-# Not required, but makes life easier with Qt; bug 457934
-app-arch/unzip natspec
-
-# Required by dev-qt/qtcore
-dev-libs/libpcre pcre16
-dev-libs/libpcre2 pcre16
-
-# Required by kde-frameworks/kcoreaddons
-dev-qt/qtcore:5 icu
-
-# Required by kde-frameworks/kwayland
-dev-qt/qtgui:5 egl libinput
-
 # Required by kde-apps/okteta
 dev-qt/qtscript:5 scripttools
 
 # Required by kde-apps/akonadi
 dev-qt/qtsql:5 mysql
 
-# Required by kde-apps/kate[addons]
-dev-libs/libgit2 threads
-
 # Required by kde-apps/ktp-text-ui
 kde-apps/ktp-common-internals otr
 
@@ -38,9 +19,6 @@ media-gfx/graphviz python
 # Required by media-gfx/graphviz which is required by kde-apps/kcachegrind
 media-libs/gd fontconfig
 
-# Required by dev-qt/qtwebengine
-media-libs/libvpx svc
-
 # Required by kde-plasma/kwin
 media-libs/mesa egl wayland
 
@@ -55,11 +33,3 @@ media-sound/pulseaudio gnome
 
 # Required by kde-frameworks/kactivities
 sys-libs/zlib minizip
-
-# FIXME: unnecessary REQUIRED_USE ^^ ( qt4 qt5 )
-<dev-python/qscintilla-python-2.10 -qt4
-<x11-libs/qscintilla-2.10 -qt4
-
-# FIXME: REQUIRED_USE conflicts: qt5? ( !qt4 )
->=app-crypt/pinentry-0.9.6-r5 -qt4
->=media-libs/opencv-2.4.12-r1 -qt4