kde-plasma: Version bump KDE Plasma 5.7.0

Package-Manager: portage-2.3.0

4 files changed, 282 insertions, 0 deletions

diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index ae9c62767300..05fa2497cd33 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,3 @@
 DIST powerdevil-5.5.5.tar.xz 346352 SHA256 73bfbf63317448a3ab92e5250a016bf7c5628ec10cdf277239dde4e8af2160e9 SHA512 e344ad9654eedfcc396fda9997a91bcf97ea63c2712febf024ee9bdb0d9839e9eeebe32dcdb7dccfacda03f1e51ec499e40c88e59b32d0409eb12116149c4772 WHIRLPOOL f79581fe298eea827233647eb961e29cf99cef57c60c52f3037316015b953517f64a8a1472e870a98d3f25488224834022a3c49988c1b09f90c8a68a69f029d1
 DIST powerdevil-5.6.5.tar.xz 353788 SHA256 6761a3044e94f65ede54e14f0c548eb4b3ced9a4a9499935f33a2e1cc2b0a01f SHA512 4e2c32770758e56a3d2cca65c5603dd41d8703921ec899ac2baef69d0f26b73c0cf7207aa3a5447c77c9339cde3910c846510a099b9789c66eeb633d7d89cddc WHIRLPOOL e6f7c9f6ef182369a01b10e1ea63b648894efce295b3e9470519f0fdbc29be04514f7477e74032ac24c17906953292e9049178919b458c4a919b7564042abf29
