From 407525b571b48cfd65e1ad7a02d250a927c967c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Dec 2017 03:04:39 +0000 Subject: gentoo resync : 01.12.2017 --- profiles/targets/desktop/make.defaults | 2 +- profiles/targets/desktop/package.use | 24 +++++++++++++++++++ profiles/targets/desktop/package.use.mask | 20 ++++++++++++++++ profiles/targets/desktop/plasma/make.defaults | 2 +- profiles/targets/desktop/plasma/package.use | 30 ------------------------ profiles/targets/desktop/plasma/package.use.mask | 20 ---------------- 6 files changed, 46 insertions(+), 52 deletions(-) create mode 100644 profiles/targets/desktop/package.use.mask delete mode 100644 profiles/targets/desktop/plasma/package.use.mask (limited to 'profiles/targets') 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 (30 Nov 2017) +# Not required, but makes life easier with Qt; bug #457934 +app-arch/unzip natspec + +# Andreas Sturmlechner (30 Nov 2017) +# Required by dev-qt/qtcore +dev-libs/libpcre pcre16 +dev-libs/libpcre2 pcre16 + +# Andreas Sturmlechner (30 Nov 2017) +# Required by kde-frameworks/kcoreaddons +dev-qt/qtcore:5 icu + +# Andreas Sturmlechner (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 (30 Nov 2017) +# Avoid circular dependency when installing from scratch +dev-util/cmake -qt5 + # Andreas Sturmlechner (19 Nov 2017) # Required by opengl, theora, v4l and X media-libs/mediastreamer video diff --git a/profiles/targets/desktop/package.use.mask b/profiles/targets/desktop/package.use.mask new file mode 100644 index 000000000000..26f3c6d94580 --- /dev/null +++ b/profiles/targets/desktop/package.use.mask @@ -0,0 +1,20 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# USE=gles2 in the following packages disables full OpenGL +# Upstream does not test for that case and packages frequently +# fail to build or run if set. +dev-python/PyQt5 gles2 +dev-qt/qt3d gles2 +dev-qt/qtdatavis3d gles2 +dev-qt/qtdeclarative gles2 +dev-qt/qtgui gles2 +dev-qt/qtmultimedia gles2 +dev-qt/qtopengl gles2 +dev-qt/qtprintsupport gles2 +dev-qt/qtwebkit gles2 +dev-qt/qtwidgets gles2 +kde-apps/kdenlive gles2 +kde-frameworks/plasma gles2 +kde-plasma/kinfocenter gles2 +kde-plasma/kwin gles2 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 ) -=app-crypt/pinentry-0.9.6-r5 -qt4 ->=media-libs/opencv-2.4.12-r1 -qt4 diff --git a/profiles/targets/desktop/plasma/package.use.mask b/profiles/targets/desktop/plasma/package.use.mask deleted file mode 100644 index 26f3c6d94580..000000000000 --- a/profiles/targets/desktop/plasma/package.use.mask +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# USE=gles2 in the following packages disables full OpenGL -# Upstream does not test for that case and packages frequently -# fail to build or run if set. -dev-python/PyQt5 gles2 -dev-qt/qt3d gles2 -dev-qt/qtdatavis3d gles2 -dev-qt/qtdeclarative gles2 -dev-qt/qtgui gles2 -dev-qt/qtmultimedia gles2 -dev-qt/qtopengl gles2 -dev-qt/qtprintsupport gles2 -dev-qt/qtwebkit gles2 -dev-qt/qtwidgets gles2 -kde-apps/kdenlive gles2 -kde-frameworks/plasma gles2 -kde-plasma/kinfocenter gles2 -kde-plasma/kwin gles2 -- cgit v1.2.3