From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 565CB1382BD for ; Sat, 18 Jun 2016 18:51:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C183DE0A7D; Sat, 18 Jun 2016 18:50:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F5DDE0A7D for ; Sat, 18 Jun 2016 18:50:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C475A3406F2 for ; Sat, 18 Jun 2016 18:50:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 707E318A6 for ; Sat, 18 Jun 2016 18:50:54 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1466275845.f0497737906434164857dbe976f433a4f114b4d9.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kscreen/, kde-plasma/libksysguard/, kde-plasma/kscreenlocker/, ... X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/bluedevil/bluedevil-5.6.5.ebuild kde-plasma/breeze-grub/breeze-grub-5.6.5.ebuild kde-plasma/breeze-gtk/breeze-gtk-5.6.5.ebuild kde-plasma/breeze-plymouth/breeze-plymouth-5.6.5.ebuild kde-plasma/breeze/breeze-5.6.5.ebuild kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild kde-plasma/kde-cli-tools/kde-cli-tools-5.6.5.ebuild kde-plasma/kde-gtk-config/kde-gtk-config-5.6.5.ebuild kde-plasma/kdecoration/kdecoration-5.6.5.ebuild kde-plasma/kdeplasma-addons/kdeplasma-addons-5.6.5.ebuild kde-plasma/kgamma/kgamma-5.6.5.ebuild kde-plasma/khotkeys/khotkeys-5.6.5.ebuild kde-plasma/kinfocenter/kinfocenter-5.6.5.ebuild kde-plasma/kmenuedit/files/kmenuedit-5.5.5-hotkeys.patch kde-plasma/kmenuedit/kmenuedit-5.6.5.ebuild kde-plasma/kscreen/kscreen-5.6.5.ebuild kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch kde-plasma/kscreenlocker/kscreenlocker-5.6.5.ebuild kde-plasma/ksshaskpass/ksshaskpass-5.6.5.ebuild kde-plasma/ksysguard/ksysguard-5.6.5.e build kde-plasma/kwallet-pam/kwallet-pam-5.6.5.ebuild kde-plasma/kwayland-integration/kwayland-integration-5.6.5.ebuild kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch kde-plasma/kwin/kwin-5.6.5.ebuild kde-plasma/kwrited/kwrited-5.6.5.ebuild kde-plasma/libkscreen/libkscreen-5.6.5.ebuild kde-plasma/libksysguard/libksysguard-5.6.5.ebuild kde-plasma/milou/milou-5.6.5.ebuild kde-plasma/oxygen/oxygen-5.6.5.ebuild kde-plasma/plasma-desktop/plasma-desktop-5.6.5.ebuild kde-plasma/plasma-integration/plasma-integration-5.6.5.ebuild kde-plasma/plasma-mediacenter/plasma-mediacenter-5.6.5.ebuild kde-plasma/plasma-meta/plasma-meta-5.6.5.ebuild kde-plasma/plasma-nm/plasma-nm-5.6.5.ebuild kde-plasma/plasma-pa/plasma-pa-5.6.5.ebuild kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch kde-plasma/plasma-sdk/plasma-sdk-5.6.5.ebuild kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.5.ebuild kde-p lasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1.ebuild kde-plasma/polkit-kde-agent/polkit-kde-agent-5.6.5.ebuild kde-plasma/powerdevil/powerdevil-5.6.5.ebuild kde-plasma/sddm-kcm/sddm-kcm-5.6.5.ebuild kde-plasma/systemsettings/systemsettings-5.6.5.ebuild kde-plasma/user-manager/user-manager-5.6.5.ebuild X-VCS-Directories: kde-plasma/plasma-nm/ kde-plasma/kdeplasma-addons/ kde-plasma/kinfocenter/ kde-plasma/sddm-kcm/ kde-plasma/kscreenlocker/ kde-plasma/ksshaskpass/ kde-plasma/kmenuedit/files/ kde-plasma/libksysguard/ kde-plasma/kscreen/ kde-plasma/breeze/ kde-plasma/kwayland-integration/ kde-plasma/plasma-workspace/files/ kde-plasma/plasma-sdk/ kde-plasma/kactivitymanagerd/ kde-plasma/plasma-pa/ kde-plasma/plasma-desktop/ kde-plasma/plasma-workspace-wallpapers/ kde-plasma/plasma-workspace/ kde-plasma/breeze-plymouth/ kde-plasma/kwrited/ kde-plasma/kwin/ kde-plasma/kde-cli-tools/ kde-plasma/kwin/files/ kde-plasma/bluedevil/ kde-plasma/oxygen/ kde-plasma/kwallet-pam/ kde-plasma/milou/ kde-plasma/kgamma/ kde-plasma/plasma-meta/ kde-plasma/plasma-integration/ kde-plasma/breeze-grub/ kde-plasma/khotkeys/ kde-plasma/kdecoration/ kde-plasma/polkit-kde-agent/ kde-plasma/breeze-gtk/ kde-plasma/plasma-sdk/files/ kde-plasma/powerdevil/ kde-plasma/kmenuedit/ kde-plasma/libkscreen/ kde-plasma/kd e-gtk-config/ kde-plasma/systemsettings/ kde-plasma/plasma-mediacenter/ kde-plasma/ksysguard/ kde-plasma/user-manager/ kde-plasma/kscreenlocker/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: f0497737906434164857dbe976f433a4f114b4d9 X-VCS-Branch: master Date: Sat, 18 Jun 2016 18:50:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f31a4679-875d-4438-aab1-821adb459c30 X-Archives-Hash: 17e459aa00ea2dfa069c5f71c6e15f68 commit: f0497737906434164857dbe976f433a4f114b4d9 Author: Michael Palimaka gentoo org> AuthorDate: Sat Jun 18 18:50:11 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Jun 18 18:50:45 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f0497737 kde-plasma: 5.6.5 moved to main tree Package-Manager: portage-2.3.0_rc1 kde-plasma/bluedevil/bluedevil-5.6.5.ebuild | 42 -- kde-plasma/breeze-grub/breeze-grub-5.6.5.ebuild | 31 -- kde-plasma/breeze-gtk/breeze-gtk-5.6.5.ebuild | 13 - .../breeze-plymouth/breeze-plymouth-5.6.5.ebuild | 18 - kde-plasma/breeze/breeze-5.6.5.ebuild | 66 --- .../kactivitymanagerd-5.6.5.ebuild | 37 -- .../kde-cli-tools/kde-cli-tools-5.6.5.ebuild | 60 --- .../kde-gtk-config/kde-gtk-config-5.6.5.ebuild | 57 --- kde-plasma/kdecoration/kdecoration-5.6.5.ebuild | 17 - .../kdeplasma-addons/kdeplasma-addons-5.6.5.ebuild | 57 --- kde-plasma/kgamma/kgamma-5.6.5.ebuild | 30 -- kde-plasma/khotkeys/khotkeys-5.6.5.ebuild | 46 -- kde-plasma/kinfocenter/kinfocenter-5.6.5.ebuild | 88 ---- .../kmenuedit/files/kmenuedit-5.5.5-hotkeys.patch | 44 -- kde-plasma/kmenuedit/kmenuedit-5.6.5.ebuild | 47 -- kde-plasma/kscreen/kscreen-5.6.5.ebuild | 38 -- .../kscreenlocker-5.4.90-no-SUID-no-GUID.patch | 16 - .../kscreenlocker/kscreenlocker-5.6.5.ebuild | 90 ---- kde-plasma/ksshaskpass/ksshaskpass-5.6.5.ebuild | 50 -- kde-plasma/ksysguard/ksysguard-5.6.5.ebuild | 48 -- kde-plasma/kwallet-pam/kwallet-pam-5.6.5.ebuild | 91 ---- .../kwayland-integration-5.6.5.ebuild | 23 - .../kwin/files/kwin-5.6.3-glibc-sysmacros.patch | 24 - kde-plasma/kwin/kwin-5.6.5.ebuild | 96 ---- kde-plasma/kwrited/kwrited-5.6.5.ebuild | 24 - kde-plasma/libkscreen/libkscreen-5.6.5.ebuild | 36 -- kde-plasma/libksysguard/libksysguard-5.6.5.ebuild | 54 -- kde-plasma/milou/milou-5.6.5.ebuild | 30 -- kde-plasma/oxygen/oxygen-5.6.5.ebuild | 36 -- .../plasma-desktop/plasma-desktop-5.6.5.ebuild | 154 ------ .../plasma-integration-5.6.5.ebuild | 40 -- .../plasma-mediacenter-5.6.5.ebuild | 48 -- kde-plasma/plasma-meta/plasma-meta-5.6.5.ebuild | 64 --- kde-plasma/plasma-nm/plasma-nm-5.6.5.ebuild | 66 --- kde-plasma/plasma-pa/plasma-pa-5.6.5.ebuild | 27 - .../files/plasma-sdk-5.5.5-dependencies.patch | 51 -- .../files/plasma-sdk-5.5.5-qtwebkit-optional.patch | 32 -- kde-plasma/plasma-sdk/plasma-sdk-5.6.5.ebuild | 62 --- .../plasma-workspace-wallpapers-5.6.5.ebuild | 19 - .../files/plasma-workspace-5.6.0-rpath.patch | 28 - .../plasma-workspace-5.6.5-drop-kscreen-dep.patch | 562 --------------------- .../plasma-workspace-5.6.5.1.ebuild | 166 ------ .../polkit-kde-agent/polkit-kde-agent-5.6.5.ebuild | 31 -- kde-plasma/powerdevil/powerdevil-5.6.5.ebuild | 85 ---- kde-plasma/sddm-kcm/sddm-kcm-5.6.5.ebuild | 39 -- .../systemsettings/systemsettings-5.6.5.ebuild | 46 -- kde-plasma/user-manager/user-manager-5.6.5.ebuild | 26 - 47 files changed, 2855 deletions(-) diff --git a/kde-plasma/bluedevil/bluedevil-5.6.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.6.5.ebuild deleted file mode 100644 index b492cda..0000000 --- a/kde-plasma/bluedevil/bluedevil-5.6.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Bluetooth stack for KDE Plasma" -HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -COMMON_DEPEND=" - $(add_frameworks_dep bluez-qt) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -DEPEND="${COMMON_DEPEND} - x11-misc/shared-mime-info -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - !app-mobilephone/obexd - !app-mobilephone/obex-data-server - !net-wireless/bluedevil - !net-wireless/kbluetooth -" diff --git a/kde-plasma/breeze-grub/breeze-grub-5.6.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.6.5.ebuild deleted file mode 100644 index fde1831..0000000 --- a/kde-plasma/breeze-grub/breeze-grub-5.6.5.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_AUTODEPS="false" -KDE_DEBUG="false" -inherit kde5 - -DESCRIPTION="Breeze theme for GRUB" -LICENSE="GPL-3+" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -src_prepare() { - default -} - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - insinto /usr/share/grub/themes - doins -r breeze -} diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.6.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.6.5.ebuild deleted file mode 100644 index 03be4ed..0000000 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.6.5.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Official GTK+ port of KDE's Breeze widget style" -HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk" -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.6.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.6.5.ebuild deleted file mode 100644 index b5c4178..0000000 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.6.5.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_AUTODEPS="false" -inherit kde5 - -DESCRIPTION="Breeze theme for Plymouth" -LICENSE="GPL-2+ GPL-3+" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND="sys-boot/plymouth" -DEPEND="${RDEPEND} - $(add_frameworks_dep extra-cmake-modules) -" diff --git a/kde-plasma/breeze/breeze-5.6.5.ebuild b/kde-plasma/breeze/breeze-5.6.5.ebuild deleted file mode 100644 index 4eaa5af..0000000 --- a/kde-plasma/breeze/breeze-5.6.5.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit kde5 multibuild - -DESCRIPTION="Breeze visual style for the Plasma desktop" -HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="qt4" - -DEPEND=" - $(add_frameworks_dep frameworkintegration) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep plasma) - $(add_plasma_dep kdecoration) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - x11-libs/libxcb - qt4? ( - kde-base/kdelibs:4 - x11-libs/libX11 - ) -" -RDEPEND="${DEPEND} - $(add_frameworks_dep breeze-icons) - $(add_plasma_dep kde-cli-tools) -" - -pkg_setup() { - kde5_pkg_setup - MULTIBUILD_VARIANTS=( kf5 $(usev qt4) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=() - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then - mycmakeargs+=( -DUSE_KDE4=true ) - fi - - kde5_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant kde5_src_compile -} - -src_install() { - multibuild_foreach_variant kde5_src_install -} diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild deleted file mode 100644 index 64795f0..0000000 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit kde5 - -DESCRIPTION="System service to manage user's activities, track the usage patterns etc." -LICENSE="|| ( GPL-2 GPL-3 )" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -COMMON_DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.54 -" -RDEPEND="${COMMON_DEPEND} - ! -Date: Fri, 1 Apr 2016 05:17:40 +1100 -Subject: [PATCH] Fix build when KHotKeysDBusInterface is disabled/missing. - -Summary: -By testing the variable itself (rather than its contents) we avoid a failure -when KHotKeysDBusInterface is disabled or missing as KHotKeysDBusInterface_FOUND -will not be defined. - -Reviewers: #plasma, graesslin - -Reviewed By: #plasma, graesslin - -Differential Revision: https://phabricator.kde.org/D1278 ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c615d9f..a2e43ae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -43,7 +43,7 @@ set(kmenueditcommon_STAT_SRCS preferencesdlg.cpp klinespellchecking.cpp basictab - ########### next target ############### - qt5_add_dbus_adaptor( kmenueditcommon_STAT_SRCS org.kde.kmenuedit.xml kmenuedit.h KMenuEdit) - --if(NOT WIN32 AND ${KHotKeysDBusInterface_FOUND}) -+if(NOT WIN32 AND KHotKeysDBusInterface_FOUND) - qt5_add_dbus_interface( - kmenueditcommon_STAT_SRCS - ${KHOTKEYS_DBUS_INTERFACE} -@@ -82,7 +82,7 @@ install(TARGETS kmenuedit ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) - install( PROGRAMS org.kde.kmenuedit.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) - install( FILES kmenueditui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kmenuedit ) - --if(NOT WIN32 AND ${KHotKeysDBusInterface_FOUND}) -+if(NOT WIN32 AND KHotKeysDBusInterface_FOUND) - add_dependencies(kdeinit_kmenuedit kded_khotkeys) - endif() - --- -2.7.3 - diff --git a/kde-plasma/kmenuedit/kmenuedit-5.6.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.6.5.ebuild deleted file mode 100644 index 089cef6..0000000 --- a/kde-plasma/kmenuedit/kmenuedit-5.6.5.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="true" -inherit kde5 - -DESCRIPTION="KDE Plasma menu editor" -HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+hotkeys" - -DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep sonnet) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - hotkeys? ( $(add_plasma_dep khotkeys) ) -" -RDEPEND="${DEPEND} - !kde-base/kmenuedit:4 -" - -PATCHES=( "${FILESDIR}/${PN}-5.5.5-hotkeys.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface) - ) - - kde5_src_configure -} diff --git a/kde-plasma/kscreen/kscreen-5.6.5.ebuild b/kde-plasma/kscreen/kscreen-5.6.5.ebuild deleted file mode 100644 index 55a03e8..0000000 --- a/kde-plasma/kscreen/kscreen-5.6.5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="KDE Plasma screen management" -HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen" - -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_plasma_dep libkscreen) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools) - $(add_qt_dep qtgraphicaleffects) - !kde-misc/kscreen -" - -# bug #580440, last checked 5.6.3 -RESTRICT="test" diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch deleted file mode 100644 index dc26f5f..0000000 --- a/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt -index a63fa1403e897e70989dc2e1ba7eed4bc69cbb51..12d1bfb3c690eca1acf344045a92eb942669da83 100644 ---- a/kcheckpass/CMakeLists.txt -+++ b/kcheckpass/CMakeLists.txt -@@ -22,10 +22,6 @@ endif () - - set_property(TARGET kcheckpass APPEND_STRING PROPERTY COMPILE_FLAGS " -U_REENTRANT") - target_link_libraries(kcheckpass ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES}) --install(TARGETS kcheckpass DESTINATION ${KDE_INSTALL_LIBEXECDIR}) --install(CODE " -- set(KCP_PATH \"\$ENV{DESTDIR}${KDE_INSTALL_LIBEXECDIR}/kcheckpass\") -- execute_process(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\") --") -+install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR}) - - #EXTRA_DIST = README diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.6.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.6.5.ebuild deleted file mode 100644 index 3c33172..0000000 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.6.5.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 pam - -DESCRIPTION="Library and components for secure lock screen architecture" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="pam" - -COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - dev-libs/wayland - x11-libs/libX11 - x11-libs/libXi - x11-libs/libxcb - x11-libs/xcb-util-keysyms - pam? ( virtual/pam ) -" -DEPEND="${COMMON_DEPEND} - x11-proto/xproto -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - !. - #include - - #include -+#include - #include - #include "utils.h" - -diff --git a/virtual_terminal.cpp b/virtual_terminal.cpp -index 40628315620e3d943b7ae0462c4415072fc256b8..8ceb74d3adaae610d99fa7e8349d93cea366d2e8 100644 ---- a/virtual_terminal.cpp -+++ b/virtual_terminal.cpp -@@ -36,6 +36,7 @@ along with this program. If not, see . - #include - #include - #include -+#include - - #define RELEASE_SIGNAL SIGUSR1 - #define ACQUISITION_SIGNAL SIGUSR2 diff --git a/kde-plasma/kwin/kwin-5.6.5.ebuild b/kde-plasma/kwin/kwin-5.6.5.ebuild deleted file mode 100644 index 1092dd5..0000000 --- a/kde-plasma/kwin/kwin-5.6.5.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="optional" -KDE_TEST="optional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE window manager" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="gles2 multimedia" - -# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 -COMMON_DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kinit) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem X) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_plasma_dep kdecoration) - $(add_plasma_dep kscreenlocker) - $(add_qt_dep qtcore '' '' '5=') - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui 'gles2=,opengl(+)') - $(add_qt_dep qtscript) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - >=dev-libs/libinput-0.10 - >=dev-libs/wayland-1.2 - media-libs/fontconfig - media-libs/freetype - media-libs/libepoxy - media-libs/mesa[egl,gbm,gles2?,wayland] - virtual/libudev:= - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXi - x11-libs/libdrm - >=x11-libs/libxcb-1.10 - >=x11-libs/libxkbcommon-0.4.1 - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - multimedia? ( - || ( - $(add_qt_dep qtmultimedia 'gstreamer,qml') - $(add_qt_dep qtmultimedia 'gstreamer010,qml') - ) - ) - ! -Date: Sun Mar 13 14:43:50 2016 +0100 - - Make Qt5Test really optional, fix plasmate dependencies - - KF5NewStuff, KF5Parts are only required for plasmate. - Could not push KF5ItemModels down into plasmate without breaking - build. Is it a problem within KDevPlatform? - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b556de6..bc982ae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,7 +74,7 @@ endif() - # Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs: - find_package(KF5 REQUIRED COMPONENTS - Archive Completion Config ConfigWidgets CoreAddons DBusAddons Declarative I18n IconThemes ItemModels -- KIO NewStuff Parts Plasma PlasmaQuick Service TextEditor WidgetsAddons XmlGui WindowSystem) -+ KIO Plasma PlasmaQuick Service TextEditor WidgetsAddons XmlGui WindowSystem) - - ######################################################################### - -diff --git a/cuttlefish/CMakeLists.txt b/cuttlefish/CMakeLists.txt -index 6eaa78a..5b90fef 100644 ---- a/cuttlefish/CMakeLists.txt -+++ b/cuttlefish/CMakeLists.txt -@@ -2,7 +2,9 @@ project(cuttlefish) - add_definitions(-DTRANSLATION_DOMAIN=\"cuttlefish\") - - add_subdirectory(src) --add_subdirectory(autotests) -+if(BUILD_TESTING) -+ add_subdirectory(autotests) -+endif() - - - plasma_install_package(package org.kde.plasma.cuttlefish packages package) -diff --git a/plasmate/CMakeLists.txt b/plasmate/CMakeLists.txt -index 8f28ec4..4586102 100644 ---- a/plasmate/CMakeLists.txt -+++ b/plasmate/CMakeLists.txt -@@ -13,6 +13,8 @@ add_feature_info(GIT_EXECUTABLE_FOUND "Git" "Distributed Revision Control System - - find_package(KF5 REQUIRED COMPONENTS - KDELibs4Support -+ NewStuff -+ Parts - ) - - #install( FILES previewer/windowswitcher/thumbnails/konqueror.png diff --git a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch deleted file mode 100644 index 7aa92cc..0000000 --- a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,18 @@ - # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - --find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg WebKit WebKitWidgets Widgets Xml) -+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg Widgets Xml) -+ -+find_package(Qt5WebKit ${QT_MIN_VERSION} CONFIG) -+set_package_properties(Qt5WebKit PROPERTIES -+ PURPOSE "Required for plasmate" -+ TYPE OPTIONAL -+ ) -+find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} CONFIG) -+set_package_properties(Qt5WebKitWidgets PROPERTIES -+ PURPOSE "Required for plasmate" -+ TYPE OPTIONAL -+ ) - - find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET) - set_package_properties(Qt5Test PROPERTIES -@@ -78,7 +89,7 @@ - add_subdirectory(themeexplorer) - #add_subdirectory(remote-widgets-browser) - #add_subdirectory(wallpaperviewer) --if (KDevPlatform_FOUND) -+if (KDevPlatform_FOUND AND Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND) - add_subdirectory(plasmate) - endif() - - diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.6.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.6.5.ebuild deleted file mode 100644 index a655149..0000000 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.6.5.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_TEST="optional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Useful applications for Plasma development" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="plasmate" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - plasmate? ( - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep kparts) - $(add_qt_dep qtwebkit) - dev-util/kdevplatform:5 - ) -" -RDEPEND="${DEPEND} - !dev-util/plasmate -" - -PATCHES=( - "${FILESDIR}/${PN}-5.5.5-qtwebkit-optional.patch" # git master - "${FILESDIR}/${PN}-5.5.5-dependencies.patch" # RR pending -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package plasmate KDevPlatform) - $(cmake-utils_use_find_package plasmate Qt5WebKit) - $(cmake-utils_use_find_package plasmate Qt5WebKitWidgets) - ) - - kde5_src_configure -} diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.5.ebuild deleted file mode 100644 index 43ed73a..0000000 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.5.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_AUTODEPS="false" -KDE_DEBUG="false" -inherit kde5 - -DESCRIPTION="Additional wallpapers for the Plasma workspace" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep extra-cmake-modules) - $(add_qt_dep qtcore) -" -RDEPEND="! -Date: Mon Nov 23 21:34:24 2015 +0100 - - [phonon] Do not set RPATH - - REVIEW: 126210 - -diff --git a/phonon/platform_kde/CMakeLists.txt b/phonon/platform_kde/CMakeLists.txt -index 281425f..20ec8f9 100644 ---- a/phonon/platform_kde/CMakeLists.txt -+++ b/phonon/platform_kde/CMakeLists.txt -@@ -9,15 +9,6 @@ target_link_libraries(kde ${PHONON_LIBRARY} KF5::I18n KF5::KIOWidgets KF5::Notif - - kcoreaddons_desktop_to_json(kde phononbackend.desktop) - --if(NOT WIN32) -- set_target_properties(kde PROPERTIES -- INSTALL_RPATH_USE_LINK_PATH TRUE -- SKIP_BUILD_RPATH TRUE -- BUILD_WITH_INSTALL_RPATH TRUE -- INSTALL_RPATH ${KDE_INSTALL_LIBDIR} -- ) --endif() -- - install(TARGETS kde DESTINATION ${KDE_INSTALL_PLUGINDIR}/phonon_platform) - install(FILES phonon.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR}) - install(FILES phononbackend.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch deleted file mode 100644 index 80a7bc9..0000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch +++ /dev/null @@ -1,562 +0,0 @@ -commit 816b8a0e17cc087b05ac0155757c5d4a1ee6673a -Author: Aleix Pol -Date: Mon May 30 13:20:50 2016 +0200 - - Drop KScreen dependency from PlasmaShell - REVIEW: 125451 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,6 +26,4 @@ find_package(KF5XmlRpcClient REQUIRED) - find_package(KF5 REQUIRED COMPONENTS PlasmaQuick) - find_package(KF5 REQUIRED COMPONENTS SysGuard) --# Require KScreen >= 5.0.93 due to large API change --find_package(KF5 5.0.93 REQUIRED COMPONENTS Screen) - find_package(KF5 REQUIRED COMPONENTS Package) - # Baloo has a different version scheme than KF5 for now ---- a/shell/CMakeLists.txt -+++ b/shell/CMakeLists.txt -@@ -81,5 +81,4 @@ target_link_libraries(plasmashell - KF5::CoreAddons - KF5::DBusAddons -- KF5::Screen - KF5::Declarative - KF5::QuickAddons ---- a/shell/panelview.cpp -+++ b/shell/panelview.cpp -@@ -37,8 +37,6 @@ - - #include - #include --#include --#include - - #include - #include -@@ -87,5 +85,6 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent - connect(&m_unhideTimer, &QTimer::timeout, - this, &PanelView::restoreAutoHide); - -+ m_lastScreen = targetScreen; - connect(screen(), SIGNAL(geometryChanged(QRect)), - &m_positionPaneltimer, SLOT(start())); -@@ -102,8 +101,5 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent - connect(&m_strutsTimer, &QTimer::timeout, - this, &PanelView::updateStruts); - -- connect(m_corona->screensConfiguration()->screen().data(), &KScreen::Screen::currentSizeChanged, -- this, &PanelView::updateStruts); -- - qmlRegisterType(); - rootContext()->setContextProperty(QStringLiteral("panel"), this); -@@ -682,19 +678,23 @@ void PanelView::showEvent(QShowEvent *event) - { - PanelShadows::self()->addWindow(this); - PlasmaQuick::ContainmentView::showEvent(event); -- integrateScreen(); - - //When the screen is set, the screen is recreated internally, so we need to - //set anything that depends on the winId() -- connect(this, &QWindow::screenChanged, this, [this](QScreen* screen) { -- emit screenChangedProxy(screen); -+ connect(this, &QWindow::screenChanged, this, &PanelView::moveScreen, Qt::UniqueConnection); -+ integrateScreen(); -+} - -- if (!screen) -- return; -- integrateScreen(); -- showTemporarily(); -- m_positionPaneltimer.start(); -- }); -+void PanelView::moveScreen(QScreen* screen) -+{ -+ emit screenChangedProxy(screen); -+ m_lastScreen = screen; -+ -+ if (!screen) -+ return; -+ integrateScreen(); -+ showTemporarily(); -+ m_positionPaneltimer.start(); - } - - bool PanelView::event(QEvent *e) -@@ -904,5 +904,5 @@ void PanelView::updateStruts() - const QRect thisScreen = screen()->geometry(); - // QScreen::virtualGeometry() is very unreliable (Qt 5.5) -- const QRect wholeScreen = QRect(QPoint(0, 0), m_corona->screensConfiguration()->screen()->currentSize()); -+ const QRect wholeScreen = QRect(QPoint(0, 0), screen()->geometry().size()); - - //Extended struts against a screen edge near to another screen are really harmful, so windows maximized under the panel is a lesser pain ---- a/shell/panelview.h -+++ b/shell/panelview.h -@@ -136,6 +136,8 @@ public: - /* Shared with script/panel.cpp */ - static KConfigGroup panelConfig(ShellCorona *corona, Plasma::Containment *containment, QScreen *screen); - -+ void updateStruts(); -+ - protected: - void resizeEvent(QResizeEvent *ev) override; - void showEvent(QShowEvent *event) override; -@@ -162,7 +164,6 @@ protected Q_SLOTS: - * It will be called when the configuration is requested - */ - void showConfigurationInterface(Plasma::Applet *applet) override; -- void updateStruts(); - - private Q_SLOTS: - void themeChanged(); -@@ -176,5 +177,6 @@ private Q_SLOTS: - void screenDestroyed(QObject* screen); - - private: -+ void moveScreen(QScreen* screen); - void integrateScreen(); - bool containmentContainsPosition(const QPointF &point) const; -@@ -198,6 +200,7 @@ private: - //only for the mask, not to actually paint - Plasma::FrameSvg *m_background; - KWayland::Client::PlasmaShellSurface *m_shellSurface; -+ QWeakPointer m_lastScreen; - - static const int STRUTSTIMERDELAY = 200; - }; ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -44,11 +44,6 @@ - #include - #include - --#include --#include --#include --#include -- - #include - - #include -@@ -90,7 +85,6 @@ ShellCorona::ShellCorona(QObject *parent) - m_addPanelAction(nullptr), - m_addPanelsMenu(nullptr), - m_interactiveConsole(nullptr), -- m_screenConfiguration(nullptr), - m_waylandPlasmaShell(nullptr) - { - setupWaylandIntegration(); -@@ -305,14 +299,7 @@ void ShellCorona::setShell(const QString &shell) - - connect(m_activityConsumer, &KActivities::Consumer::serviceStatusChanged, this, &ShellCorona::load, Qt::UniqueConnection); - -- connect(new KScreen::GetConfigOperation(KScreen::GetConfigOperation::NoEDID), &KScreen::GetConfigOperation::finished, -- this, [this](KScreen::ConfigOperation *op) { -- if (op->hasError()) { -- qWarning() << "Error found while setting up ShellCorona's KScreen: " << op->errorString(); -- } -- m_screenConfiguration = qobject_cast(op)->config(); -- load(); -- }); -+ load(); - } - - QString ShellCorona::shell() const -@@ -320,17 +307,19 @@ QString ShellCorona::shell() const - return m_shell; - } - --bool outputLess(const KScreen::OutputPtr &a, const KScreen::OutputPtr &b) -+bool outputLess(QScreen* a, QScreen* b) - { -- return ((a->isEnabled() && !b->isEnabled()) -- || (a->isEnabled() == b->isEnabled() && (a->isPrimary() && !b->isPrimary())) -- || (a->isPrimary() == b->isPrimary() && (a->pos().x() < b->pos().x() -- || (a->pos().x() == b->pos().x() && a->pos().y() < b->pos().y())))); -+ const QPoint aPos = a->geometry().topLeft(); -+ const QPoint bPos = b->geometry().topLeft(); -+ -+ return (qGuiApp->primaryScreen() == a -+ || (qGuiApp->primaryScreen() != b && (aPos.x() < bPos.x() -+ || (aPos.x() == bPos.x() && aPos.y() < bPos.y())))); - } - --static QList sortOutputs(const KScreen::OutputList &outputs) -+static QList sortOutputs(const QList &outputs) - { -- QList ret = outputs.values(); -+ QList ret = outputs; - std::sort(ret.begin(), ret.end(), outputLess); - return ret; - } -@@ -338,8 +327,7 @@ static QList sortOutputs(const KScreen::OutputList &outputs) - void ShellCorona::load() - { - if (m_shell.isEmpty() || -- m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown || -- !m_screenConfiguration) { -+ m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown) { - return; - } - -@@ -373,13 +361,11 @@ void ShellCorona::load() - } - } - -- KScreen::ConfigMonitor::instance()->addConfig(m_screenConfiguration); -- //we're not going through the connectedOutputs because we need to connect to all outputs -- for (const KScreen::OutputPtr &output : sortOutputs(m_screenConfiguration->outputs())) { -- addOutput(output); -+ for (QScreen* screen : sortOutputs(qGuiApp->screens())) { -+ addOutput(screen); - } -- connect(m_screenConfiguration.data(), &KScreen::Config::outputAdded, this, &ShellCorona::addOutput); -- connect(m_screenConfiguration.data(), &KScreen::Config::primaryOutputChanged, this, &ShellCorona::primaryOutputChanged); -+ connect(qGuiApp, &QGuiApplication::screenAdded, this, &ShellCorona::addOutput); -+ connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &ShellCorona::primaryOutputChanged); - connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved); - - if (!m_waitingPanels.isEmpty()) { -@@ -401,13 +387,8 @@ void ShellCorona::primaryOutputChanged() - return; - } - -- const KScreen::OutputPtr output = m_screenConfiguration->primaryOutput(); -- if (!output) { -- return; -- } -- - QScreen *oldPrimary = m_views[0]->screen(); -- QScreen *newPrimary = outputToScreen(output); -+ QScreen *newPrimary = qGuiApp->primaryScreen(); - if (!newPrimary || newPrimary == oldPrimary) { - return; - } -@@ -433,7 +414,7 @@ void ShellCorona::primaryOutputChanged() - Q_ASSERT(oldPrimary != newPrimary); - Q_ASSERT(m_views[0]->screen() == oldPrimary); - Q_ASSERT(m_views[0]->screen() != newPrimary); -- Q_ASSERT(m_views[0]->geometry() == oldPrimary->geometry()); -+// Q_ASSERT(m_views[0]->geometry() == oldPrimary->geometry()); - qDebug() << "adapting" << newPrimary->geometry() << oldPrimary->geometry(); - - view->setScreen(oldPrimary); -@@ -442,6 +423,7 @@ void ShellCorona::primaryOutputChanged() - } - - m_views[0]->setScreen(newPrimary); -+ Q_ASSERT(m_views[0]->screen()==newPrimary); - - foreach (PanelView *panel, m_panelViews) { - if (panel->screen() == oldPrimary) { -@@ -459,20 +441,15 @@ void ShellCorona::screenInvariants() const - { - Q_ASSERT(m_views.count() <= QGuiApplication::screens().count()); - QScreen *s = m_views.isEmpty() ? nullptr : m_views[0]->screen(); -- const KScreen::OutputPtr primaryOutput = m_screenConfiguration->primaryOutput(); -- if (!s) { -- qWarning() << "error: couldn't find primary output" << primaryOutput; -- return; -- } - -- QScreen* ks = outputToScreen(primaryOutput); -- Q_ASSERT(!ks || ks == s || !primaryOutput->isEnabled() || m_redundantOutputs.contains(primaryOutput)); -+ QScreen* ks = qGuiApp->primaryScreen(); -+ Q_ASSERT(ks == s); - - QSet screens; - int i = 0; - foreach (const DesktopView *view, m_views) { - QScreen *screen = view->screen(); - Q_ASSERT(!screens.contains(screen)); -- Q_ASSERT(!m_redundantOutputs.contains(screenToOutput(screen))); -+ Q_ASSERT(!m_redundantOutputs.contains(screen)); - // commented out because a different part of the code-base is responsible for this - // and sometimes is not yet called here. -@@ -492,7 +469,7 @@ void ShellCorona::screenInvariants() const - ++i; - } - -- foreach (const KScreen::OutputPtr &out, m_redundantOutputs) { -+ foreach (QScreen* out, m_redundantOutputs) { - Q_ASSERT(isOutputRedundant(out)); - } - -@@ -630,18 +607,14 @@ KActivities::Controller *ShellCorona::activityController() - - int ShellCorona::numScreens() const - { -- //don't start loading screens until kscreen has finished initialising. -- if (!m_screenConfiguration) { -- return 0; -- } -- return m_screenConfiguration->connectedOutputs().count(); -+ return qGuiApp->screens().count(); - } - - QRect ShellCorona::screenGeometry(int id) const - { - if (id >= m_views.count() || id < 0) { - qWarning() << "requesting unexisting screen" << id; -- QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput()); -+ QScreen *s = qGuiApp->primaryScreen(); - return s ? s->geometry() : QRect(); - } - return m_views[id]->geometry(); -@@ -652,7 +625,7 @@ QRegion ShellCorona::availableScreenRegion(int id) const - if (id >= m_views.count() || id < 0) { - //each screen should have a view - qWarning() << "requesting unexisting screen" << id; -- QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput()); -+ QScreen *s = qGuiApp->primaryScreen(); - return s ? s->availableGeometry() : QRegion(); - } - DesktopView *view = m_views[id]; -@@ -673,7 +646,7 @@ QRect ShellCorona::availableScreenRect(int id) const - if (id >= m_views.count() || id < 0) { - //each screen should have a view - qWarning() << "requesting unexisting screen" << id; -- QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput()); -+ QScreen *s = qGuiApp->primaryScreen(); - return s ? s->availableGeometry() : QRect(); - } - -@@ -793,24 +766,20 @@ void ShellCorona::screenRemoved(QScreen* screen) - { - if (DesktopView* v = desktopForScreen(screen)) - remove(v); --// addOutput(screenToOutput(screen)); -- m_reconsiderOutputsTimer.start(); --} - --void ShellCorona::outputEnabledChanged() --{ -- addOutput(KScreen::OutputPtr(qobject_cast(sender()), [](void*){})); -+ m_reconsiderOutputsTimer.start(); -+ m_redundantOutputs.remove(screen); - } - --bool ShellCorona::isOutputRedundant(const KScreen::OutputPtr &screen) const -+bool ShellCorona::isOutputRedundant(QScreen* screen) const - { -- Q_ASSERT(screen->currentMode()); -+ Q_ASSERT(screen); - const QRect geometry = screen->geometry(); - - //FIXME: QScreen doesn't have any idea of "this qscreen is clone of this other one - //so this ultra inefficient heuristic has to stay until we have a slightly better api -- foreach (const KScreen::OutputPtr &s, m_screenConfiguration->connectedOutputs()) { -- if (screen == s || !s->isEnabled() || !s->currentMode()) { -+ foreach (QScreen* s, qGuiApp->screens()) { -+ if (screen == s) { - continue; - } - -@@ -827,71 +796,47 @@ bool ShellCorona::isOutputRedundant(const KScreen::OutputPtr &screen) const - - void ShellCorona::reconsiderOutputs() - { -- if (!m_screenConfiguration) { -- return; -- } -- foreach (const KScreen::OutputPtr &out, m_screenConfiguration->connectedOutputs()) { -- if (!out->isEnabled() || !out->currentMode()) { --// qDebug() << "skip screen" << out << desktopForScreen(outputToScreen(out)); -- continue; -- } -- -- if (m_redundantOutputs.contains(out)) { -- if (!isOutputRedundant(out)) { -+ foreach (QScreen* screen, qGuiApp->screens()) { -+ if (m_redundantOutputs.contains(screen)) { -+ if (!isOutputRedundant(screen)) { - // qDebug() << "not redundant anymore" << out; -- addOutput(out); -+ addOutput(screen); - } -- } else if (isOutputRedundant(out)) { --// qDebug() << "new redundant screen" << out; -+ } else if (isOutputRedundant(screen)) { -+ qDebug() << "new redundant screen" << screen; - -- if (DesktopView* v = desktopForScreen(outputToScreen(out))) -+ if (DesktopView* v = desktopForScreen(screen)) - remove(v); - -- m_redundantOutputs.insert(out); -+ m_redundantOutputs.insert(screen); - } - // else - // qDebug() << "fine screen" << out; - } - -+ updateStruts(); -+ - CHECK_SCREEN_INVARIANTS - } - --void ShellCorona::addOutput(const KScreen::OutputPtr &output) -+void ShellCorona::addOutput(QScreen* screen) - { -- if (!output) { -- return; -- } -+ Q_ASSERT(screen); - -- connect(output.data(), &KScreen::Output::isEnabledChanged, -- this, &ShellCorona::outputEnabledChanged, -- Qt::UniqueConnection); -- connect(output.data(), &KScreen::Output::posChanged, -- &m_reconsiderOutputsTimer, static_cast(&QTimer::start), -- Qt::UniqueConnection); -- connect(output.data(), &KScreen::Output::currentModeIdChanged, -+ connect(screen, &QScreen::geometryChanged, - &m_reconsiderOutputsTimer, static_cast(&QTimer::start), - Qt::UniqueConnection); - -- if (!output->isEnabled()) { -- m_redundantOutputs.remove(output); -- m_reconsiderOutputsTimer.start(); -- return; -- } -- -- QScreen *screen = outputToScreen(output); -- Q_ASSERT(screen); -- -- if (isOutputRedundant(output)) { -- m_redundantOutputs.insert(output); -+ if (isOutputRedundant(screen)) { -+ m_redundantOutputs.insert(screen); - return; - } else { -- m_redundantOutputs.remove(output); -+ m_redundantOutputs.remove(screen); - } - - int insertPosition = 0; - foreach (DesktopView *view, m_views) { -- const KScreen::OutputPtr out = screenToOutput(view->screen()); -- if (outputLess(output, out)) { -+ if (outputLess(screen, view->screen())) { - break; - } - -@@ -930,32 +875,6 @@ void ShellCorona::addOutput(const KScreen::OutputPtr &output) - CHECK_SCREEN_INVARIANTS - } - --QScreen *ShellCorona::outputToScreen(const KScreen::OutputPtr &output) const --{ -- if (!output) { -- return nullptr; -- } -- -- foreach (QScreen *screen, QGuiApplication::screens()) { -- if (screen->name() == output->name()) { -- return screen; -- } -- } -- -- return nullptr; --} -- --KScreen::OutputPtr ShellCorona::screenToOutput(QScreen *screen) const --{ -- foreach (const KScreen::OutputPtr &output, m_screenConfiguration->connectedOutputs()) { -- if (screen->name() == output->name()) { -- return output; -- } -- } -- -- return KScreen::OutputPtr(); --} -- - QScreen* ShellCorona::insertScreen(QScreen *screen, int idx) - { - if (idx == m_views.count()) { -@@ -1579,5 +1498,5 @@ int ShellCorona::screenForContainment(const Plasma::Containment *containment) co - //won't be associated to a screen - // qDebug() << "ShellCorona screenForContainment: " << containment << " Last screen is " << containment->lastScreen(); -- for (int i = 0, count = m_screenConfiguration->outputs().count(); iscreens().count(); ilastScreen() == i && - (containment->activity() == m_activityConsumer->currentActivity() || -@@ -1703,11 +1622,6 @@ void ShellCorona::desktopContainmentDestroyed(QObject *obj) - } - } - --KScreen::ConfigPtr ShellCorona::screensConfiguration() const --{ -- return m_screenConfiguration; --} -- - void ShellCorona::showOpenGLNotCompatibleWarning() - { - static bool s_multipleInvokations = false; -@@ -1750,6 +1664,13 @@ KWayland::Client::PlasmaShell *ShellCorona::waylandPlasmaShellInterface() const - return m_waylandPlasmaShell; - } - -+void ShellCorona::updateStruts() -+{ -+ foreach(PanelView* view, m_panelViews) { -+ view->updateStruts(); -+ } -+} -+ - // Desktop corona handler - - ---- a/shell/shellcorona.h -+++ b/shell/shellcorona.h -@@ -30,8 +30,6 @@ - - #include - --#include -- - class Activity; - class DesktopView; - class PanelView; -@@ -99,8 +97,6 @@ public: - - Plasma::Containment *setContainmentTypeForScreen(int screen, const QString &plugin); - -- KScreen::ConfigPtr screensConfiguration() const; -- - QScreen *screenForId(int screenId) const; - void remove(DesktopView *desktopView); - -@@ -182,8 +178,7 @@ private Q_SLOTS: - void addPanel(QAction *action); - void populateAddPanelsMenu(); - -- void outputEnabledChanged(); -- void addOutput(const KScreen::OutputPtr &output); -+ void addOutput(QScreen* screen); - void primaryOutputChanged(); - - void activityOpened(); -@@ -197,10 +192,9 @@ private Q_SLOTS: - void screenRemoved(QScreen* screen); - - private: -- QScreen *outputToScreen(const KScreen::OutputPtr &output) const; -- KScreen::OutputPtr screenToOutput(QScreen *screen) const; -+ void updateStruts(); - QScreen *insertScreen(QScreen *screen, int idx); - void removeView(int idx); -- bool isOutputRedundant(const KScreen::OutputPtr &output) const; -+ bool isOutputRedundant(QScreen* screen) const; - void reconsiderOutputs(); - QList panelsForScreen(QScreen *screen) const; -@@ -227,9 +221,8 @@ private: - QMenu *m_addPanelsMenu; - KPackage::Package m_lookAndFeelPackage; -- QSet m_redundantOutputs; -+ QSet m_redundantOutputs; - QList m_alternativesObjects; - KDeclarative::QmlObject *m_interactiveConsole; - -- KScreen::ConfigPtr m_screenConfiguration; - QTimer m_waitingPanelsTimer; - QTimer m_appConfigSyncTimer; diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1.ebuild deleted file mode 100644 index 62c107a..0000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 multilib qmake-utils - -DESCRIPTION="KDE Plasma workspace" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+geolocation gps prison qalculate" - -COMMON_DEPEND=" - $(add_frameworks_dep baloo) - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kdesu) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kjs) - $(add_frameworks_dep kjsembed) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep kxmlrpcclient) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_plasma_dep kscreenlocker) - $(add_plasma_dep kwin) - $(add_plasma_dep libksysguard) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtscript) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - dev-libs/libdbusmenu-qt[qt5] - media-libs/phonon[qt5] - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/xcb-util - x11-libs/xcb-util-image - geolocation? ( $(add_frameworks_dep networkmanager-qt) ) - gps? ( sci-geosciences/gpsd ) - prison? ( media-libs/prison:5 ) - qalculate? ( sci-libs/libqalculate ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kded) - $(add_kdeapps_dep kio-extras) - $(add_plasma_dep kde-cli-tools) - $(add_plasma_dep ksysguard) - $(add_plasma_dep milou) - $(add_qt_dep qdbus) - $(add_qt_dep qtgraphicaleffects) - $(add_qt_dep qtpaths) - $(add_qt_dep qtquickcontrols 'widgets') - app-text/iso-codes - x11-apps/mkfontdir - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xset - x11-apps/xsetroot - !dev-libs/xembed-sni-proxy - !kde-base/freespacenotifier:4 - !kde-base/libtaskmanager:4 - !kde-base/kcminit:4 - !kde-base/kdebase-startkde:4 - !kde-base/klipper:4 - !kde-base/krunner:4 - !kde-base/ksmserver:4 - !kde-base/ksplash:4 - !kde-base/plasma-workspace:4 -" -DEPEND="${COMMON_DEPEND} - x11-proto/xproto -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4-startkde-script.patch" - "${FILESDIR}/${PN}-5.6.0-rpath.patch" - "${FILESDIR}/${PN}-5.6.5-drop-kscreen-dep.patch" -) - -RESTRICT="test" - -S=${WORKDIR}/${PN}-5.6.5 - -src_prepare() { - kde5_src_prepare - - sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ - -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt) - $(cmake-utils_use_find_package gps libgps) - $(cmake-utils_use_find_package prison KF5Prison) - $(cmake-utils_use_find_package qalculate Qalculate) - ) - - kde5_src_configure -} - -src_install() { - kde5_src_install - - # startup and shutdown scripts - insinto /etc/plasma/startup - doins "${FILESDIR}/10-agent-startup.sh" - - insinto /etc/plasma/shutdown - doins "${FILESDIR}/10-agent-shutdown.sh" -} - -pkg_postinst () { - kde5_pkg_postinst - - echo - elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," - elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and" - elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" - echo -} diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.6.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.6.5.ebuild deleted file mode 100644 index 8d3e3ef..0000000 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.6.5.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KMNAME="${PN}-1" -inherit kde5 - -DESCRIPTION="PolKit agent module for KDE Plasma" -HOMEPAGE="https://www.kde.org" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - || ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5] ) -" -RDEPEND="${DEPEND} - !sys-auth/polkit-kde-agent:4[-minimal(-)] - !sys-auth/polkit-kde-agent:5 -" diff --git a/kde-plasma/powerdevil/powerdevil-5.6.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.6.5.ebuild deleted file mode 100644 index be3eaf5..0000000 --- a/kde-plasma/powerdevil/powerdevil-5.6.5.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="true" -inherit kde5 - -DESCRIPTION="Power management for KDE Plasma Shell" -HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="systemd" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth policykit) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_plasma_dep libkscreen) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - virtual/libudev:= - x11-libs/libxcb -" - -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools) - systemd? ( >=sys-power/upower-0.9.23 ) - !systemd? ( - sys-auth/polkit-pkla-compat - || ( - ( - >=sys-auth/consolekit-1.0.1 - sys-power/pm-utils - >=sys-power/upower-0.9.23 - ) - sys-power/upower-pm-utils - ) - ) - !kde-base/powerdevil:4 - !kde-base/systemsettings:4[handbook] -" - -src_install() { - kde5_src_install - - if ! use systemd ; then - insinto /etc/polkit-1/localauthority/10-vendor.d/ - doins "${FILESDIR}"/10-org.freedesktop.upower.pkla - doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla - doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla - doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla - fi -} - -pkg_postinst() { - kde5_pkg_postinst - - if has_version sys-power/upower-pm-utils && ! use systemd ; then - ewarn "You have sys-power/upower-pm-utils installed, which was recommended in the past to" - ewarn "enable suspend and hibernate support. This workaround is no longer required, and it" - ewarn "is now recommended to use a recent version of upower and consolekit instead:" - ewarn - ewarn "emerge --ask --update \">=sys-auth/consolekit-1.0.0\" sys-power/upower" - fi -} diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.6.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.6.5.ebuild deleted file mode 100644 index 112a759..0000000 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.6.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit kde5 - -DESCRIPTION="KDE Plasma control module for SDDM" -HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm" - -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -COMMON_DEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - x11-libs/libX11 - x11-libs/libXcursor -" -DEPEND="${COMMON_DEPEND} - x11-libs/libXfixes -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - x11-misc/sddm - !kde-misc/sddm-kcm -" - -DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/systemsettings/systemsettings-5.6.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.6.5.ebuild deleted file mode 100644 index e604347..0000000 --- a/kde-plasma/systemsettings/systemsettings-5.6.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="System settings utility" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="classic gtk" - -DEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - classic? ( $(add_frameworks_dep khtml) ) -" -RDEPEND="${DEPEND} - gtk? ( $(add_plasma_dep kde-gtk-config) ) - !kde-base/systemsettings:4 -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package classic KF5KHtml) - ) - - kde5_src_configure -} diff --git a/kde-plasma/user-manager/user-manager-5.6.5.ebuild b/kde-plasma/user-manager/user-manager-5.6.5.ebuild deleted file mode 100644 index 8580afb..0000000 --- a/kde-plasma/user-manager/user-manager-5.6.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Simple system settings module to manage the users of your system" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - >=dev-libs/libpwquality-1.3.0 -" -RDEPEND="${DEPEND}"