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

["Johannes Huber" <johu@gentoo.org>]

commit:     5bca4f847ba82eed4ff02cb5c8ffa794e2ebd325
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Jan 20 23:15:57 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 21 20:47:43 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5bca4f84

[kde-plasma/plasma-workspace] Make tests optional
drkonqi/internalkxmlrpcclient/autotests subdir was added unconditionally.

---
 .../plasma-workspace-9999-tests-optional.patch     | 25 ++++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
new file mode 100644
index 0000000..1c9c6bf
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt	2015-01-21 00:23:54.096323752 +0100
++++ b/CMakeLists.txt	2015-01-21 00:24:36.304654204 +0100
+@@ -7,7 +7,7 @@
+ set(QT_MIN_VERSION "5.3.0")
+ set(KF5_MIN_VERSION "5.7.0")
+ set(INSTALL_SDDM_THEME TRUE)
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Script Network)
+ find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+ 
+--- a/drkonqi/internalkxmlrpcclient/CMakeLists.txt	2015-01-20 23:55:55.857657633 +0100
++++ b/drkonqi/internalkxmlrpcclient/CMakeLists.txt	2015-01-21 00:05:27.684341452 +0100
+@@ -33,7 +33,10 @@
+ 
+ ########### Targets ###########
+ add_subdirectory(src)
+-add_subdirectory(autotests)
++
++if(BUILD_TESTING)
++  add_subdirectory(autotests)
++endif()
+ 
+ ########### CMake Config Files ###########
+ set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5XmlRpcClientPrivate")

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 6d1bbe6..47fdee6 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5 multilib
 
@@ -108,6 +109,9 @@ PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
 RESTRICT="test"
 
 src_prepare() {
+	# whole patch should be upstreamed, doesn't work in PATCHES
+	epatch "${FILESDIR}/${PN}-9999-tests-optional.patch"
+
 	kde5_src_prepare
 
 	sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die