commit: bb441bed71aa28609df327c17fa17ab22c4864bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 1 18:40:11 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 1 23:41:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb441bed
mail-client/kube: Properly eliminate dev-qt/qttest:5 in cmake
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
mail-client/kube/files/kube-0.7.0-tests-optional.patch | 4 +---
mail-client/kube/kube-0.7.0-r1.ebuild | 10 ++++++----
2 files changed, 7 insertions(+), 7 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
index efdf09c775b..0756cfb0cad 100644
--- a/mail-client/kube/files/kube-0.7.0-tests-optional.patch
+++ b/mail-client/kube/files/kube-0.7.0-tests-optional.patch
@@ -40,14 +40,12 @@
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 @@
+@@ -49,5 +49,7 @@
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
diff --git a/mail-client/kube/kube-0.7.0-r1.ebuild
b/mail-client/kube/kube-0.7.0-r1.ebuild
index d1dc9b2e959..110722ceb00 100644
--- a/mail-client/kube/kube-0.7.0-r1.ebuild
+++ b/mail-client/kube/kube-0.7.0-r1.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
dev-qt/qtnetwork:5
dev-qt/qtquickcontrols:5
dev-qt/qtquickcontrols2:5
- dev-qt/qttest:5
dev-qt/qtwebengine:5[widgets]
dev-qt/qtwidgets:5
kde-apps/kmime:5
@@ -52,9 +51,12 @@ src_prepare() {
cmake-utils_src_prepare
if ! use test; then
- sed \
- -e "/Qt5::Test/s/^/#DISABLED/" \
- -e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \
+ sed -e "/find_package.*Qt5/s/ Test//" \
+ -i {,components/}CMakeLists.txt CMakeLists.txt \
+ {extensions/api,framework}/src/CMakeLists.txt
|| die
+ sed -e "/Qt5::Test/s/^/#DISABLED/" \
+ -i {extensions/api,framework}/src/CMakeLists.txt || die
+ sed -e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \
-e "/domain\/modeltest.cpp/s/^/#DISABLED /" \
-i framework/src/CMakeLists.txt || die
fi
