[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/

[Michael Palimaka]

commit:     225b0b432ba2951e19fc4088232b980bdada25c0
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Sep 14 22:45:24 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 15:51:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=225b0b43

kde-plasma/plasma-desktop: Make kde-frameworks/baloo optional

'baloo is the most dysfunctional part of whole kde frameworks'

Package-Manager: portage-2.3.0

 .../plasma-desktop-5.7.90-baloo-optional.patch     | 45 ++++++++++++++++++++++
 .../plasma-desktop-5.8.49.9999.ebuild              |  7 +++-
 .../plasma-desktop/plasma-desktop-9999.ebuild      |  7 +++-
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch
new file mode 100644
index 0000000..86fc43c
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch
@@ -0,0 +1,45 @@
+commit 00cdef0f2b6e8e20661aef98074b8533103bbfdd
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
+Date:   Thu Sep 15 00:39:43 2016 +0200
+
+    Make KF5Baloo optional
+    
+    https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f15021a..613ca20 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.1.90")
++find_package(KF5Baloo)
+ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
+-                       TYPE REQUIRED
+-                       PURPOSE "Needed to build to File Search KCM"
++                       TYPE OPTIONAL
++                       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.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild
index 849b9fc..2fc5d7b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild
@@ -12,11 +12,10 @@ inherit kde5
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
 IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
-legacy-systray packagekit pulseaudio +qt4 scim"
+legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep attica)
-	$(add_frameworks_dep baloo)
 	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep kactivities-stats)
 	$(add_frameworks_dep karchive)
@@ -96,6 +95,7 @@ COMMON_DEPEND="
 		media-sound/pulseaudio
 	)
 	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep breeze)
@@ -132,6 +132,8 @@ DEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
 
+PATCHES=( "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" )
+
 pkg_setup() {
 	if has_version net-im/skype && use legacy-systray && use amd64; then
 		einfo
@@ -149,6 +151,7 @@ src_configure() {
 		$(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

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 849b9fc..2fc5d7b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -12,11 +12,10 @@ inherit kde5
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
 IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
-legacy-systray packagekit pulseaudio +qt4 scim"
+legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep attica)
-	$(add_frameworks_dep baloo)
 	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep kactivities-stats)
 	$(add_frameworks_dep karchive)
@@ -96,6 +95,7 @@ COMMON_DEPEND="
 		media-sound/pulseaudio
 	)
 	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep breeze)
@@ -132,6 +132,8 @@ DEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
 
+PATCHES=( "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" )
+
 pkg_setup() {
 	if has_version net-im/skype && use legacy-systray && use amd64; then
 		einfo
@@ -149,6 +151,7 @@ src_configure() {
 		$(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