From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 794F0138334 for ; Sun, 29 Sep 2019 20:07:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76EA5E0908; Sun, 29 Sep 2019 20:07:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C877E08F4 for ; Sun, 29 Sep 2019 20:07:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3FC7334B6DE for ; Sun, 29 Sep 2019 20:07:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 183C6824 for ; Sun, 29 Sep 2019 20:07:26 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1569787626.b40dfc26904023df04f4fa2f09400f5866d03b64.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/kube/, mail-client/kube/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/kube/files/kube-0.7.0-tests-optional.patch mail-client/kube/kube-0.7.0.ebuild X-VCS-Directories: mail-client/kube/ mail-client/kube/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b40dfc26904023df04f4fa2f09400f5866d03b64 X-VCS-Branch: master Date: Sun, 29 Sep 2019 20:07:26 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 44e50115-cdf3-40dc-8227-7aac3e5ce4d7 X-Archives-Hash: e315c3a53265b17df19e9b382c945f4a commit: b40dfc26904023df04f4fa2f09400f5866d03b64 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 29 19:40:12 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 29 20:07:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b40dfc26 mail-client/kube: Accept kde-frameworks/kcalendarcore Add missing dev-qt/qtconcurrent:5 Update DESCRIPTION Use patch and switch to KDE_TEST="forceoptional" Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kube/files/kube-0.7.0-tests-optional.patch | 64 ++++++++++++++++++++++ mail-client/kube/kube-0.7.0.ebuild | 12 +++- 2 files changed, 73 insertions(+), 3 deletions(-) diff --git a/mail-client/kube/files/kube-0.7.0-tests-optional.patch b/mail-client/kube/files/kube-0.7.0-tests-optional.patch new file mode 100644 index 00000000000..efdf09c775b --- /dev/null +++ b/mail-client/kube/files/kube-0.7.0-tests-optional.patch @@ -0,0 +1,64 @@ +--- a/CMakeLists.txt 2019-09-29 21:36:28.419106801 +0200 ++++ b/CMakeLists.txt 2019-09-29 21:36:28.423106839 +0200 +@@ -43,7 +43,9 @@ + add_subdirectory(applications) + add_subdirectory(views) + add_subdirectory(accounts) ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + if (${ENABLE_EXTENSION}) + add_subdirectory(extensions) + endif() +--- a/framework/CMakeLists.txt 2019-09-29 21:36:28.428106886 +0200 ++++ b/framework/CMakeLists.txt 2019-09-29 21:36:28.433106934 +0200 +@@ -4,4 +4,6 @@ + install(FILES qmldir DESTINATION ${FRAMEWORK_INSTALL_DIR}) + + add_subdirectory(src) ++if(BUILD_TESTING) + add_subdirectory(qml/tests) ++endif() +--- a/framework/src/CMakeLists.txt 2019-09-29 21:36:28.437106972 +0200 ++++ b/framework/src/CMakeLists.txt 2019-09-29 21:36:28.450107095 +0200 +@@ -86,10 +86,16 @@ + + set(BUILD_TESTING ON) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + add_subdirectory(domain/mime) ++if(BUILD_TESTING) + add_subdirectory(domain/mime/tests) ++endif() + add_subdirectory(domain/mime/mimetreeparser) ++if(BUILD_TESTING) + add_subdirectory(domain/settings/tests) ++endif() + + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +--- a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt 2019-09-29 21:36:28.455107143 +0200 ++++ b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt 2019-09-29 21:36:28.458107171 +0200 +@@ -49,5 +49,9 @@ + Gpgme::Gpgme + ) + ++if(BUILD_TESTING) + add_subdirectory(autotests) ++endif() ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/components/CMakeLists.txt 2019-09-29 21:36:28.463107218 +0200 ++++ b/components/CMakeLists.txt 2019-09-29 21:36:28.476107341 +0200 +@@ -8,7 +8,9 @@ + endmacro(install_qml_component) + + install_qml_component(kube) ++if(BUILD_TESTING) + add_subdirectory(kube/tests) ++endif() + install_qml_component(accounts) + + diff --git a/mail-client/kube/kube-0.7.0.ebuild b/mail-client/kube/kube-0.7.0.ebuild index 75753f8bb2f..9b40730b0d6 100644 --- a/mail-client/kube/kube-0.7.0.ebuild +++ b/mail-client/kube/kube-0.7.0.ebuild @@ -3,10 +3,10 @@ EAPI=7 -KDE_TEST="forceoptional-recursive" +KDE_TEST="forceoptional" inherit kde5 -DESCRIPTION="A mail client by KDE" +DESCRIPTION="Mail client based on KDE Frameworks" HOMEPAGE="https://kube.kde.org/" SRC_URI="https://github.com/KDE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" @@ -14,8 +14,12 @@ KEYWORDS="~amd64" RDEPEND=" $(add_frameworks_dep breeze-icons) $(add_frameworks_dep kcodecs) - $(add_kdeapps_dep kcontacts) + || ( + $(add_frameworks_dep kcontacts) + $(add_kdeapps_dep kcontacts) + ) $(add_kdeapps_dep kmime) + $(add_qt_dep qtconcurrent) $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) @@ -34,6 +38,8 @@ DEPEND="${RDEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" ) + src_prepare() { kde5_src_prepare