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 DF19F138334 for ; Wed, 10 Oct 2018 05:33:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 790ECE07EA; Wed, 10 Oct 2018 05:33:10 +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 4746FE07EA for ; Wed, 10 Oct 2018 05:33:09 +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 8AA5633BEB8 for ; Wed, 10 Oct 2018 05:33:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57BA73D3 for ; Wed, 10 Oct 2018 05:33:06 +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: <1539149544.29cb544ad154b8a2f9e3354dd141abc60f45060a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-php/files/, dev-util/kdevelop-php/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild X-VCS-Directories: dev-util/kdevelop-php/ dev-util/kdevelop-php/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 29cb544ad154b8a2f9e3354dd141abc60f45060a X-VCS-Branch: master Date: Wed, 10 Oct 2018 05:33:06 +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: 2c48635e-3fd1-4601-8f7d-3e7dd3546220 X-Archives-Hash: 08503ec8f3a9b3f64779a501808f8e1f commit: 29cb544ad154b8a2f9e3354dd141abc60f45060a Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 9 23:44:12 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Oct 10 05:32:24 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29cb544a 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 gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../files/kdevelop-php-5.2.4-tests-optional.patch | 52 +++++++++++++++++++++- ...p-5.2.4.ebuild => kdevelop-php-5.2.4-r1.ebuild} | 16 +++++-- 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 3e376161d38..853952f11ac 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 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 +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 similarity index 80% rename from dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild rename to dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild index e8a5c29a01b..9b59bf0dfaf 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 +}