kde-plasma: KDE Plasma 5.8.6 version bump

Package-Manager: portage-2.3.3

3 files changed, 210 insertions, 0 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 9f7dc78df5c7..0a567ae51abc 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-desktop-5.8.5.tar.xz 6410960 SHA256 d95eeb976cc18a50cff141c509f9e67430b81efcf36269a283fc62b81d48a910 SHA512 d8ef41f5e2a041de04f353e04274062ca4be069ffe88b5cfb0c9a2e5b1395631a8adaf0fda50a784a61a2585c0a503d84730a8c2df844aba71e894bd1f17915e WHIRLPOOL 1ed15a97ab966d682b89a2e7b146220e55495acbba9707a057554044e4ba9f1198712a16dc56d9082457b73384683c7e97647a6ce845df3987d98202e9b8dace
+DIST plasma-desktop-5.8.6.tar.xz 6413204 SHA256 de5c0a2dc8bcf79cec95d660ba535d5d236f11bcee2c5a72e328f3734e0e1f83 SHA512 703dcc555da6c609f858185468694d2c204478d2c7c5822ebfc57a7153899e57e81ce7ab0b2533f30e3e1a3c20bb358f63c5ff26f833b0bf4ab3bc5dec283f7e WHIRLPOOL 4b3bcf398b115ba30c4d96171cdef6255b4bd835a5b90261278b65500b4bcdc72afe66c5b6d138a6946ea4eaa99f6a629cc0980084fa817dc9079c41cedbde47
 DIST plasma-desktop-5.9.2.tar.xz 6056932 SHA256 2a5644228762137e83aa481767d6f061d1f8b51a04e24fa9ef78bf26a6ca5b38 SHA512 20cc5c9892eb3d51fc470ad545953c233aa9cf193feae2775cbe8a95047e6311d007b0751ee76a4e716725ef0750c56c817f44ea3ab93ec1bd8b9c57f99dded2 WHIRLPOOL 7170a14da53b7a5c1dba6b5466428c6485d7f91e5e206d23f7908b95b3bf6d76182c952a0b991856c00d2da0e78e327fbb7315ad56a6696615a9e3f57de5f2a4
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.6-baloo-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.6-baloo-optional.patch
new file mode 100644
index 000000000000..016a34b4284c
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.6-baloo-optional.patch
@@ -0,0 +1,51 @@
+commit e56ffb0914d5498f4017b0046524009d2b617876
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Thu Sep 15 00:39:43 2016 +0200
+
+    Make KF5Baloo optional
+    
+    Regardless of the current state of Baloo, it is not very deeply tied
+    into Plasma. Usage in plasma-desktop comes down to providing the
+    file search kcm. This makes it possible to prepare systems without a
+    use for indexing.
+    
+    https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
+    
+    REVIEW: 128957
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8c99352..b229dd5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,14 +67,10 @@ set_package_properties(PackageKitQt5 PROPERTIES DESCRIPTION "Software Manager in
+                        PURPOSE "Provides package management integration to the application launcher."
+                       )
+ 
+-# Baloo is currently part of the KF5 namespace, but it is not
+-# a proper framework. Hence the strange versioning.
+-# This will be fixed with Plasma 5.2, as Baloo should have
+-# become a framework by then
+ find_package(KF5Baloo "5.24")
+ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
+-                       TYPE REQUIRED
+-                       PURPOSE "Needed to build to File Search KCM"
++                       TYPE RECOMMENDED
++                       PURPOSE "Needed to build the File Search KCM"
+                       )
+ 
+ find_package(Fontconfig)
+diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
+index 53ca49a..3220bd3 100644
+--- a/kcms/CMakeLists.txt
++++ b/kcms/CMakeLists.txt
+@@ -55,7 +55,9 @@ add_subdirectory(useraccount/pics)
+ 
+ 
+ add_subdirectory(workspaceoptions)
+-add_subdirectory(baloo)
++if (KF5Baloo_FOUND)
++   add_subdirectory(baloo)
++endif()
+ add_subdirectory(solid_actions)
+ add_subdirectory(cursortheme)
+ 
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild
new file mode 100644
index 000000000000..9dc3f49db24f
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
+legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(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 kded)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		$(add_qt_dep qtx11extras)
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
+	packagekit? ( >=app-admin/packagekit-qt-0.9.6 )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		media-sound/pulseaudio
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/accountsservice
+	x11-apps/setxkbmap
+	legacy-systray? (
+		gtk2? ( dev-libs/libappindicator:2 )
+		gtk3? ( dev-libs/libappindicator:3 )
+		qt4? ( dev-libs/sni-qt )
+	)
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
+	!kde-apps/kcontrol
+	!kde-apps/kdepasswd:4
+	!kde-apps/knetattach[handbook]
+	!kde-base/plasma-desktop:4
+	!kde-plasma/plasma-workspace:4
+	!kde-plasma/solid-actions-kcm:4
+	!kde-plasma/systemsettings:4
+	!kde-misc/kcm_touchpad
+	!kde-misc/kcm-touchpad
+	!kde-plasma/kcm-touchpad
+	!<kde-plasma/kdeplasma-addons-5.5.50
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-proto/xproto
+	fontconfig? ( x11-libs/libXrender )
+	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
+"
+
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+
+PATCHES=( "${FILESDIR}/${P}-baloo-optional.patch" )
+
+pkg_setup() {
+	if has_version net-im/skype && use legacy-systray && use amd64; then
+		einfo
+		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
+		einfo
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package input_devices_evdev Evdev)
+		$(cmake-utils_use_find_package input_devices_synaptics Synaptics)
+		$(cmake-utils_use_find_package packagekit PackageKitQt5)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	kde5_src_configure
+}