+DIST powerdevil-5.7.0.tar.xz 356376 SHA256 d52c204ffecfbea12a3c6cc100403031c20257b48c56cbf32a592ef9ff4e85f1 SHA512 d8eb1d66122a8f9739670995ab583e6fe5c7a9c5080639516bb63a92769d2c77a4bc073ce09aa5f5cdc56c6f3fb00afb51d7ad01513e44d5aaa53f09f7b2db09 WHIRLPOOL e7b38cc9d9ab5ea5e354bb4f8f9ad3f1334d6ef3cbfe939da44ed7f3e08f44da9de114223d70dd9251881bd23a3bf1b53d92d3790ea7a6a4dacfce5153bec458
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.6.95-wireless-optional.patch b/kde-plasma/powerdevil/files/powerdevil-5.6.95-wireless-optional.patch
new file mode 100644
index 000000000000..b1731c734210
--- /dev/null
+++ b/kde-plasma/powerdevil/files/powerdevil-5.6.95-wireless-optional.patch
@@ -0,0 +1,177 @@
+commit 7d8a12c65dbbb8166beee53b4bb0c1f2fdede6c6
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Jun 19 12:14:25 2016 +0200
+
+    Revert-Revert "Make NetworkManagerQt and BluezQt optional"
+    
+    This reverts commit f2018a8d3c5f2824278bb167cb48d938ca2670c4.
+    
+    commit 3257be562b2c48eb11c9e32f7e4fd82ea7fb090b
+    Author: Heiko Becker <heirecka@exherbo.org>
+    Date:   Wed Jun 15 23:07:46 2016 +0200
+    
+    Summary:
+    While it is most certainly sensible and helpful on a system equipped
+    with Bluetooth and Wi-Fi hardware, it serves no purpose on a desktop
+    system without these and just pulls in a long chain of unwanted
+    dependencies.
+    
+    Test Plan: Successfully built with BluezQt and NetworkManagerQt present and missing.
+    
+    Reviewers: #plasma, broulik
+    
+    Subscribers: plasma-devel
+    
+    Tags: #plasma
+    
+    Differential Revision: https://phabricator.kde.org/D1944
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6b631b4..6117f75 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,9 +22,32 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ endif()
+ 
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets DBus X11Extras)
+-find_package(KF5 REQUIRED COMPONENTS Activities Auth IdleTime Config DBusAddons Solid I18n GlobalAccel KIO NotifyConfig Screen KDELibs4Support Wayland NetworkManagerQt BluezQt)
++find_package(KF5 REQUIRED COMPONENTS Activities Auth IdleTime Config DBusAddons Solid I18n GlobalAccel KIO NotifyConfig Screen KDELibs4Support Wayland)
+ find_package(LibKWorkspace CONFIG REQUIRED)
+ 
++find_package(KF5BluezQt)
++set_package_properties(KF5BluezQt
++    PROPERTIES DESCRIPTION "Qt wrapper for BlueZ 5 DBus API"
++    TYPE OPTIONAL
++    PURPOSE "Support for wireless energy saving actions"
++)
++find_package(KF5NetworkManagerQt)
++set_package_properties(KF5NetworkManagerQt
++    PROPERTIES DESCRIPTION "Qt wrapper for NetworkManager API"
++    TYPE OPTIONAL
++    PURPOSE "Support for wireless energy saving actions"
++)
++
++set(HAVE_WIRELESS_SUPPORT FALSE)
++if(KF5NetworkManagerQt_FOUND AND KF5BluezQt_FOUND)
++    set(HAVE_WIRELESS_SUPPORT TRUE)
++endif()
++add_feature_info(
++    "Wireless power saving"
++    HAVE_WIRELESS_SUPPORT
++    "Support turning off signal-transmitting devices to save energy"
++)
++
+ find_package(UDev REQUIRED)
+ 
+ find_package(XCB REQUIRED COMPONENTS XCB RANDR DPMS)
+diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
+index 4b0aafd..9c9b897 100644
+--- a/daemon/CMakeLists.txt
++++ b/daemon/CMakeLists.txt
+@@ -19,9 +19,14 @@ set(powerdevil_bundled_actions_SRCS
+     actions/bundled/dimdisplay.cpp
+     actions/bundled/runscript.cpp
+     actions/bundled/handlebuttonevents.cpp
+-    actions/bundled/wirelesspowersaving.cpp
+ )
+ 
++if(HAVE_WIRELESS_SUPPORT)
++    set(powerdevil_bundled_actions_SRCS ${powerdevil_bundled_actions_SRCS}
++        actions/bundled/wirelesspowersaving.cpp
++    )
++endif()
++
+ # target no.1 - powerdevil core library
+ set(powerdevilcore_SRCS
+     powerdevil_debug.cpp
+@@ -49,8 +54,10 @@ qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerMana
+                      actions/bundled/handlebuttonevents.h PowerDevil::BundledActions::HandleButtonEvents)
+ qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerManagement.Actions.SuspendSession.xml
+                      actions/bundled/suspendsession.h PowerDevil::BundledActions::SuspendSession)
+-qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerManagement.Actions.WirelessPowerSaving.xml
+-                     actions/bundled/wirelesspowersaving.h PowerDevil::BundledActions::WirelessPowerSaving)
++if(HAVE_WIRELESS_SUPPORT)
++    qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerManagement.Actions.WirelessPowerSaving.xml
++                         actions/bundled/wirelesspowersaving.h PowerDevil::BundledActions::WirelessPowerSaving)
++endif()
+ 
+ add_library(powerdevilcore SHARED ${powerdevilcore_SRCS} ${powerdevil_bundled_actions_SRCS})
+ set_target_properties(powerdevilcore PROPERTIES VERSION ${POWERDEVIL_CORE_VERSION_STRING} SOVERSION ${POWERDEVIL_CORE_VERSION_MAJOR})
+@@ -70,11 +77,16 @@ target_link_libraries(powerdevilcore
+     KF5::WidgetsAddons
+     KF5::Notifications
+     KF5::XmlGui
+-    KF5::NetworkManagerQt
+-    KF5::BluezQt
+     PW::KWorkspace
+ )
+ 
++if(HAVE_WIRELESS_SUPPORT)
++    target_link_libraries(powerdevilcore
++        KF5::NetworkManagerQt
++        KF5::BluezQt
++    )
++endif()
++
+ if (XCB_FOUND) # kwin kscreen helper effect
+     target_link_libraries(powerdevilcore Qt5::X11Extras XCB::XCB)
+ endif ()
+diff --git a/daemon/actions/bundled/CMakeLists.txt b/daemon/actions/bundled/CMakeLists.txt
+index e3e8eeb..9623b57 100644
+--- a/daemon/actions/bundled/CMakeLists.txt
++++ b/daemon/actions/bundled/CMakeLists.txt
+@@ -19,8 +19,9 @@ add_powerdevil_bundled_action(keyboardbrightnesscontrol)
+ add_powerdevil_bundled_action(dimdisplay)
+ add_powerdevil_bundled_action(runscript KF5::KIOCore KF5::KIOWidgets)
+ add_powerdevil_bundled_action(suspendsession KF5::KIOCore KF5::KIOWidgets KF5::Solid KF5::KDELibs4Support)
+-add_powerdevil_bundled_action(wirelesspowersaving KF5::NetworkManagerQt KF5::BluezQt)
+-
++if(HAVE_WIRELESS_SUPPORT)
++    add_powerdevil_bundled_action(wirelesspowersaving KF5::NetworkManagerQt KF5::BluezQt)
++endif()
+ 
+ set(actionconfig_SRCS handlebuttoneventsconfig.cpp)
+ qt5_add_dbus_interface(actionconfig_SRCS
+diff --git a/daemon/config-powerdevil.h.cmake b/daemon/config-powerdevil.h.cmake
+index 62938dc..042317d 100644
+--- a/daemon/config-powerdevil.h.cmake
++++ b/daemon/config-powerdevil.h.cmake
+@@ -1,2 +1,5 @@
+ /* Defines if you have XCB */
+ #cmakedefine HAVE_XCB 1
++
++/* Define to 1 if you have NetworkManagerQt and BluezQt libs. */
++#cmakedefine HAVE_WIRELESS_SUPPORT 1
+diff --git a/daemon/powerdevilactionpool.cpp b/daemon/powerdevilactionpool.cpp
+index 7ef823a..2864483 100644
+--- a/daemon/powerdevilactionpool.cpp
++++ b/daemon/powerdevilactionpool.cpp
+@@ -24,6 +24,8 @@
+ #include "powerdevilcore.h"
+ #include "powerdevil_debug.h"
+ 
++#include <config-powerdevil.h>
++
+ #include <KConfigGroup>
+ #include <KServiceTypeTrader>
+ #include <KPluginInfo>
+@@ -38,7 +40,9 @@
+ #include "actions/bundled/dimdisplay.h"
+ #include "actions/bundled/runscript.h"
+ #include "actions/bundled/handlebuttonevents.h"
++#ifdef HAVE_WIRELESS_SUPPORT
+ #include "actions/bundled/wirelesspowersaving.h"
++#endif
+ 
+ namespace PowerDevil
+ {
+@@ -127,7 +131,9 @@ void ActionPool::init(PowerDevil::Core *parent)
+     m_actionPool.insert("DimDisplay", new BundledActions::DimDisplay(parent));
+     m_actionPool.insert("RunScript", new BundledActions::RunScript(parent));
+     m_actionPool.insert("HandleButtonEvents", new BundledActions::HandleButtonEvents(parent));
++#ifdef HAVE_WIRELESS_SUPPORT
+     m_actionPool.insert("WirelessPowerSaving", new BundledActions::WirelessPowerSaving(parent));
++#endif
+ 
+     // Verify support
+     QHash<QString,Action*>::iterator i = m_actionPool.begin();
diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml
index 2fdbf33d963d..19e92345623a 100644
--- a/kde-plasma/powerdevil/metadata.xml
+++ b/kde-plasma/powerdevil/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-plasma/powerdevil/powerdevil-5.7.0.ebuild b/kde-plasma/powerdevil/powerdevil-5.7.0.ebuild
new file mode 100644
index 000000000000..25bc1bb2fc2c
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.7.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_GCC_MINIMAL="4.8"
+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 +wireless"
+
+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
+	wireless? (
+		$(add_frameworks_dep bluez-qt)
+		$(add_frameworks_dep networkmanager-qt)
+	)
+"
+
+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]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.6.95-wireless-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wireless KF5BluezQt)
+		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}
+
+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
+}