dev-util/kdevelop-php: Fix test DEPENDs, disable hanging tests

This time for real.

Closes: https://bugs.gentoo.org/667922
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

2 files changed, 63 insertions, 5 deletions

diff --git a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
index 3e376161d381..853952f11ac5 100644
--- a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
+++ b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
@@ -1,8 +1,15 @@
-From 5cee4d7ea10de55af2d421f5f596eb9f09830740 Mon Sep 17 00:00:00 2001
+From eb3a484c072f7cc5a319d919d54e6d843cd8c79f Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 7 Oct 2018 12:05:45 +0200
-Subject: [PATCH] Make Qt5Test optional
+Subject: [PATCH 1/2] Make Qt5Test optional
 
+Test Plan: Builds fine w/o Qt5Test present.
+
+Subscribers: kdevelop-devel
+
+Tags: #kdevelop
+
+Differential Revision: https://phabricator.kde.org/D16012
 ---
  CMakeLists.txt | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
@@ -26,3 +33,44 @@ index c09ca29..c1e25d6 100644
 -- 
 2.19.1
 
+
+From 600c167d742da9f22f6d72f6b5d8c3919de2580b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed, 10 Oct 2018 01:35:19 +0200
+Subject: [PATCH 2/2] Drop unused KF5Archive
+
+---
+ CMakeLists.txt                  | 2 +-
+ completion/tests/CMakeLists.txt | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1e25d6..5f1070a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@ if(BUILD_TESTING)
+   find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+ endif()
+ set(KF5_DEP_VERSION "5.15.0")
+-find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
++find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+ find_package(KDevelop-PG-Qt REQUIRED)
+ 
+diff --git a/completion/tests/CMakeLists.txt b/completion/tests/CMakeLists.txt
+index dbe37c1..214cc05 100644
+--- a/completion/tests/CMakeLists.txt
++++ b/completion/tests/CMakeLists.txt
+@@ -23,9 +23,5 @@ ecm_add_test(
+         Qt5::Test
+         KDev::Tests
+         KDev::Language
+-
+-        # TODO: KF5: KDevice is forcing us to have this dependency. I'm sure
+-        # we can work-around it :)
+-        KF5::Archive
+ )
+ 
+-- 
+2.19.1
+
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
index e8a5c29a01b2..9b59bf0dfaf0 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
@@ -17,8 +17,7 @@ LICENSE="GPL-2 LGPL-2"
 IUSE=""
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
-DEPEND="
-	$(add_frameworks_dep karchive)
+COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -35,8 +34,19 @@ DEPEND="
 	dev-util/kdevelop-pg-qt:5
 	dev-util/kdevelop:5
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	!dev-util/kdevelop-php-docs
 "
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/kdevelop:5[test] )
+"
 
 PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+src_test() {
+	# tests hang
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	kde5_src_test
+}