From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4384A138A1A for ; Wed, 21 Jan 2015 20:48:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE6B1E099B; Wed, 21 Jan 2015 20:48:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEF32E099C for ; Wed, 21 Jan 2015 20:48:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4273B3405DB for ; Wed, 21 Jan 2015 20:48:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 475D81014D for ; Wed, 21 Jan 2015 20:48:20 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1421873263.fb76c5847c5c615bfe5649645646f4a0bef4c212.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: net-im/ktp-common-internals/files/, net-im/ktp-common-internals/ X-VCS-Repository: proj/kde X-VCS-Files: net-im/ktp-common-internals/files/ktp-common-internals-9999-tests-optional.patch net-im/ktp-common-internals/ktp-common-internals-9999.ebuild X-VCS-Directories: net-im/ktp-common-internals/ net-im/ktp-common-internals/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: fb76c5847c5c615bfe5649645646f4a0bef4c212 X-VCS-Branch: master Date: Wed, 21 Jan 2015 20:48:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3578967e-3c60-480e-81c4-71a4dba259c0 X-Archives-Hash: 158332b06d5563f344e198d8467507d5 commit: fb76c5847c5c615bfe5649645646f4a0bef4c212 Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Jan 21 00:50:21 2015 +0000 Commit: Johannes Huber gentoo 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)