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 C4F93138A1A 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 BF47CE099C; 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 EDB02E099B 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 400D733BEE9 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 35F611014C 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.5bca4f847ba82eed4ff02cb5c8ffa794e2ebd325.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ kde-plasma/plasma-workspace/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 5bca4f847ba82eed4ff02cb5c8ffa794e2ebd325 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: e15bce00-590e-4cab-8675-328fc7dfd38f X-Archives-Hash: ce08b937b870fd8ea79e86dc4fb73bd5 commit: 5bca4f847ba82eed4ff02cb5c8ffa794e2ebd325 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Jan 20 23:15:57 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=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