[gentoo-commits] proj/kde:master commit in: net-im/ktp-common-internals/files/, net-im/ktp-common-internals/

[Johannes Huber]

commit:     fb76c5847c5c615bfe5649645646f4a0bef4c212
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jan 21 00:50:21 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=fb76c584

[net-im/ktp-common-internals] Make tests optional

---
 .../ktp-common-internals-9999-tests-optional.patch | 28 ++++++++++++++++++++++
 .../ktp-common-internals-9999.ebuild               |  3 +++
 2 files changed, 31 insertions(+)

diff --git 
a/net-im/ktp-common-internals/files/ktp-common-internals-9999-tests-optional.patch
 
b/net-im/ktp-common-internals/files/ktp-common-internals-9999-tests-optional.patch
new file mode 100644
index 0000000..4343173
--- /dev/null
+++ 
b/net-im/ktp-common-internals/files/ktp-common-internals-9999-tests-optional.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt   2015-01-20 21:49:46.354302243 +0100
++++ b/CMakeLists.txt   2015-01-21 01:45:39.660978780 +0100
+@@ -10,10 +10,9 @@
+ cmake_policy(SET CMP0002 OLD)
+ 
+ find_package (Qt5 REQUIRED CONFIG COMPONENTS
+-              Qml
+-              Test)
++              Qml)
+ 
+-find_package (KF5 REQUIRED COMPONENTS 
++find_package (KF5 REQUIRED COMPONENTS
+               CoreAddons
+               Notifications
+               KIO
+@@ -101,7 +100,11 @@
+ add_subdirectory(KTp)
+ add_subdirectory(tools)
+ add_subdirectory(data)
+-add_subdirectory(tests)
++
++if(BUILD_TESTING)
++    find_package(Qt5Test REQUIRED CONFIG)
++    add_subdirectory(tests)
++endif()
+ 
+ if (OTR_LIBS_FOUND)
+     include_directories (${LIBOTR_INCLUDE_DIR}

diff --git a/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild 
b/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild
index 93d53ef..476fb25 100644
--- a/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild
+++ b/net-im/ktp-common-internals/ktp-common-internals-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="KDE Telepathy common library"
@@ -58,6 +59,8 @@ RDEPEND="${DEPEND}
        !net-im/ktp-common-internals:4
 "
 
+PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package doc Doxygen)